Commit Graph

6651 Commits

Author SHA1 Message Date
Emanuel Schuetze 30afe96fc0 AVersion fixes: Added reject confirm message. Style changes. 2011-09-04 19:07:45 +02:00
Emanuel Schuetze 3b2763e2dc PDF: Fixed items in layer 3+ 2011-09-04 19:06:48 +02:00
Emanuel Schuetze 6b7697a5b2 Changed translation string: revision -> version. 2011-09-04 12:35:46 +02:00
Emanuel Schuetze 57ea883d51 Updated permissions. 2011-09-04 12:33:06 +02:00
Emanuel Schuetze d1d0e7e9b4 Updated permissions. 2011-09-04 12:21:58 +02:00
Emanuel Schuetze 85d74683e8 Updated translations. 2011-09-04 12:21:38 +02:00
Oskar Hahn f4f7aa4e57 Automated merge with ssh://oshahn.de/openslides 2011-09-04 10:49:21 +02:00
Oskar Hahn 8089c3c8a9 do not create a new aversion, if only the permission has changed 2011-09-04 10:49:17 +02:00
Emanuel Schuetze 3fc42c6488 Added revision confirm dialog. 2011-09-04 10:43:25 +02:00
Oskar Hahn da14eca296 application.aid is the permitted aid, or the last aid 2011-09-04 10:34:30 +02:00
Oskar Hahn 89386a4ac7 Automated merge with ssh://oshahn.de/openslides 2011-09-04 10:21:58 +02:00
Oskar Hahn 572782befa default version is the accepted Version 2011-09-04 10:21:54 +02:00
Emanuel Schuetze 9f2929df6b Automated merge with ssh://openslides.org/openslides 2011-09-04 10:21:11 +02:00
Emanuel Schuetze 7271964f59 View aversion accept/reject icons and revision number. 2011-09-04 10:21:06 +02:00
Oskar Hahn 2c6c9b55ee accept old application versions 2011-09-04 10:02:54 +02:00
Oskar Hahn a89bf9f49b Automated merge with ssh://oshahn.de/openslides 2011-09-04 09:57:30 +02:00
Oskar Hahn a1d92dc1bb generate username with first and lastname 2011-09-04 09:57:23 +02:00
Emanuel Schuetze 3d6e3576aa Automated merge with ssh://openslides.org/openslides 2011-09-04 09:35:25 +02:00
Emanuel Schuetze 6a1a57efca Added permissions for pdf access. 2011-09-04 09:34:52 +02:00
Emanuel Schuetze a6652e3fb4 Updated participants list with permissions. 2011-09-04 09:12:15 +02:00
Oskar Hahn d07aa3ac3b Automated merge with ssh://oshahn.de/openslides 2011-09-04 09:06:07 +02:00
Oskar Hahn 6e8cb392bb new inital_data 2011-09-04 09:05:38 +02:00
Emanuel Schuetze 262304d1e5 Updated event header. 2011-09-04 08:39:36 +02:00
Emanuel Schuetze c34cc79a84 Updated circle img path with SITE_ROOT. 2011-09-04 08:31:44 +02:00
Emanuel Schuetze 5e4ba42de3 Imported SITE_ROOT for font path. 2011-09-04 08:23:03 +02:00
Emanuel Schuetze 63c68c9714 Automated merge with ssh://openslides.org/openslides 2011-09-04 00:54:52 +02:00
Emanuel Schuetze a05b576f9e Print password pdf with url and welcometext. 2011-09-04 00:54:45 +02:00
Oskar Hahn bd4504b40e typo in agenda 2011-09-04 00:29:23 +02:00
Oskar Hahn 5fc2549fd3 Automated merge with ssh://oshahn.de/openslides 2011-09-04 00:18:17 +02:00
Oskar Hahn c22d35cd43 scroll and scall the beamer 2011-09-04 00:18:11 +02:00
Emanuel Schuetze ceb9a3b4c3 PDF: Optimized ballot description for 2 lines. 2011-09-03 23:38:14 +02:00
Emanuel Schuetze 6a991dba0d Removed language selector. Should be used via settings.py now. 2011-09-03 23:37:15 +02:00
Emanuel Schuetze 1b81cfee27 Automated merge with ssh://openslides.org/openslides 2011-09-03 19:49:35 +02:00
Emanuel Schuetze d0363d7ad9 Added icon for accept/reject application versions. 2011-09-03 19:49:32 +02:00
Oskar Hahn 31e663d274 Automated merge with ssh://oshahn.de/openslides 2011-09-03 19:43:31 +02:00
Oskar Hahn 67f650aee8 error by password reset function 2011-09-03 19:42:43 +02:00
Emanuel Schuetze 1bce678a03 Automated merge with ssh://openslides.org/openslides 2011-09-03 19:25:16 +02:00
Emanuel Schuetze 2ad0754f88 Added and fixed apply buttons. Updated translation. 2011-09-03 19:25:05 +02:00
Oskar Hahn 3c38a02896 requestcontext by error-pages 2011-09-03 19:16:43 +02:00
Oskar Hahn a7fc2c2b88 show a discreet error when there is an ajax-error on the beamer 2011-09-03 18:50:47 +02:00
Oskar Hahn 4639e77549 apply link redirect to edit-form, if it was a new form 2011-09-03 18:35:19 +02:00
Emanuel Schuetze ad263ea6a0 Automated merge with ssh://openslides.org/openslides 2011-09-03 18:11:54 +02:00
Oskar Hahn 5543320e0d accept and reject links for applications 2011-09-03 18:11:42 +02:00
Emanuel Schuetze 452d23a16b Automated merge with ssh://openslides.org/openslides 2011-09-03 18:11:15 +02:00
Emanuel Schuetze ba28afdc49 Added icons to hide/show hidden agenda items. Some style changes. 2011-09-03 18:11:05 +02:00
Oskar Hahn e849716ee4 default password and reset function 2011-09-03 17:17:29 +02:00
Emanuel Schuetze 762f09197d Updated translations. 2011-09-03 16:36:49 +02:00
Emanuel Schuetze e23a498b83 Merged. 2011-09-03 16:22:43 +02:00
Emanuel Schuetze 021fb27833 Added apply buttons. Some style changes. Fix permissions. 2011-09-03 16:20:10 +02:00
Oskar Hahn 28785c0ed4 Automated merge with ssh://oshahn.de/openslides 2011-09-03 15:08:26 +02:00