Oskar Hahn
|
6b7ea558fc
|
rewrote widgets for the dashboard
|
2012-08-15 11:56:43 +02:00 |
|
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
|
df40de67b0
|
rename openslidesuser to user and openslidesgroup to group
|
2012-08-12 12:52:38 +02:00 |
|
Oskar Hahn
|
5353053d29
|
Merge branch 'stable/1.2.x'
Conflicts:
openslides/application/views.py
|
2012-08-08 11:21:36 +02:00 |
|
Oskar Hahn
|
1719aa588d
|
rename some user api and participant names
|
2012-08-07 22:43:57 +02:00 |
|
Oskar Hahn
|
ab33b9f05a
|
fix error in application-supporters an assignment-candidates, for non admin users
|
2012-08-06 14:58:52 +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
|
998fb3e1ee
|
fix #336. The admin could not edit the supporters from applications
|
2012-08-05 11:48:03 +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
|
8da09bb985
|
user-api: fix an error with deactivated supporters in application
|
2012-08-04 12:46:32 +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
|
93020f9ead
|
mark group to be teated as user
|
2012-08-03 12:44:34 +02:00 |
|
Oskar Hahn
|
4ffb701397
|
created new user-api
|
2012-08-03 00:11:53 +02:00 |
|
Oskar Hahn
|
47a40150e6
|
added " befor permitted.
This changes a translation string
|
2012-07-28 11:01:57 +02:00 |
|
Oskar Hahn
|
9a87db61cc
|
#329 fix attribute error for anonymous users in the application view
|
2012-07-27 11:56:20 +02:00 |
|
Emanuel Schuetze
|
172b90ea1b
|
#328: Translated application status error message.
|
2012-07-24 07:32:20 +02:00 |
|
Emanuel Schuetze
|
0c0f3d09da
|
#328: Show error message if application status is already set.
|
2012-07-23 23:17:03 +02:00 |
|
Emanuel Schuetze
|
219b1e936e
|
Fixed two PDF build errors.
|
2012-07-23 12:35:15 +02:00 |
|
Emanuel Schuetze
|
0ce6627756
|
Fixed csv import error.
|
2012-07-23 08:55:05 +02:00 |
|
Norman Jäckel
|
e74e80299f
|
Fix application links in the widgets.
|
2012-07-23 00:41:44 +02:00 |
|
Oskar Hahn
|
ff4529d8eb
|
#315 remove application from agenda by appending a new methode get_application_title_supplement
|
2012-07-20 11:22:09 +02:00 |
|
Oskar Hahn
|
f928abd006
|
merge
|
2012-07-19 11:16:38 +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 |
|
Emanuel Schuetze
|
c678b557fa
|
#311: Updated first login message and translations.
|
2012-07-19 08:21:51 +02:00 |
|
Emanuel Schuetze
|
4fe77f89d3
|
Updated translations.
|
2012-07-18 21:15:12 +02:00 |
|
Oskar Hahn
|
8f4970e16c
|
merge 1.2-dev with default branch
|
2012-07-18 10:37:23 +00:00 |
|
Oskar Hahn
|
07c4649243
|
#297 fix error in ApplicationPDF with changes in the poll API
|
2012-07-16 14:05:51 +02:00 |
|
Oskar Hahn
|
0b033271f8
|
fix some typos, mostly {%trans to {% trans
|
2012-07-16 14:00:29 +02:00 |
|
Norman Jäckel
|
5d5e7c10f5
|
Change strings in agenda overview and agenda widget concerning application items
|
2012-07-16 00:39:46 +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 |
|
Oskar Hahn
|
aa130ab2da
|
cleanup openslides base files.
Do not manipulate the pythonpath anymore.
|
2012-07-10 14:00:51 +02:00 |
|
Oskar Hahn
|
debaa505fb
|
fix problems with reportlab and ugettext_lazy
|
2012-07-10 12:11:07 +02:00 |
|
Oskar Hahn
|
01f0823ed7
|
cleanup the assignment app
|
2012-07-10 11:27:06 +02:00 |
|
Oskar Hahn
|
403f8e7917
|
update translation
|
2012-07-10 02:21:27 +02:00 |
|
Oskar Hahn
|
8d961f4940
|
fix translation by using ugettext_lazy
|
2012-07-10 01:33:03 +02:00 |
|
Oskar Hahn
|
f074cb5bfd
|
cleanup the imports of the application app
|
2012-07-08 09:21:39 +02:00 |
|
Norman Jäckel
|
e4367051df
|
Hide "Reason" in Application PDF if there is none.
|
2012-07-06 15:30:14 +02:00 |
|
Oskar Hahn
|
a72832842b
|
#267 fixt typo.
syncdb is required
|
2012-07-04 11:00:58 +02:00 |
|
Norman Jäckel
|
40c2bf481f
|
Fix #240
|
2012-07-04 02:10:06 +02:00 |
|
Oskar Hahn
|
8d4df3236b
|
#243 fixt but, which created a second version for a new application
|
2012-07-01 17:20:02 +02:00 |
|
Norman Jäckel
|
acd9ba1fd1
|
Zusammenführen
|
2012-07-01 16:30:56 +02:00 |
|
Norman Jäckel
|
d22118ac72
|
Fix #252
|
2012-07-01 16:28:11 +02:00 |
|
Oskar Hahn
|
00eb365b91
|
rewrote active_slide in generic view
also reordert some imports
|
2012-07-01 15:35:05 +02:00 |
|
Oskar Hahn
|
6c206fa740
|
#246 open activate slide view ajax
|
2012-07-01 11:07:04 +02:00 |
|
Oskar Hahn
|
0a269ce601
|
help_text for the application config page
|
2012-06-30 16:28:15 +02:00 |
|