Commit Graph

113 Commits

Author SHA1 Message Date
Oskar Hahn bd64a6cb5c Merge branch 'stable/1.2.x'
Conflicts:
	openslides/application/models.py
	openslides/application/views.py
	openslides/participant/forms.py
	openslides/participant/views.py
2012-08-13 19:16:42 +02:00
Oskar Hahn c52f8f3ca7 changed application to motion and permitted to authorized in message-strings 2012-08-05 22:31:20 +02:00
Oskar Hahn 1a1bcb2358 updated some parts of OpenSlides to the new user-api 2012-08-04 15:15:11 +02:00
Oskar Hahn 14bf6d0a35 user-api: updated the application-supporter system to new user-api 2012-08-04 12:19:31 +02:00
Oskar Hahn 4ffb701397 created new user-api 2012-08-03 00:11:53 +02:00
Norman Jäckel e74e80299f Fix application links in the widgets. 2012-07-23 00:41:44 +02:00
Oskar Hahn 70b161c539 added name for participant app in __init__
removed some files, added though branch merge
2012-07-19 11:11:07 +02:00
Oskar Hahn 8f4970e16c merge 1.2-dev with default branch 2012-07-18 10:37:23 +00:00
Oskar Hahn 0b033271f8 fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
Norman Jäckel 16e829a05d Change application widget - Set number behind the title.
Fix wrong application title in the beamer template
2012-07-16 00:12:12 +02:00
Norman Jäckel 0279c07b15 Change design of application view and poll view (see #292) 2012-07-16 00:01:26 +02:00
Oskar Hahn 66b853a10a redesign the poll api, so it don't creates poll-tables. Also, it is easier to get the poll for a vote object.
#288 show percent after the vote results
2012-07-13 11:16:06 +02:00
Emanuel Schuetze 9c03726bef #295: Change link to button. 2012-07-13 07:44:42 +02:00
Norman Jäckel e99e5ab290 Clean up browsertitles (#282) in assignment and participant tab 2012-07-13 01:10:58 +02:00
Norman Jäckel 32c80caa37 Clean up browsertitles (#282) in agenda and application 2012-07-13 00:44:12 +02:00
Norman Jäckel 40c2bf481f Fix #240 2012-07-04 02:10:06 +02:00
Norman Jäckel d22118ac72 Fix #252 2012-07-01 16:28:11 +02:00
Oskar Hahn 6c206fa740 #246 open activate slide view ajax 2012-07-01 11:07:04 +02:00
Oskar Hahn 60570ea962 #245 update translation 2012-06-30 15:21:27 +02:00
Norman Jäckel c19118e774 Fix #230 2012-06-30 14:17:15 +02:00
Oskar Hahn 48c53d3cd0 link for creating an application agenda item in the sidebare 2012-06-24 22:21:46 +02:00
Norman Jäckel 4edc4f503c Edit Symbol in Application 2012-06-23 13:17:24 +02:00
Norman Jäckel 654388117b #208 and other symbol things 2012-06-23 13:14:18 +02:00
Norman Jäckel b1ed56176e Edit and View Links and Symbols in Widgets fixed (#206) 2012-06-23 10:43:01 +02:00
Norman Jäckel a439794874 Insert Edit Symbol (Ticket 207) 2012-06-23 09:32:21 +02:00
Oskar Hahn bf46342d17 #205 show Application number in projector Tab 2012-06-11 14:22:09 +02:00
Emanuel Schuetze b81469703b #198: Optimized submenu of application and assignment. 2012-05-18 19:38:21 +02:00
Emanuel Schuetze 92562aef28 #188: Fixed projector template style error. 2012-05-15 20:36:49 +02:00
Emanuel Schuetze eb7672074e Some more style work for application projector template. 2012-04-30 08:30:04 +02:00
Emanuel Schuetze e28c15eff9 Improve projector style of application voting results. 2012-04-30 08:23:50 +02:00
Emanuel Schuetze 79605531c5 Some minor style fixes for poll view templates. 2012-04-29 19:12:18 +02:00
Emanuel Schuetze 905d9d546c Fixe pdf icon path. 2012-04-29 19:01:18 +02:00
René Köcher 537571ec69 #100 Delete applications by admin/superuser only: part2 2012-04-27 22:46:27 +02:00
René Köcher 81bc19730b #100 Delete applications by admin/superuser only: part1 2012-04-27 21:22:44 +02:00
Emanuel Schuetze 3bcf4fd9c3 Added missing 'required' helptext to all forms. 2012-04-26 17:50:46 +02:00
Emanuel Schuetze 719ea6ec79 #93: Show application number in header of projector template.
Some more projetor style work.
2012-04-24 22:27:16 +02:00
Emanuel Schuetze d56dcba7d4 #119: Adjusted icon filenames. 2012-04-23 21:27:22 +02:00
Emanuel Schuetze 81a0c9661e #119: Adjusted some icon filenames. 2012-04-23 08:07:21 +02:00
Emanuel Schuetze f1908bca89 Fixed permissions for action columns. 2012-04-20 22:58:57 +02:00
Emanuel Schuetze 667582cdfb #106: add pdf link to actions column 2012-04-20 22:47:44 +02:00
Emanuel Schuetze 3886449b2c #106: Action column for applications.
#121 (partly): Activate links for agenda and applications table.
2012-04-20 22:43:12 +02:00
Emanuel Schuetze ccc1d2b707 #104: Updated second submneu for application. 2012-04-20 22:13:47 +02:00
Emanuel Schuetze 42a2e44390 Updated translations. 2012-04-20 11:15:15 +02:00
Emanuel Schuetze ae5efcfa9d Some minor fixes for agenda, application, participant overview table. 2012-04-20 08:14:23 +02:00
Oskar Hahn 4e904c7356 now it is possible to create a item, witch is realted to another object, for example an application. 2012-04-19 12:46:04 +02:00
Oskar Hahn e23c195388 show application title in presentation view 2012-04-19 11:10:36 +02:00
Oskar Hahn 74c704641c fixed yes, no, abstain values in the presentation View of an Application 2012-04-19 11:08:22 +02:00
Emanuel Schuetze 236bbfd3bc Automated merge with ssh://openslides.org/openslides 2012-04-18 22:01:06 +02:00
Oskar Hahn 07e9d8e9f9 rewrote application filters 2012-04-18 19:57:39 +02:00
Emanuel Schuetze 7eb410f093 #104: Application submenu. 2012-04-18 19:50:51 +02:00