ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,680 Commits 6 Branches 42 Tags 64 MiB
48c4f8dcf5
Commit Graph

2680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
4f04223e08 Added Django's application configuration. 
Used customized AppConfig classes in openslides.core, openslides.account,
openslides.projector, openslides.agenda, openslides.motion, openslides.assignment,
openslides.users, openslides.mediafile, openslides.config.

Refactored loading of signals, template signals and slides.
 2014-12-10 17:16:58 +01:00
Norman Jäckel
808aae597f Merge branch 'stable/1.6.x' into 'master'. 
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
 2014-12-08 22:17:22 +01:00
Emanuel Schütze
75b28847d5 Merge pull request #1368 from normanjaeckel/Release-1.6.1 
Release 1.6.1
 2014-12-08 21:08:35 +01:00
Norman Jäckel
750918fe74 Update version to 1.6.2-dev 2014-12-04 15:47:21 +01:00
Norman Jäckel
9a50dab5fc Release 1.6.1 2014-12-04 15:45:19 +01:00
Norman Jäckel
35e31874a1 Updated CHANGELOG. 2014-12-04 15:42:35 +01:00
Norman Jäckel
d608dd3095 Merge pull request #1373 from emanuelschuetze/fix-1326-b 
Fixed #1326: Rearranged assignment pdf table cells to prevent a LayoutError.
 2014-12-04 15:40:16 +01:00
Emanuel Schuetze
6df6b92dd7 Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError) 2014-11-28 20:58:19 +01:00
Norman Jäckel
3c6266b1c4 Merge pull request #1361 from ostcar/transaction 
Used the new django transaction API.
 2014-11-18 13:04:29 +01:00
Norman Jäckel
ed17ccfad2 Merge pull request #1362 from ostcar/requirements 
Updated requirements.txt.
 2014-11-04 18:32:01 +01:00
Norman Jäckel
b9842ecf94 Merge pull request #1367 from emanuelschuetze/fr-translation 
Updated FR translation.
 2014-10-27 21:21:29 +01:00
Norman Jäckel
ba34fa5121 Merge pull request #1366 from emanuelschuetze/portable-readme 
Added version numbers of required packages to portable build instruction...
 2014-10-27 21:19:49 +01:00
Norman Jäckel
0471be3d1e Merge pull request #1365 from emanuelschuetze/fix-1354 
Fixed #1354: Added CKEditor plugin insterpre to README.
 2014-10-27 21:18:26 +01:00
Emanuel Schuetze
8be1215e12 Updated FR translation. 2014-10-27 20:42:36 +01:00
Emanuel Schuetze
815789bd8e Added version numbers of required packages to portable build instruction. 2014-10-27 20:29:06 +01:00
Emanuel Schuetze
9a4d357287 Fixed #1354: Added CKEditor plugin insterpre to README. 2014-10-27 20:17:50 +01:00
Oskar Hahn
c12c83a7ae Merge pull request #1363 from normanjaeckel/Languages 
Updated German and Czech language files.
 2014-10-26 18:17:24 +01:00
Norman Jäckel
c89f9bcccd Updated German and Czech language files. 2014-10-26 16:12:20 +01:00
Oskar Hahn
939f3f8339 Update requirements.txt 
Especially this is importand for haystack, because the old version had some DepricationWarnings.

This means, that django-haystack 2.1 and django 1.8 will not be compatible

See #1352
 2014-10-19 15:40:32 +02:00
Oskar Hahn
88222857bb Use the new django transaction API 
fixes #1027
 2014-10-19 10:52:48 +02:00
Oskar Hahn
5c6f7a41a8 Merge branch 'stable/1.6.x' 
Conflicts:
	tests/assignment/test_views.py
 2014-10-18 08:53:51 +02:00
Oskar Hahn
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
Norman Jäckel
087a5f1650 Merge pull request #1353 from ostcar/django17 
Updated Django version to 1.7.
 2014-10-17 19:27:56 +02:00
Oskar Hahn
fca2a2fd09 Merge pull request #1358 from normanjaeckel/LanguageFile 
Updated English language files.
 2014-10-17 07:57:08 +02:00
Oskar Hahn
cb03908a1b Returns a 404 response if a requested poll does not exist. 
fixes #1355
 2014-10-17 07:55:41 +02:00
Norman Jäckel
ff9fedd14f Updated English language files. 2014-10-16 23:28:02 +02:00
Oskar Hahn
c454faef94 Updated Django to 1.7.x 2014-10-14 17:14:52 +02:00
Oskar Hahn
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
Oskar Hahn
d5d02c85d5 Merge pull request #1350 from normanjaeckel/UpdateChangelog 
Updated CHANGELOG.
 2014-10-12 11:14:10 +02:00
Stefan Frauenknecht
ebadb9078c Bugix in method get_title. Return item no for related objects. 2014-10-12 10:55:56 +02:00
Norman Jäckel
c73c986ef1 Updated CHANGELOG. 2014-10-12 10:46:17 +02:00
Norman Jäckel
0a2923f7e3 Merge pull request #1343 from ostcar/user 
New users app.
 2014-10-12 10:32:41 +02:00
Oskar Hahn
9b381b712e Merge pull request #1341 from frauenknecht/i1324 
Fix #1324 - Agenda item has whitespaces before number.
 2014-10-12 10:31:31 +02:00
Oskar Hahn
b3c2e67613 Merge pull request #1338 from normanjaeckel/FixedMotionDetailViewTemplate 
Fixed motion detail view template.
 2014-10-12 10:29:22 +02:00
Norman Jäckel
af8dead5a3 Fixed motion detail view template. Added block to enable extra content via plugins. Updated CHANGELOG. 2014-10-12 10:23:38 +02:00
Oskar Hahn
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
Oskar Hahn
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
Emanuel Schuetze
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
Stefan Frauenknecht
276f76d320 Omit leading zero in method item_no if no agenda prefix is given. 2014-10-10 21:30:22 +02:00
Norman Jäckel
f17f1a723a Merge pull request #1339 from ostcar/make1 
Get rid of Fabric by creating own scripts.
 2014-10-10 19:47:00 +02:00
Oskar Hahn
78924f966f Get rid of Fabric by creating own scripts 
Changed travis to call the tests directly
 2014-10-10 18:59:32 +02:00
Oskar Hahn
097724722f Merge pull request #1331 from ostcar/python3 
Python3
 2014-08-24 22:34:48 +02:00
Oskar Hahn
32137b6523 Use python3 
python3.3 and python3.4 are supported
 2014-08-24 21:21:11 +02:00
Norman Jäckel
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
Emanuel Schuetze
f6d0a96126 Show supporters on motion slide if available. 2014-07-14 22:54:53 +02:00
Emanuel Schuetze
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
Emanuel Schuetze
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
Norman Jäckel
66426ad29b Merge pull request #1328 from normanjaeckel/BumpVersion 
Bump version to 2.0a1-dev.
 2014-07-14 22:41:03 +02:00
Norman Jäckel
dee81e58b3 Bump version to 2.0a1-dev. 2014-07-14 22:33:54 +02:00
Norman Jäckel
d1978959b8 Merge pull request #1322 from normanjaeckel/Release_1.6 
Release 1.6
 2014-06-02 21:04:37 +02:00