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

2534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5db47bef76 Update version to 1.6.1-dev 2014-06-02 20:37:51 +02:00
Norman Jäckel
9d40e22783 Release 1.6 2014-06-02 20:37:50 +02:00
Norman Jäckel
a02ee4828f Merge pull request #1323 from normanjaeckel/Docs 
Update docs version.
 2014-06-02 20:36:16 +02:00
Norman Jäckel
4a6aa617d4 Update docs version. 2014-06-02 20:00:39 +02:00
Norman Jäckel
2ebd215198 Merge pull request #1321 from emanuelschuetze/template-fixes 
Last template fixes for 1.6
 2014-06-02 18:23:04 +02:00
Norman Jäckel
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
Emanuel Schuetze
0ebb2eb901 Last template fixes in agenda, motion and assignment list view. 2014-06-01 22:48:15 +02:00
Norman Jäckel
c2ae991fb2 Update help texts in start script. Set x-bit for manage.py. 2014-05-31 12:40:51 +02:00
Norman Jäckel
39376e7029 Merge pull request #1320 from normanjaeckel/Metadata 
Update CHANGELOG, README.rst and docs.
 2014-05-31 12:38:46 +02:00
Norman Jäckel
f6ca5d95ec Update German docs. 2014-05-29 18:30:33 +02:00
Norman Jäckel
7666be8a29 Update CHANGELOG and README.rst. 2014-05-29 18:19:56 +02:00
Oskar Hahn
513000d241 Merge pull request #1316 from normanjaeckel/FixWorkflowBug 
Fixed bug with workflows. Fixed #1309.
 2014-05-28 12:32:12 +02:00
Oskar Hahn
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
Norman Jäckel
efb6c17903 Added stylesheet to list of speakers overlay. Fixed #1310. 2014-05-28 00:30:33 +02:00
Norman Jäckel
52f7dff0f1 Fixed bug with workflows. Fixed #1309. 2014-05-28 00:20:13 +02:00
Norman Jäckel
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
Norman Jäckel
753cd0fbfd Merge pull request #1314 from emanuelschuetze/agenda-demo-data 
Changed agenda csv demo data.
 2014-05-27 22:42:15 +02:00
Norman Jäckel
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
Emanuel Schuetze
45c5f13980 Updated final translations for 1.6 (DE, FR, PT, CS) 2014-05-27 21:25:08 +02:00
Emanuel Schuetze
38d17fb63f Changed agenda csv demo data. 2014-05-27 17:17:16 +02:00
Emanuel Schuetze
91ebd719bc Fixed #1311 (Motion poll slides shows wrong value for Abstain vote) 2014-05-22 17:26:38 +02:00
Norman Jäckel
769695bf14 Merge pull request #1307 from emanuelschuetze/en-translationfile 
Updated EN translation file for transifex
 2014-05-20 21:59:00 +02:00
Norman Jäckel
68000b6eac Merge pull request #1308 from emanuelschuetze/fix-motion-title 
Fixed motion title in motion list view (#1148).
 2014-05-20 21:58:19 +02:00
Emanuel Schuetze
431f437ded Fixed motion title in motion list view (#1148). 2014-05-20 20:29:57 +02:00
Emanuel Schuetze
f1743a3790 Updated EN translation file for transifex 
String freeze for 1.6.
 2014-05-20 12:33:23 +02:00
Norman Jäckel
f7fb1279f0 Merge pull request #1306 from normanjaeckel/Release_1.6b2 
Release 1.6b2
 2014-05-19 23:16:53 +02:00
Norman Jäckel
7ee5f688ae Update version to 1.6c1-dev 2014-05-19 23:02:39 +02:00
Norman Jäckel
fca8da8ae6 Release 1.6b2 2014-05-19 23:02:39 +02:00
Norman Jäckel
141209efd4 Merge pull request #1305 from normanjaeckel/Prepare_Release_1.6b2 
Prepared for release.
 2014-05-19 23:01:52 +02:00
Norman Jäckel
2bfa5f3a72 Prepared for release. 
Small style changes, CHANGELOG and README.rst update.
 2014-05-19 22:55:54 +02:00
Norman Jäckel
f9729fdae3 Merge pull request #1301 from normanjaeckel/MotionTitle 
Changed motion title behavior.
 2014-05-19 22:49:23 +02:00
Norman Jäckel
48471699c2 Merge pull request #1304 from emanuelschuetze/translations 
Updated translations (from transifex).
 2014-05-19 22:48:19 +02:00
Norman Jäckel
d76c3d4484 Merge pull request #1303 from normanjaeckel/BindReload 
Fixed reload of tornado webserver.
 2014-05-19 22:45:29 +02:00
Norman Jäckel
00eabcb8c8 Changed motion title appearance. Fixed #1148. 2014-05-19 22:42:43 +02:00
Emanuel Schuetze
715edf8a03 Updated translations (from transifex). 2014-05-19 22:30:50 +02:00
Norman Jäckel
ae99784372 Enabled reload always when DEBUG==True. 2014-05-19 22:29:05 +02:00
Oskar Hahn
22bacd1054 bind the reload of the webserver on the debug settings 
fix #1163
 2014-05-19 22:18:45 +02:00
Emanuel Schütze
bf8bb31cdb Merge pull request #1298 from emanuelschuetze/fix-995 
Improved html templates for mobile devices (responsive).
 2014-05-19 22:17:26 +02:00
Emanuel Schütze
4616762735 Merge pull request #1302 from emanuelschuetze/portable-plugin-reamde 
Added README.txt for plugin dir in portable version.
 2014-05-19 22:16:29 +02:00
Emanuel Schuetze
30eaabb376 Added README.txt for plugin dir in portable version. 2014-05-19 21:26:38 +02:00
Norman Jäckel
54b8a6b02d Merge pull request #1296 from emanuelschuetze/motion-category-import 
Motion CSV Import: Create new category if category is unkown.
 2014-05-19 21:00:44 +02:00
Emanuel Schuetze
6bdfc33182 Motion CSV Import: Create new category if category is unkown. 2014-05-19 20:31:38 +02:00
Norman Jäckel
f958dd2ab0 Merge pull request #1300 from ostcar/fix_tests 
Fixed the tests for list of speakers.
 2014-05-19 15:39:21 +02:00
Oskar Hahn
9b4d7f37a5 fixed the tests for list of speakers 2014-05-19 15:32:44 +02:00
Oskar Hahn
16a6ad4a9e Merge pull request #1278 from rolandgeider/ckeditor 
Replace own CKeditor with dedicated app
 2014-05-19 15:15:54 +02:00
Oskar Hahn
0feed94bf6 Merge pull request #1297 from emanuelschuetze/fix-1104 
Fixed #1104 (Enable copy/paste in dashboard widgets)
 2014-05-19 14:58:01 +02:00