Commit Graph

4320 Commits

Author SHA1 Message Date
Emanuel Schuetze f185b2e63c Show type field for non-manager. 2011-09-07 18:06:11 +02:00
Oskar Hahn 7d46574498 realy realy save password... 2011-09-07 14:27:36 +02:00
Oskar Hahn 8ad6ebfeee realy save password with the user_reset_password function 2011-09-07 14:21:42 +02:00
Oskar Hahn a42e352d2a Automated merge with ssh://oshahn.de/openslides 2011-09-07 09:56:30 +02:00
Oskar Hahn e42030b1ba count users in partition overview 2011-09-07 09:56:19 +02:00
Emanuel Schuetze 5fd31f6ca6 Added assignment pdf. 2011-09-07 07:52:44 +02:00
Emanuel Schuetze d8a880105a Some minor renames (applications # -> no., beamer -> projector etc.) 2011-09-06 23:23:05 +02:00
Emanuel Schuetze 1708c148ad Updated translations. 2011-09-06 23:22:13 +02:00
Emanuel Schuetze 288133b551 Application PDF: Added signature field for submitter. 2011-09-06 23:01:21 +02:00
Emanuel Schuetze bb38d8b85e Updated application PDF. Added vote results. 2011-09-06 22:22:29 +02:00
Emanuel Schuetze ecc728c8e9 Some agenda style changes. 2011-09-06 18:45:34 +02:00
Oskar Hahn 08a1e88e12 newest version link for application 2011-09-06 10:41:06 +02:00
Oskar Hahn f6b335245d set more then one firstpassword 2011-09-06 10:15:23 +02:00
Oskar Hahn 31550a4ca7 database way for the last commit 2011-09-06 10:07:51 +02:00
Oskar Hahn b14742205b unique candidates in assignments if there are more then one ballot 2011-09-06 09:40:48 +02:00
Oskar Hahn 3c42b26d6f Automated merge with ssh://oshahn.de/openslides 2011-09-06 09:27:11 +02:00
Oskar Hahn 0727b1d72a permission_required is only allowds in views with request as first argument 2011-09-06 09:17:39 +02:00
Emanuel Schuetze cdfb6b24e3 Mark elected candidates in beamer view. 2011-09-06 07:33:13 +02:00
Emanuel Schuetze 8cd0ac8778 Added icon and style information for elected/not elected candidates. 2011-09-05 23:13:18 +02:00
Emanuel Schuetze 4fb4691f14 Added counter and message for password generation. 2011-09-05 22:26:19 +02:00
Emanuel Schuetze 7eac8cda5d Beamer: Display election status finished. 2011-09-05 21:53:15 +02:00
Emanuel Schuetze f412e9065a Needs fix to group candidates by user. 2011-09-05 21:40:56 +02:00
Emanuel Schuetze 0b17ab10fe Fixed candidates order in beamer view. Some style changes. 2011-09-05 20:47:55 +02:00
Emanuel Schuetze fec269e4a7 Fixed alphabetical order of candidates. 2011-09-05 20:27:47 +02:00
Emanuel Schuetze 9275acf029 Show full profile name of supmitter and supports. 2011-09-05 20:05:23 +02:00
Emanuel Schuetze 35c0b50940 Fix redirect for user group overview. 2011-09-05 19:53:40 +02:00
Oskar Hahn 41fbd456d2 add group by user-import 2011-09-05 10:11:47 +02:00
Oskar Hahn 450190e603 show group in passwordlist 2011-09-05 09:14:38 +02:00
Oskar Hahn 90991f62e7 Automated merge with ssh://oshahn.de/openslides 2011-09-05 09:08:20 +02:00
Oskar Hahn 510cbf8374 reorder user-import csv data 2011-09-05 09:08:12 +02:00
Oskar Hahn c6259d83bb set first password by users with None or '' firstpassword 2011-09-05 09:08:00 +02:00
Emanuel Schuetze b8ff9696b4 Minor. 2011-09-04 19:28:06 +02:00
Emanuel Schuetze b7a1afd3a2 Changed url 'item' to 'agenda'. 2011-09-04 19:22:30 +02:00
Emanuel Schuetze e85f5b4f1e Minor style changes. 2011-09-04 19:22:08 +02:00
Emanuel Schuetze d3adc382b8 Updated translations. 2011-09-04 19:08:38 +02:00
Emanuel Schuetze 53ee9c598d Added icons for controling beamer view (pan,zoom) 2011-09-04 19:08:20 +02:00
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 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
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
Oskar Hahn aab2916d6d hide closed elements in the agenda 2011-09-03 15:08:20 +02:00
Emanuel Schuetze 7c866e11e4 Removed ItemPoll and ItemFormPoll. 2011-09-03 14:36:01 +02:00
Emanuel Schuetze a874e327ac Fixed style. 2011-09-03 14:31:33 +02:00
Emanuel Schuetze 8ef3d485fe Exluded weight field from item forms. 2011-09-03 14:30:56 +02:00
Emanuel Schuetze 444cb5d23f Automated merge with ssh://openslides.org/openslides 2011-09-03 13:53:45 +02:00
Emanuel Schuetze cc10d5042b Show invalid votes and votes cast for application and assignment results. 2011-09-03 13:53:37 +02:00
Oskar Hahn b626d049fe ask, if by deleting an item, if the childen shoud be deleted as well 2011-09-03 12:45:19 +02:00
Oskar Hahn e81de0fa48 Automated merge with ssh://oshahn.de/openslides 2011-09-03 12:26:22 +02:00
Oskar Hahn a32ed1d059 do not show the elected box in assignment edit form 2011-09-03 12:26:14 +02:00
Emanuel Schuetze a9fd09951b Automated merge with ssh://openslides.org/openslides 2011-09-03 12:16:52 +02:00
Emanuel Schuetze 97228f6558 Show invalid votes in application view. 2011-09-03 12:16:47 +02:00
Oskar Hahn 0c931559a0 apply button in agenda edit form 2011-09-03 12:14:17 +02:00
Oskar Hahn eaee6f9154 remove the obligation to change the password 2011-09-03 12:14:04 +02:00
Oskar Hahn 98ee433cd3 merge error 2011-09-03 11:56:35 +02:00
Oskar Hahn f5d2a503d0 Automated merge with ssh://oshahn.de/openslides 2011-09-03 11:46:22 +02:00
Oskar Hahn dcbeb452fb canidate in assignment can be marked as elected 2011-09-03 11:42:44 +02:00
Emanuel Schuetze 689b6e1706 Automated merge with ssh://openslides.org/openslides 2011-09-03 10:52:36 +02:00
Emanuel Schuetze ca0c50caef Many improvements for application and assignment poll system. 2011-09-03 10:52:29 +02:00
Emanuel Schuetze b1b5d9cb70 Removed old poll permissions. 2011-09-03 01:46:56 +02:00
Emanuel Schuetze e752e05b0f Removed unnecessary parts from poll system. Needs new development in future. 2011-09-03 01:40:06 +02:00
Emanuel Schuetze ed40977403 Removed reduced agenda pdf. Not useable. 2011-09-03 01:24:50 +02:00
Emanuel Schuetze 2278ddca54 DB change: Changed voteinvalid to votesinvalid. 2011-09-03 00:43:09 +02:00
Emanuel Schuetze f24cc7c0c1 Minor fixes 2011-09-03 00:42:37 +02:00
Oskar Hahn 2a89ccca5a merge 2011-09-02 20:46:52 +02:00
Oskar Hahn a9775bdd73 api for ajax requests 2011-09-02 20:46:24 +02:00
Emanuel Schuetze 6458a69324 Reduced application poll title. 2011-09-02 17:40:02 +02:00
Emanuel Schuetze 1811f0108c PDF: Restructured ballot stylesheets. 2011-09-02 17:39:32 +02:00
Emanuel Schuetze 590d56a80e PDF: Optimized application print function. 2011-09-02 16:34:12 +02:00
Emanuel Schuetze 8e325e5361 Restructured pdf stylesheets. 2011-09-02 15:54:13 +02:00
Oskar Hahn 462cba2416 close and open a slide with ajax 2011-08-31 23:47:31 +02:00
Oskar Hahn 4e03fe90bc active Item by ajax and prepared other ajax features 2011-08-31 18:25:03 +02:00
Oskar Hahn 628de1f954 typo 2011-08-31 14:32:02 +02:00
Oskar Hahn 78bd65a700 add knockout api 2011-08-31 14:26:46 +02:00
Oskar Hahn 67c6fdba29 use a-tag instead of onclick for nojs use 2011-08-31 14:17:11 +02:00
Emanuel Schuetze b2cd48d971 View event date and location if not empty. 2011-08-03 22:52:45 +02:00
Emanuel Schuetze d41a1c4791 Fixed: parent form field is not required. 2011-08-02 21:40:08 +02:00
Oskar Hahn 3db6a12024 Add code 2011-07-31 10:46:29 +02:00