5c6f7a41a8
Merge branch 'stable/1.6.x'
...
Conflicts:
tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
bcd6b9fad4
Merge pull request #1356 from ostcar/poll404
...
Returns a 404 response if a requested poll does not exist.
2014-10-17 19:42:47 +02:00
087a5f1650
Merge pull request #1353 from ostcar/django17
...
Updated Django version to 1.7.
2014-10-17 19:27:56 +02:00
fca2a2fd09
Merge pull request #1358 from normanjaeckel/LanguageFile
...
Updated English language files.
2014-10-17 07:57:08 +02:00
cb03908a1b
Returns a 404 response if a requested poll does not exist.
...
fixes #1355
2014-10-17 07:55:41 +02:00
ff9fedd14f
Updated English language files.
2014-10-16 23:28:02 +02:00
c454faef94
Updated Django to 1.7.x
2014-10-14 17:14:52 +02:00
0f40ce2c81
Merge pull request #1351 from frauenknecht/i1327_2
...
Fix #1327 - Related agenda item has no (auto) agenda number
2014-10-12 11:15:41 +02:00
d5d02c85d5
Merge pull request #1350 from normanjaeckel/UpdateChangelog
...
Updated CHANGELOG.
2014-10-12 11:14:10 +02:00
ebadb9078c
Bugix in method get_title. Return item no for related objects.
2014-10-12 10:55:56 +02:00
c73c986ef1
Updated CHANGELOG.
2014-10-12 10:46:17 +02:00
0a2923f7e3
Merge pull request #1343 from ostcar/user
...
New users app.
2014-10-12 10:32:41 +02:00
9b381b712e
Merge pull request #1341 from frauenknecht/i1324
...
Fix #1324 - Agenda item has whitespaces before number.
2014-10-12 10:31:31 +02:00
b3c2e67613
Merge pull request #1338 from normanjaeckel/FixedMotionDetailViewTemplate
...
Fixed motion detail view template.
2014-10-12 10:29:22 +02:00
af8dead5a3
Fixed motion detail view template. Added block to enable extra content via plugins. Updated CHANGELOG.
2014-10-12 10:23:38 +02:00
cc7961c1f9
Merge pull request #1340 from emanuelschuetze/fix-1326
...
Fixed #1326 : Assignment PDF fails when having a lot of posts.
2014-10-12 10:18:15 +02:00
3527b0a75b
Refactory of the participant app
...
* New user model (used Django's AbstractBaseUser)
* Renamed the app to users
* removed person api
See #861
Fixed #576 #478
2014-10-12 10:06:54 +02:00
2a389b4a7f
Fixed #1326 : Assignment PDF fails when having a lot of posts.
...
Print always 7 signature lines in assingment pdf.
Added test.
2014-10-10 22:24:28 +02:00
276f76d320
Omit leading zero in method item_no if no agenda prefix is given.
2014-10-10 21:30:22 +02:00
f17f1a723a
Merge pull request #1339 from ostcar/make1
...
Get rid of Fabric by creating own scripts.
2014-10-10 19:47:00 +02:00
78924f966f
Get rid of Fabric by creating own scripts
...
Changed travis to call the tests directly
2014-10-10 18:59:32 +02:00
097724722f
Merge pull request #1331 from ostcar/python3
...
Python3
2014-08-24 22:34:48 +02:00
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
c6586c2c70
Merge pull request #1329 from normanjaeckel/fixes-for-1.6.1
...
Fixes for 1.6.1
2014-07-15 00:43:45 +02:00
f6d0a96126
Show supporters on motion slide if available.
2014-07-14 22:54:53 +02:00
587a3766d2
Fixed participant csv import for group id
...
- Allowed to add multiple groups in csv group id field (e.g. "3,4")
- Fixed bug that group ids > 9 can not be imported.
- Updated error message if group id does not exists.
2014-07-14 22:54:53 +02:00
648d5a6ad7
Fixed CKEditor stuff:
...
- Added missing insertpre plugin and allow <pre> tag with class
attribute. Added font style to base.css.
- Removed unused link to old ckeditor.css (now managed by
django-ckeditor).
2014-07-14 22:54:53 +02:00
66426ad29b
Merge pull request #1328 from normanjaeckel/BumpVersion
...
Bump version to 2.0a1-dev.
2014-07-14 22:41:03 +02:00
dee81e58b3
Bump version to 2.0a1-dev.
2014-07-14 22:33:54 +02:00
d1978959b8
Merge pull request #1322 from normanjaeckel/Release_1.6
...
Release 1.6
2014-06-02 21:04:37 +02:00
5db47bef76
Update version to 1.6.1-dev
2014-06-02 20:37:51 +02:00
9d40e22783
Release 1.6
2014-06-02 20:37:50 +02:00
a02ee4828f
Merge pull request #1323 from normanjaeckel/Docs
...
Update docs version.
2014-06-02 20:36:16 +02:00
4a6aa617d4
Update docs version.
2014-06-02 20:00:39 +02:00
2ebd215198
Merge pull request #1321 from emanuelschuetze/template-fixes
...
Last template fixes for 1.6
2014-06-02 18:23:04 +02:00
be2d411c0c
Merge pull request #1319 from normanjaeckel/ChangeManageScript
...
Update help texts in start script. Set x-bit for manage.py.
2014-06-02 18:22:42 +02:00
0ebb2eb901
Last template fixes in agenda, motion and assignment list view.
2014-06-01 22:48:15 +02:00
c2ae991fb2
Update help texts in start script. Set x-bit for manage.py.
2014-05-31 12:40:51 +02:00
39376e7029
Merge pull request #1320 from normanjaeckel/Metadata
...
Update CHANGELOG, README.rst and docs.
2014-05-31 12:38:46 +02:00
f6ca5d95ec
Update German docs.
2014-05-29 18:30:33 +02:00
7666be8a29
Update CHANGELOG and README.rst.
2014-05-29 18:19:56 +02:00
513000d241
Merge pull request #1316 from normanjaeckel/FixWorkflowBug
...
Fixed bug with workflows. Fixed #1309 .
2014-05-28 12:32:12 +02:00
c356b35adc
Merge pull request #1317 from normanjaeckel/FixCSSBug
...
Added stylesheet to list of speakers overlay. Fixed #1310 .
2014-05-28 12:31:50 +02:00
efb6c17903
Added stylesheet to list of speakers overlay. Fixed #1310 .
2014-05-28 00:30:33 +02:00
52f7dff0f1
Fixed bug with workflows. Fixed #1309 .
2014-05-28 00:20:13 +02:00
c5db1c5e02
Merge pull request #1315 from emanuelschuetze/translations
...
Updated final translations for 1.6 (DE, FR, PT, CS)
2014-05-27 22:45:40 +02:00
753cd0fbfd
Merge pull request #1314 from emanuelschuetze/agenda-demo-data
...
Changed agenda csv demo data.
2014-05-27 22:42:15 +02:00
29f493d83e
Merge pull request #1312 from emanuelschuetze/fix-1311
...
Fixed #1311 (Motion poll slides shows wrong value for Abstain vote)
2014-05-27 22:40:41 +02:00
45c5f13980
Updated final translations for 1.6 (DE, FR, PT, CS)
2014-05-27 21:25:08 +02:00
38d17fb63f
Changed agenda csv demo data.
2014-05-27 17:17:16 +02:00
Oskar Hahn