Oskar Hahn
|
416f3f6ff3
|
added select widgets view
|
2012-08-15 13:42:25 +02:00 |
|
Oskar Hahn
|
6b7ea558fc
|
rewrote widgets for the dashboard
|
2012-08-15 11:56:43 +02:00 |
|
Oskar Hahn
|
dfb24ba61a
|
Merge branch 'master' into dashboard
|
2012-08-15 11:05:29 +02:00 |
|
Oskar Hahn
|
9c031768f8
|
fix merge errors
|
2012-08-15 11:01:38 +02:00 |
|
Oskar Hahn
|
c6bc50e2fd
|
rename projector to dashboard
|
2012-08-15 10:58:29 +02:00 |
|
Oskar Hahn
|
b7a0e83c68
|
changed the main script
|
2012-08-14 14:19:59 +02:00 |
|
Oskar Hahn
|
a2be848932
|
Merge branch 'master' into install
|
2012-08-13 19:35:14 +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
|
d0e7419666
|
Merge remote-tracking branch 'openslides/stable/1.2.x'
|
2012-08-13 18:36:23 +02:00 |
|
Oskar Hahn
|
5178363127
|
Merge pull request #6 from ostcar/translation
Translation
|
2012-08-13 09:30:17 -07:00 |
|
Oskar Hahn
|
3995765dc5
|
Merge pull request #5 from ostcar/participant
Participant
|
2012-08-13 09:23:55 -07:00 |
|
Oskar Hahn
|
31ca01563e
|
some corrective actions
|
2012-08-13 14:37:49 +02:00 |
|
Oskar Hahn
|
df40de67b0
|
rename openslidesuser to user and openslidesgroup to group
|
2012-08-12 12:52:38 +02:00 |
|
Oskar Hahn
|
0a8ee9cbad
|
changed request.user to be the openslidesuser
|
2012-08-12 10:12:26 +02:00 |
|
Oskar Hahn
|
6795ccd25b
|
change the users in the groupform
|
2012-08-11 11:36:55 +02:00 |
|
Oskar Hahn
|
cdf160dfc3
|
fix some problems with the creation of new users
|
2012-08-11 11:09:20 +02:00 |
|
Oskar Hahn
|
f01fe5a894
|
removed unused imports from participant and did some pep8 changes
|
2012-08-11 10:51:52 +02:00 |
|
Oskar Hahn
|
bc3e7fdaab
|
rewrote the group views as class based views
|
2012-08-11 10:09:54 +02:00 |
|
Oskar Hahn
|
9b3bec69d1
|
rewrote the passwort reset view as class base view
|
2012-08-10 21:24:26 +02:00 |
|
Oskar Hahn
|
87af568eeb
|
redesign the DeleteView
Append a QuestionMixin to send a question via the django message api
|
2012-08-10 21:00:13 +02:00 |
|
Oskar Hahn
|
1f2f7cc73a
|
rewrote user csv import
The import does not delete the existing users anymore, but append the users as new users.
|
2012-08-10 19:49:46 +02:00 |
|
Oskar Hahn
|
bb00eb3eb4
|
rewrote participant status view as class based view
|
2012-08-10 19:19:41 +02:00 |
|
Oskar Hahn
|
90fddba63b
|
rewrote delete participant view as class based view
|
2012-08-10 13:29:46 +02:00 |
|
Oskar Hahn
|
c029fe2f95
|
ix participant tests
|
2012-08-10 13:26:03 +02:00 |
|
Oskar Hahn
|
ddb5756868
|
rewrote the participant edit view as class based view
|
2012-08-10 13:22:09 +02:00 |
|
Oskar Hahn
|
1832a0c125
|
make the openslides user a child model of the django user model
|
2012-08-10 13:11:10 +02:00 |
|
Oskar Hahn
|
29049119f7
|
rewrote participant overview as class based view
|
2012-08-10 11:51:45 +02:00 |
|
Oskar Hahn
|
f008a4eb0a
|
use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name
|
2012-08-10 11:18:01 +02:00 |
|
Oskar Hahn
|
153482f32d
|
first_name, last_name and name_surfix as OpenSlidesUser attributes
|
2012-08-10 11:14:11 +02:00 |
|
Oskar Hahn
|
139bd9c57d
|
Merge pull request #4 from normanjaeckel/stable/1.2.x
Fix typo in default permissions for anonymous-group
|
2012-08-10 00:01:29 -07:00 |
|
Norman Jäckel
|
3ba04e10b4
|
Fix typo in default permissions for anonymous-group
|
2012-08-10 00:37:23 +02:00 |
|
Oskar Hahn
|
b19f6a7d74
|
Merge branch 'master' into install
Conflicts:
openslides/__init__.py
|
2012-08-08 13:45:32 +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
|
5ceb79e06c
|
Merge pull request #3 from ostcar/user-api
User api
|
2012-08-08 01:56:15 -07:00 |
|
Oskar Hahn
|
75443808af
|
fix some errors in participant
|
2012-08-08 10:52:13 +02:00 |
|
Oskar Hahn
|
d1ab2f2e85
|
some pep8 corections for the participant app
|
2012-08-08 10:34:23 +02:00 |
|
Oskar Hahn
|
f22362df9d
|
made participant-test run again
|
2012-08-08 10:07:36 +02:00 |
|
Oskar Hahn
|
1719aa588d
|
rename some user api and participant names
|
2012-08-07 22:43:57 +02:00 |
|
Oskar Hahn
|
b55ceddb82
|
append tests for the participant app
|
2012-08-07 10:15:39 +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
|
f8f6e712a7
|
added LOCALE_PATHS to openslides_settings to avoid deprication in Django 1.5
|
2012-08-05 22:35:09 +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
|
6ec3bbfe3b
|
Merge pull request #2 from ostcar/stable/1.2.x
Stable/1.2.x
|
2012-08-05 03:24:45 -07:00 |
|
Oskar Hahn
|
008c743650
|
fixt #334. Let the anonymous user see the assignments by default
|
2012-08-05 11:58:11 +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
|
4873cd7163
|
fixted #330. Error if the related slide for an Agenda Item does not exists
|
2012-08-05 11:28:56 +02:00 |
|
Oskar Hahn
|
bcd98301a9
|
remove mercurial_version from openslides.__init__
|
2012-08-05 10:59:25 +02:00 |
|
Oskar Hahn
|
feb1aa4138
|
make start.py script run again
|
2012-08-05 09:52:00 +02:00 |
|
Oskar Hahn
|
e3f8bfcfd0
|
update setup.py to make an openslides module
|
2012-08-04 20:59:27 +02:00 |
|
Oskar Hahn
|
1a1bcb2358
|
updated some parts of OpenSlides to the new user-api
|
2012-08-04 15:15:11 +02:00 |
|