Skip to content

Commit 4977ecc

Browse files
committed
Merge branch 'master' into next
* master: Protect media library from get_image_dimensions failures Fix PageSitemap after Django r17468 Small feincms_item_editor_inline doc update FeinCMS v1.5.3 AUTHORS update * Corrected django-mptt setup instructions to point to the correct repo * Corrected the admin interface login details Update russian translation Conflicts: feincms/__init__.py feincms/module/medialibrary/models.py
2 parents 2815ef7 + 9d08a89 commit 4977ecc

File tree

7 files changed

+261
-206
lines changed

7 files changed

+261
-206
lines changed

AUTHORS

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,49 @@ The authors of FeinCMS are:
99
* Bjorn Post
1010
* Julien Phalip
1111
* Daniel Renz
12+
* Simon Schürpf
1213
* Matt Dawson
1314
* Skylar Saveland
14-
* Simon Schürpf
1515
* Stefan Reinhard
16+
* Maarten van Gompel (proycon)
1617
* Simon Schmid
1718
* Bjarni Thorisson
1819
* Greg Taylor
19-
* Maarten van Gompel (proycon)
20-
* Antoni Aloy
2120
* Urs Breton
21+
* Antoni Aloy
2222
* Toby White
2323
* Jonas
2424
* Martin Mahner
2525
* Max Peterson
2626
* Nico Echaniz
27+
* Psyton
2728
* Simon Bächler
2829
* Vítor Figueiró
29-
* Andrew D. Ball
30-
* Psyton
31-
* Gabriel Kovacs
32-
* Brian Macdonald
33-
* Torkn
3430
* Marc Egli
35-
* Håvard Grimelid
36-
* Maciek Szczesniak
31+
* Torkn
32+
* Brian Macdonald
33+
* Gabriel Kovacs
34+
* Andrew D. Ball
3735
* Fabian Vogler
38-
* tayg
3936
* Mikhail Korobov
37+
* tayg
4038
* Wil Tan
41-
* Mason Hugus
39+
* Håvard Grimelid
40+
* Maciek Szczesniak
41+
* Rico Moorman
42+
* Silvan Spross
43+
* Wouter van der Graaf
44+
* Mikkel Hoegh
4245
* Fabian Germann
4346
* Denis Martinez
4447
* Darryl Woods
45-
* Mark Renton
48+
* George Karpenkov
49+
* Anshuman Bhaduri
4650
* Tobias Haffner
4751
* Alen Mujezinovic
52+
* Jay Yu
53+
* Mark Renton
4854
* Harro van der Klauw
49-
* George Karpenkov
50-
* Mikkel Hoegh
5155
* Paul Garner
52-
* Rico Moorman
56+
* Mason Hugus
5357
* Sebastian Hillig
54-
* Silvan Spross
55-
* Wouter van der Graaf

QUICKSTART.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Create a directory named 'lib' in your development folder and clone the django-m
2929

3030
$ mkdir lib
3131
$ cd lib
32-
$ git clone git://github.com/feincms/feincms.git
32+
$ git clone git://github.com/django-mptt/django-mptt.git
3333

3434
Change into your project root and create a symbolic link to the downloaded mptt module
3535

@@ -45,7 +45,7 @@ Step into the example app and start the runserver
4545
$ cd example
4646
$ ./manage.py runserver
4747

48-
The username and password for the examples admin-interface are 'username' and 'password'
48+
The username and password for the examples admin-interface are 'admin' and 'password'
4949

5050

5151
Quickstart Variant
@@ -65,7 +65,7 @@ Wait while django and mptt are being fetched and then follow the on-screen instr
6565
$ cd example
6666
$ ./manage.py runserver
6767

68-
The username and password for the examples admin-interface are 'username' and 'password'
68+
The username and password for the examples admin-interface are 'admin' and 'password'
6969

7070
Further Steps
7171
-------------------

docs/admin.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ settings on the content type model itself:
196196
content type. The custom inline should inherit from ``FeinCMSInline``
197197
or be configured the same way.
198198

199-
If you override ``fieldsets`` you **must** include ``region`` and
199+
If you override ``fieldsets`` or ``fields`` you **must** include ``region`` and
200200
``ordering`` even though they aren't shown in the administration
201201
interface.
202202

9.02 KB
Binary file not shown.

0 commit comments

Comments
 (0)