Commit Graph

375 Commits

Author SHA1 Message Date
René Köcher 3bea7f1234 Ignore malformed lines in import file (ported from application import). 2012-04-13 22:02:14 +02:00
René Köcher 113d258b3d #85: New import option: set status of all imported applications to 'permit' 2012-04-13 21:55:13 +02:00
Oskar Hahn 639397028e removed some admin stuff. Fixed version-info, if no mercurial is installed 2012-04-13 16:47:40 +02:00
Oskar Hahn bb430fd2a7 remove admin, add plugin system for openslides 2012-04-13 14:05:51 +02:00
Oskar Hahn f889c49c1b some clean up in participant app 2012-04-13 11:35:53 +02:00
Oskar Hahn f1261ae2a7 merge 2012-04-12 20:13:39 +02:00
Oskar Hahn d187f341b3 DeleteView in utils.views 2012-04-12 20:11:05 +02:00
René Köcher 733d78373e #84: Participants CSV import deletes applications 2012-04-12 19:11:07 +02:00
Oskar Hahn 9e6aa796ab fixed error in emty poll in assignment 2012-04-12 16:37:04 +02:00
Oskar Hahn fc95d01d07 some fixes 2012-04-12 16:21:30 +02:00
Oskar Hahn 497a8cdb70 added AjaxView 2012-04-12 14:20:05 +02:00
Oskar Hahn 3eeae673c0 some small fixes 2012-04-11 10:58:59 +02:00
Emanuel Schuetze 5e6180a465 Some style changes for projector and agenda template. 2012-04-10 21:11:50 +02:00
Emanuel Schuetze fdc83048f4 More AJAX for projector control template. Moved projector stuff from agenda overview to new control page. 2012-04-10 20:09:10 +02:00
Emanuel Schuetze 83ba0cbcf9 Fixed projector portlet style. 2012-04-02 20:59:17 +02:00
Emanuel Schuetze c3ada0abdd Updated translation. 2012-04-02 08:44:17 +02:00
Emanuel Schuetze 42820c1254 #83: Merged fix of r365 from default branch into 1.2-dev branch. 2012-04-02 08:37:34 +02:00
Emanuel Schuetze 84e5b3d061 #82: Merged fix of r364 from default branch into 1.2-dev branch. 2012-04-02 08:36:22 +02:00
Emanuel Schuetze 9c13667ff0 #81: Merged fix of r363 from default branch into 1.2-dev branch. 2012-04-02 08:35:10 +02:00
Emanuel Schuetze 4045c79a17 #80: Merged fix of r362 from default branch into 1.2-dev branch. 2012-04-02 08:31:26 +02:00
Emanuel Schuetze c2ec9e958f #79: Merged fix of r361 from default branch into 1.2-dev branch. 2012-04-02 08:30:28 +02:00
Emanuel Schuetze b480db2e8a Moved images to global _static folder. 2012-03-31 16:45:53 +02:00
Emanuel Schuetze faebb527cd Updated makefiles. 2012-03-31 16:45:28 +02:00
Emanuel Schuetze 0d3d423d33 Added initial documentation structure. Thanks to Wolfram Stebel! 2012-03-31 14:35:00 +02:00
Emanuel Schuetze a11ed6cfdb Minor template fixes. 2012-03-22 17:30:02 +01:00
Emanuel Schuetze d4b86574e9 Updated translation. 2012-03-22 17:29:39 +01:00
Emanuel Schuetze 7e48dc737f Scaled Live View. Added active slide icon. 2012-03-21 22:21:23 +01:00
Emanuel Schuetze d65b20a7fd Fixed tab string. 2012-03-19 09:34:13 +01:00
Oskar Hahn c4c42611b4 generate tab liste by app list 2012-03-18 17:11:58 +01:00
Oskar Hahn ad38a8eead put some lines in agenda template in seperate File 2012-03-18 15:11:01 +01:00
Oskar Hahn f5414b18d2 fixed error in projector Control 2012-03-18 14:35:01 +01:00
Oskar Hahn 282778c8a0 fixed error with permission Mixin 2012-03-18 14:33:53 +01:00
Oskar Hahn f54cf05fc6 bug in signals 2012-03-17 00:22:46 +01:00
Oskar Hahn 0b137e72cd remove some unused lines from base_system.html 2012-03-16 14:33:19 +01:00
Oskar Hahn fb17b16fae config pages in apps 2012-03-16 14:31:59 +01:00
Oskar Hahn ccdce52caa start a way to send messages to the projector. Start to use this api for the countdown 2012-03-16 12:28:42 +01:00
Oskar Hahn bf6d5fc798 decode config Vars with base64 befor saveing them in the db 2012-03-13 13:03:03 +01:00
Oskar Hahn 674960fdc9 added django to THANKS 2012-03-12 19:08:55 +01:00
Oskar Hahn 2947fff9f6 commit mailinglist test 2012-03-12 18:27:13 +01:00
Oskar Hahn 7a63ec6f10 created model for pojector slides 2012-03-12 18:22:18 +01:00
Emanuel Schuetze a04c5fff1d Added website build dir to .hgignore. 2012-03-12 08:40:01 +01:00
Emanuel Schuetze 56ef9c3bae Prepration for new OpenSlides documentation with Sphinx. 2012-03-12 08:39:35 +01:00
Emanuel Schuetze 9e4cb807c7 Moved website to extras. 2012-03-12 08:36:45 +01:00
Emanuel Schuetze 2ab6ff4143 Projector control template: Used portlets instead of accordion. 2012-03-07 06:44:43 +01:00
Emanuel Schuetze 687f5ea710 Automated merge with ssh://openslides.org/openslides 2012-03-06 19:55:26 +01:00
Emanuel Schuetze 8d514e9fcf Renamed SettingView to ControlView. 2012-03-06 19:55:19 +01:00
Oskar Hahn 027655270e Automated merge with ssh://openslides.de/openslides 2012-03-06 12:16:21 +01:00
Oskar Hahn 062e9bd4cb added signals for template-context-manipulation 2012-03-06 12:16:03 +01:00
Emanuel Schuetze 55c4299a7f Updated projector control template. Fixed some slidemodel strings and urls.
Updated jquery to 1.7.1. Added jquery-ui.
2012-03-06 08:19:49 +01:00
Oskar Hahn 50360dde96 side-menu for projector 2012-03-03 11:19:58 +01:00