Oskar Hahn
c46ec570bf
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-15 02:16:26 +01:00
Oskar Hahn
1a2ebf7b3b
removed some unused functions
2013-03-15 01:34:17 +01:00
Emanuel Schuetze
49765bbe6e
Merge remote branch 'upstream/master' into motiontemplate
2013-03-14 23:05:38 +01:00
Emanuel Schuetze
b2dc3820bd
Changed motion.number to motion.identifier.
2013-03-14 23:04:32 +01:00
Oskar Hahn
63932a348e
Merge pull request #561 from emanuelschuetze/datatables-participants
...
Datatables for participants table (reworked)
2013-03-14 14:40:01 -07:00
Emanuel Schuetze
0587c2019a
Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code.
...
Fixed csv import (added success url).
Added large csv file for testing import of >1000 participants.
Removed lage csv example file for paticipants (will be sustitute by a test script in future).
2013-03-14 22:34:40 +01:00
Norman Jäckel
9679be1867
Move builtin groups to a signal.
2013-03-12 20:58:22 +01:00
Emanuel Schuetze
71b1bede6f
Set new button als primary/blue button.
2013-03-09 14:17:30 +01:00
Emanuel Schuetze
c3c200b423
Changed link to new csv import wiki page on github.
2013-03-09 14:16:28 +01:00
Oskar Hahn
27c73092e1
Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
...
Conflicts:
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
2013-02-06 09:25:27 +01:00
Emanuel Schuetze
ce51f0ef7e
template: minor style changes
2013-02-05 23:42:30 +01:00
Emanuel Schuetze
6b4ee0e4f6
Updated translation.
2013-02-05 23:09:23 +01:00
Emanuel Schuetze
e49efb40d8
template: Added new css class for minimum column width.
2013-02-05 22:03:43 +01:00
Emanuel Schuetze
d809ff95bb
template: Removed unused participant.css
2013-02-05 21:51:09 +01:00
Emanuel Schuetze
64e3c1f3cb
template: Removed unused 'load staticfiles'.
2013-02-05 21:41:26 +01:00
Emanuel Schuetze
0c5459f96e
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
2013-02-05 20:40:55 +01:00
Emanuel Schuetze
404bf7f0b5
template: Added missing back link.
2013-02-04 13:38:29 +01:00
Oskar Hahn
90614cc637
Updated some views for the new utils.views style
2013-02-03 19:43:36 +01:00
Oskar Hahn
139ba74459
Merge remote-tracking branch 'emanuel/newtemplate' into new_template
...
Conflicts:
.travis.yml
INSTALL.txt
openslides/agenda/templates/agenda/base_agenda.html
openslides/agenda/templates/agenda/edit.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/agenda/templates/agenda/widget.html
openslides/assignment/templates/assignment/base_assignment.html
openslides/assignment/templates/assignment/config.html
openslides/assignment/templates/assignment/edit.html
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/poll_view.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/templates/assignment/widget.html
openslides/config/templates/config/general.html
openslides/motion/templates/motion/base_motion.html
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/motion/templates/motion/widget.html
openslides/motion/views.py
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/edit.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_widget.html
openslides/participant/templates/participant/import.html
openslides/participant/templates/participant/login.html
openslides/participant/templates/participant/overview.html
openslides/participant/templates/participant/password_change.html
openslides/participant/templates/participant/settings.html
openslides/participant/templates/participant/user_widget.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/control_countdown.html
openslides/projector/templates/projector/control_overlay_message.html
openslides/projector/templates/projector/custom_slide_widget.html
openslides/projector/templates/projector/live_view_widget.html
openslides/projector/templates/projector/new.html
openslides/projector/templates/projector/overlay_widget.html
openslides/templates/base.html
openslides/utils/template.py
openslides/utils/views.py
requirements.txt
2013-02-03 19:03:18 +01:00
Oskar Hahn
6c3eb0f765
fixed urls in views from the participant app
2013-02-01 17:35:27 +01:00
Emanuel Schuetze
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +01:00
Emanuel Schuetze
586425354d
Reworked new template, especially agenda and dashboard.
2013-01-08 23:05:35 +01:00
Oskar Hahn
0231fe37f5
Start to rewrite the motion app
2013-01-08 20:22:03 +01:00
Emanuel Schuetze
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +01:00
Oskar Hahn
3229d86d4d
Import urls.py needed django functions from django.conf.urls
2013-01-05 01:05:38 +01:00
Oskar Hahn
5d754984a3
fixed pep8 errors
2013-01-04 12:39:42 +01:00
Emanuel Schuetze
4ae7f3e243
Merge remote branch 'upstream/master' into newtemplate
...
Conflicts:
openslides/application/views.py
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/views.py
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_overview.html
openslides/participant/templates/participant/overview.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/dashboard.html
openslides/projector/templates/projector/live_view_widget.html
openslides/static/styles/base.css
openslides/templates/base.html
openslides/templates/front_page.html
openslides/utils/utils.py
2013-01-02 23:01:43 +01:00
Oskar Hahn
8a84f72891
fixed more url-template-tags
2012-12-16 17:35:06 +01:00
Oskar Hahn
5ea863ca81
Let the user choose the language in his settings
2012-12-16 17:26:53 +01:00
Oskar Hahn
804f842650
Updated the url template tag
2012-12-14 15:10:14 +01:00
Oskar Hahn
366b8e0f1f
Droped support for python 2.5
2012-12-14 14:21:53 +01:00
Norman Jäckel
046db10d3a
Hide group registered in the group widget.
...
Make custom slides text scrollable.
Fix template of personal_info_widget.
2012-12-01 19:32:58 +01:00
Oskar Hahn
ab4c5791ad
Merge pull request #61 from ostcar/master
...
Forbid the deletion of the registered group
2012-11-28 05:16:10 -08:00
Oskar Hahn
8306e7bf6e
Don't allow to remove the registered group
2012-11-28 13:59:14 +01:00
Emanuel Schuetze
94928c20c5
Updated translation msg strings.
2012-11-27 21:22:57 +01:00
Emanuel Schuetze
40984a6508
Merge remote branch 'upstream/master'
2012-11-27 20:10:13 +01:00
Oskar Hahn
c276bce780
Let travis test pep8
2012-11-26 10:11:36 +01:00
Oskar Hahn
a31a67c32e
removed initial_data
2012-11-25 00:55:25 +01:00
Oskar Hahn
6b2645d11c
reordered the tests
...
moved the tests from the openslides-module to an own module
configured coverage
2012-11-24 15:00:17 +01:00
Oskar Hahn
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
Oskar Hahn
9943e84a96
default permissions for the registered group
...
plus some cleanup for the registered and the anonymous group
2012-11-23 09:35:41 +01:00
Emanuel Schuetze
bba301a4b3
#420 : Use clean layout for group slide: Remove printing group users; print group name and number of members only. (Later we need a solution to print users fullname not username.)
2012-11-22 22:07:33 +01:00
Emanuel Schuetze
c115ea59a0
Fixed typo in comment.
2012-11-22 21:48:49 +01:00
Oskar Hahn
fa1c384d28
made use of defaults in get_or_create
2012-11-22 18:47:50 +01:00
Oskar Hahn
1049141483
Created a default group for registered users
2012-11-22 18:39:54 +01:00
Oskar Hahn
e168445497
fixed error, which allowed admins to delete the anonymous grou
2012-11-22 17:29:49 +01:00
Oskar Hahn
1dc7d45670
sort persons in motions
2012-11-22 17:00:09 +01:00
Oskar Hahn
8014f327a2
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
2012-11-22 16:35:26 +01:00
Oskar Hahn
fbf81e7780
sort persons
2012-11-22 16:19:09 +01:00
Emanuel Schuetze
cbd04327bb
Reverted: Administrator can be deleted by other manager. (partly reverted 533c65562d after discus it with oskar because import also possible as non-admin)
2012-11-21 23:26:54 +01:00
Emanuel Schuetze
830f85109d
Minor formatting work.
2012-11-21 23:03:14 +01:00
Emanuel Schuetze
ec1a15a835
#175 : Adjusted group slide; analog to user slide.
2012-11-21 21:45:19 +01:00
Oskar Hahn
2acfd02144
Merge pull request #45 from normanjaeckel/GroupSlide
...
Insert a slide for groups
2012-11-21 12:18:17 -08:00
Emanuel Schuetze
f3c865ee3c
#176 : Adjusted user slide. Show only relevant information in a nice and clear layout.
2012-11-21 21:05:56 +01:00
Norman Jäckel
8e886a22ef
Insert a slide for groups
2012-11-21 14:22:30 +01:00
Norman Jäckel
00e77ba0fc
Use join for the group list also in the participant view
2012-11-21 14:09:47 +01:00
Norman Jäckel
5939b98772
Use join for group list in UserSlide.html
2012-11-21 14:07:14 +01:00
Emanuel Schuetze
0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
Emanuel Schuetze
f1fb68a569
#375 : Missing translation of participant type in participant PDF list. (Now get_type_display() is used.)
2012-11-17 20:02:16 +01:00
Emanuel Schuetze
533c65562d
Don't allow to deactivate or delete the superuser or yourself.
...
Otherwise it's very danger to lock out your current (superuser) session.
2012-11-08 18:57:53 +01:00
Emanuel Schuetze
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
Oskar Hahn
cbea48ab7e
Merge pull request #40 from emanuelschuetze/master
...
Fixed type in pdf list
2012-11-08 00:26:12 -08:00
Oskar Hahn
de7d4ed6cd
Merge pull request #34 from normanjaeckel/UserSlide
...
Add UserSlide with new template.
2012-11-08 00:25:04 -08:00
Emanuel Schuetze
8d599d6428
Fixed type in participants PDF list.
2012-11-08 09:22:23 +01:00
Emanuel Schuetze
9d183e9746
Rename user group to group. Updated translations. Clean up new french po file.
2012-11-07 22:16:11 +01:00
Emanuel Schuetze
7b64d464f5
Added user view url also for last_name.
2012-11-07 21:27:59 +01:00
Norman Jäckel
35e41873a0
Add UserSlide with new template.
2012-11-06 00:02:44 +01:00
Emanuel Schuetze
a363efe2ef
Fixed #390 : Added new user field 'about me'
2012-11-03 09:34:42 +01:00
Emanuel Schuetze
005cb2f15e
Updated translations.
2012-11-03 08:59:34 +01:00
Oskar Hahn
424d10cb63
Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1'
...
Conflicts:
openslides/__init__.py
openslides/projector/views.py
2012-10-31 15:27:47 +01:00
Norman Jäckel
3b4e19ad3b
Enhence template of UserView and GroupView
2012-10-31 14:47:42 +01:00
Emanuel Schuetze
3dd5ce9e73
Fixed default password generation while CSV import.
2012-10-30 23:10:23 +01:00
Emanuel Schuetze
9a522f3835
Use participant_sort_users_by_first_name config var for overview table, participant list (pdf) and first time passwords (pdf).
2012-10-30 23:00:24 +01:00
Emanuel Schuetze
4ee518dd96
Updated translations (for sorting participants).
2012-10-30 22:59:37 +01:00
Emanuel Schuetze
145a52eb24
Updated translations.
2012-10-30 22:16:43 +01:00
Emanuel Schuetze
85771c4af6
Fixed participant CSV import.
2012-10-30 22:05:03 +01:00
Norman Jäckel
c13f4ba52d
Add UserView and GroupView part 2
2012-10-30 00:07:25 +01:00
Oskar Hahn
f4e1f83f15
rename test_name_surfix in test_name_suffix in participant/tests.py
2012-10-29 16:27:15 +01:00
Oskar Hahn
79c5e93422
Redesigned the QuestioMixin
2012-10-28 19:59:41 +01:00
Norman Jäckel
015dc159ed
Add UserView and GroupView part 1
2012-10-27 18:17:22 +02:00
Norman Jäckel
3f0c31d12b
Add user widget and group widget, see # 379
2012-10-26 18:16:09 +02:00
Norman Jäckel
1063e7011a
Change query for assignments in personal_info_widget
2012-10-26 17:14:46 +02:00
Norman Jäckel
510aca54eb
Add widget with personal info, ticket #25
2012-10-25 23:58:32 +02:00
Oskar Hahn
57d591fee8
Renamed category to detail
2012-10-24 12:30:45 +02:00
Oskar Hahn
3e1938941f
Append a default class for the person-api.
...
Also fixed the assignment-ballot-paper for group-persons
2012-10-24 12:15:29 +02:00
Oskar Hahn
17afa3c5d1
fixed #326 whitespace in allready used names
2012-10-24 11:35:07 +02:00
Oskar Hahn
681d909fa3
rename application to motion
2012-10-24 11:07:36 +02:00
Oskar Hahn
5aa2bc650f
Merge pull request #18 from normanjaeckel/Default_Sorting
...
Default sorting using Meta Class option and new config var
2012-09-15 00:23:50 -07:00
Oskar Hahn
2984fd791c
small fix to the person api
2012-09-15 09:11:56 +02:00
Norman Jäckel
0db8af15b7
Clean up the code for pull request
2012-09-14 23:53:59 +02:00
Norman Jäckel
269b093b28
Enhence use of config var and Meta Class for default sorting of users
2012-09-14 03:02:00 +02:00
Norman Jäckel
e5c132e34c
Use new config var for sorting users
2012-09-14 02:46:43 +02:00
Norman Jäckel
f41fe87656
Insert new config var for sorting Users by first_name
2012-09-14 02:40:40 +02:00
Norman Jäckel
f8d3390c78
Docstrings and sorting of Users and Groups in the UsersAndGroupsToPersons class object (was: UsersConnector)
2012-09-14 02:24:02 +02:00
Norman Jäckel
811b780fb9
Fix typo TYPE_CHOICE to TYPE_CHOICES
2012-09-14 01:52:20 +02:00
Oskar Hahn
bcfceccb09
dont use simular passwords in gen_password (no Il10oO)
2012-09-13 11:50:06 +02:00
Oskar Hahn
760f8e042e
some fixes
2012-09-12 10:17:51 +02:00
Oskar Hahn
38d53bbb92
fixed first-time-pdf
2012-09-11 19:30:12 +02:00
Emanuel Schuetze
b705df8c5f
Changed redirect to dashboard after changing password.
2012-09-10 21:02:58 +02:00
Emanuel Schuetze
ce233fc870
Updated config template.
2012-09-10 17:40:41 +02:00
