Commit Graph

3402 Commits

Author SHA1 Message Date
Emanuel Schuetze
a4db8a49dd Automated merge with ssh://openslides.org/openslides 2012-04-14 10:54:31 +02:00
Emanuel Schuetze
4abd79e7b5 Added PDF document title. 2012-04-14 10:54:22 +02:00
René Köcher
d2f9f630c7 Move AnonymousAuth from system to utils. 2012-04-14 09:49:37 +02:00
Oskar Hahn
e8337278a1 Automated merge with ssh://openslides.de/openslides 2012-04-14 09:47:41 +02:00
Oskar Hahn
0de8228537 rewrote message api and countdown 2012-04-14 09:47:34 +02:00
Emanuel Schuetze
e84861211a Fixed login/logout urls. 2012-04-14 09:42:30 +02:00
René Köcher
a792cd4c15 Support for localized permissions on top of the static django model. 2012-04-14 09:34:31 +02:00
René Köcher
7e12e1d5e2 Support for localized permissions on top of the untranslated django model. 2012-04-14 09:28:28 +02:00
Oskar Hahn
d870b988e9 try to reload the beamer, if the server is down 2012-04-14 09:04:37 +02:00
Emanuel Schuetze
3817a03aa8 Automated merge with ssh://openslides.org/openslides 2012-04-13 23:52:48 +02:00
Emanuel Schuetze
698697a75c Applications: Moved pdf functions from pdf.py to new PDF view in views.py. 2012-04-13 23:52:34 +02:00
René Köcher
cdf3628e8b Check input files for UTF-8 encoding and display an appropriate error if not. 2012-04-13 22:33:47 +02:00
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
Emanuel Schuetze
a1c5766e7a Adjusted app prefix in urls.py (outsource in global urls.py). Some code formatting. 2012-04-13 21:43:16 +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
René Köcher
07a83f142b #84: Participants CSV import deletes applications 2012-04-11 14:49:24 +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
bf6a3d2d81 Updated translation 2012-04-02 07:53:32 +02:00
Emanuel Schuetze
95bf4c1cc8 #83: Show total number and percent value of filtered participants. 2012-04-02 07:47:38 +02:00
Emanuel Schuetze
a8fcba0f69 #82: New comment field for participant form (database changes: syncdb required) 2012-04-02 07:38:55 +02:00
Emanuel Schuetze
beb8694cdc #81: Use AJAX code for participant status and superuser links in overview 2012-04-02 07:34:34 +02:00
Emanuel Schuetze
ebbacfd443 #80: New participant status filter 2012-04-02 07:32:42 +02:00
Emanuel Schuetze
e5ef0ac424 #79: Replaced winner cup icon of elected candidates into green check. 2012-04-02 07:30:52 +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
0406966e55 Removed new file from changeset r279 to clean up Default branch
(because file already in 1.2-dev branch).
2012-03-28 15:37:18 +02:00
Emanuel Schuetze
0976206eb4 Reverted changset r279 from Default branch (because it's for
1.2-dev-branch only).
2012-03-28 15:20:43 +02:00
Emanuel Schuetze
ac9d31d7d4 Reverted changset r280 from Default branch (because it's for
1.2-dev-branch only).
2012-03-28 15:18:18 +02:00
Emanuel Schuetze
c6a40f4dcb Reverted changset r281 from Default branch (because it's for
1.2-dev-branch only).
2012-03-28 15:17:50 +02:00
Emanuel Schuetze
a06d20a8d8 Reverted changset r282 from Default branch (because it's for
1.2-dev-branch only).
2012-03-28 15:17:29 +02:00
Emanuel Schuetze
a11ed6cfdb Minor template fixes. 2012-03-22 17:30:02 +01:00