15b13c2bcd
Handel null=True in PersonField
2013-02-02 21:19:37 +01:00
2e430b4406
check permission in motion view
2013-02-02 10:59:07 +01:00
3ffb16d4d8
Fixed pep8 errors
2013-02-02 10:52:13 +01:00
4cc6539f0c
Added get_allowed_actions to new motion app
2013-02-02 10:24:28 +01:00
a27bd7eade
Add motion to agenda
2013-02-02 00:51:08 +01:00
910e0f17e7
Add slide Date to the motion
2013-02-02 00:37:43 +01:00
1518543a9a
Added motion widget and deletion of motions
2013-02-02 00:27:16 +01:00
0f7d0e349c
Fixed URLs in projector views
2013-02-02 00:26:08 +01:00
bd317aed31
Wrote tests for openslides.motion.models.Motion
2013-02-01 19:19:18 +01:00
6c3eb0f765
fixed urls in views from the participant app
2013-02-01 17:35:27 +01:00
1a2f0a1b5a
Added links to set and reset the state of a motion
2013-02-01 17:20:11 +01:00
ac41a02ac5
Block supporting, unsupporting and creation of poll in some states
2013-02-01 16:44:06 +01:00
fb82a1787b
Add workflows for motions
2013-02-01 16:33:45 +01:00
7f03e02e9a
Item type changed from CharField to IntegerField. Constant type names added.
2013-02-01 15:13:40 +01:00
9f3dae8059
ConfigForm: Base classes reordered
2013-02-01 14:47:51 +01:00
c595701597
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
2013-02-01 14:41:52 +01:00
3f02a28002
Added a poll delete view to the new motion app
2013-02-01 13:24:44 +01:00
b6256b73e0
Changed utils.views.DeleteView
2013-02-01 13:24:30 +01:00
d3b679442c
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling.
2013-02-01 12:55:04 +01:00
da7a7a9d68
Add Poll-system to the new motion app
2013-02-01 12:51:54 +01:00
adeaf248ef
Changed utils.- and poll.views
2013-02-01 12:51:01 +01:00
5a9b7fdca5
Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
2013-01-31 20:37:55 +01:00
9746b3818f
Rework code to ommit unnecessary filter call.
2013-01-31 20:32:29 +01:00
3dfd16558a
Blanks removed
2013-01-31 18:35:52 +01:00
033ecd9497
Added new glyphicons icons.
2013-01-31 10:20:53 +01:00
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +01:00
65ebcbc991
#41 Time for each agenda item finished
2013-01-30 17:39:53 +01:00
bc9dcffff4
#41 Time for each agenda item
2013-01-29 14:28:42 +01:00
d911e311d6
Let the user support and unsupport the motion
2013-01-26 18:18:02 +01:00
7bcfa16737
Merge branch 'master' of github.com:OpenSlides/OpenSlides into new_motion
...
Conflicts:
openslides/motion/templates/motion/view.html
openslides/utils/views.py
2013-01-26 17:57:35 +01:00
87e42cf9f8
Let the user choose if the motion should have a new version
...
via config or form
2013-01-26 17:09:13 +01:00
0702d49e2e
Save the supporter
2013-01-26 16:42:23 +01:00
d3b340769b
Added motion config tab
2013-01-26 16:33:55 +01:00
ecb6419f8c
fixed apply and success url in utils.views
2013-01-26 16:19:53 +01:00
567e6c975a
Show initial submitters in the update-form
2013-01-26 16:05:30 +01:00
8708ba5da6
Only save new version, when version-data has changed
2013-01-26 15:39:35 +01:00
1f87749742
Save the submitters to the motion
2013-01-26 15:25:54 +01:00
1ae140c11e
Add docstrings to the motion class
2013-01-26 12:28:51 +01:00
bebaadf850
Actually do the right check for further args
2013-01-23 21:24:02 +01:00
3bfead298d
Add custom management command to start the application with tornado
2013-01-23 21:12:36 +01:00
a14f9b30ad
Fix help text
2013-01-23 19:37:12 +01:00
22e8457894
Add an option to suppress starting of web browser ( closes #436 )
2013-01-22 21:04:07 +01:00
70407feab8
Use the tornado server to serve the application
2013-01-19 10:51:42 +01:00
b8532fabe4
Removed files from images to img dir.
2013-01-18 22:23:31 +01:00
da4ed365bc
Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0).
2013-01-18 22:10:00 +01:00
a4592ec849
Reworked projector activate buttons in agenda widget.
2013-01-18 21:44:47 +01:00
586425354d
Reworked new template, especially agenda and dashboard.
2013-01-08 23:05:35 +01:00
0231fe37f5
Start to rewrite the motion app
2013-01-08 20:22:03 +01:00
aee24425bc
Ticket 433 - Organisational items
2013-01-05 23:52:29 +01:00
deb0d5b2e5
Some fixes. Update requirements.txt and setup.py.
2013-01-05 23:20:38 +01:00
369f418b0e
Fixed missing endif
2013-01-05 15:43:52 +01:00
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +01:00
6417f5f107
fixed pep8 error
2013-01-05 14:56:22 +01:00
2fcf0b3a07
fixed typo in utils/views.py
2013-01-05 14:46:05 +01:00
56510f94a8
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-01-05 13:44:35 +01:00
bb74674c41
Deprecated import django.conf.urls.defaults adjusted.
2013-01-05 12:39:20 +01:00
ae8641bcad
Raise an error if an CreateView does not define a apply_url
2013-01-05 01:48:03 +01:00
3229d86d4d
Import urls.py needed django functions from django.conf.urls
2013-01-05 01:05:38 +01:00
2f28655a25
Show Tabs if there do not define some permissions
2013-01-05 01:03:42 +01:00
d842214e26
Fix typo in template.
2013-01-04 19:14:56 +01:00
5d754984a3
fixed pep8 errors
2013-01-04 12:39:42 +01:00
c1903848f2
Update openslides/__init__.py
2013-01-04 11:49:43 +01:00
d671740966
Fixed merged errors.
2013-01-02 23:22:12 +01:00
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
8a84f72891
fixed more url-template-tags
2012-12-16 17:35:06 +01:00
5ea863ca81
Let the user choose the language in his settings
2012-12-16 17:26:53 +01:00
b79fedc215
fixed jsonfield for django 1.5
2012-12-14 15:36:57 +01:00
804f842650
Updated the url template tag
2012-12-14 15:10:14 +01:00
366b8e0f1f
Droped support for python 2.5
2012-12-14 14:21:53 +01:00
a07146098b
Changed Version to 1.4.dev
2012-12-14 14:14:01 +01:00
c83348923a
Set version number to 1.3.1a0-dev (unreleased)
2012-12-10 22:36:18 +01:00
bf98224ebd
Fixed missing translation.
2012-12-10 20:34:37 +01:00
9a0bca7fea
Set 1.3 final release.
2012-12-10 20:30:32 +01:00
56a5778260
Updated translation (fixed minor typo).
2012-12-10 20:06:17 +01:00
c48c4e0e90
Added missing remove icon (for unsupport motion button).
2012-12-10 19:44:35 +01:00
67f6b36ebc
Updated fr translation from transifex
2012-12-09 14:17:52 +01:00
84324cf317
Updated translations
2012-12-09 12:59:56 +01:00
0369edae1e
Added translationcontext for posts in assignment
2012-12-09 10:48:45 +01:00
442e5fba60
Added fr translation
2012-12-09 10:40:41 +01:00
fc4c4c3f95
Revert "Updated fr translation"
...
This reverts commit 7ff0825dc3
2012-12-05 20:07:11 +01:00
05c029d8e5
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-12-04 00:20:41 +01:00
7ff0825dc3
Updated fr translation
2012-12-04 00:20:11 +01:00
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
a5022a3f00
Fix pep8 in openslides/__init__.py
2012-12-01 14:05:19 +01:00
4410e454c8
Update test for version string.
2012-12-01 13:39:29 +01:00
e7744f8210
Merge branch 'master' into Version_String
2012-12-01 13:10:29 +01:00
e76ec5e975
Added a new command to the startscript to show the version
2012-11-29 15:01:49 +01:00
d53017eea8
Get git commit id also in detached head mode.
2012-11-28 18:02:33 +01:00
589c209c79
Merge branch 'master' into Version_String
...
Conflicts:
openslides/__init__.py
openslides/config/views.py
2012-11-28 17:54:29 +01:00
ab4c5791ad
Merge pull request #61 from ostcar/master
...
Forbid the deletion of the registered group
2012-11-28 05:16:10 -08:00
8306e7bf6e
Don't allow to remove the registered group
2012-11-28 13:59:14 +01:00
48b530487b
Merge pull request #59 from emanuelschuetze/master
...
Prepared 1.3-rc1
2012-11-27 13:59:38 -08:00
a010df5d1f
Reverted person.sort_name AttributeError fix ( e0ce1052c0)
2012-11-27 22:54:07 +01:00
e7c47395bb
Gave the empty user all the attributes it needs
2012-11-27 22:46:54 +01:00
ae35a8c719
Updated translations
2012-11-27 21:30:45 +01:00
94928c20c5
Updated translation msg strings.
2012-11-27 21:22:57 +01:00
301a379fa6
Prepared 1.3-rc1 release.
2012-11-27 20:13:18 +01:00
40984a6508
Merge remote branch 'upstream/master'
2012-11-27 20:10:13 +01:00
4dfd4ac67f
fix _proper_unicode
2012-11-26 15:48:23 +01:00
bdfb714013
fixed pep8 in pdf.py
2012-11-26 10:35:29 +01:00
c276bce780
Let travis test pep8
2012-11-26 10:11:36 +01:00
abd21dd345
Added more tests for the agenda
2012-11-26 10:05:51 +01:00
fddf929ab5
Load groups_de when creating the database
2012-11-25 01:07:39 +01:00
ab4b117a93
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-25 00:55:37 +01:00
a31a67c32e
removed initial_data
2012-11-25 00:55:25 +01:00
804b514597
Merge pull request #57 from andkit/bug-409
...
Fix #409
2012-11-24 12:29:44 -08:00
3f469ab9d6
Commited the fix for get_version
2012-11-24 21:26:09 +01:00
b3806d8cdd
some tests for the agenda
2012-11-24 21:10:55 +01:00
5979b23b04
Merge remote-tracking branch 'origin/master' into bug-409
...
Conflicts:
openslides/main.py
2012-11-24 20:49:04 +01:00
21a51523a4
Make pep8.py happy
2012-11-24 20:35:06 +01:00
ec60207cfd
Fixed typo (candidation -> candidature)
2012-11-24 17:39:28 +01:00
e0ce1052c0
Catch AttributeError for 'person.sort_name' in assignment/models.py
2012-11-24 17:34:56 +01:00
c405e9b648
Rework default settings handling ( fixes #409 )
2012-11-24 15:00:36 +01:00
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
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
f5a438cf9f
cleanup in utils
2012-11-24 01:42:10 +01:00
4c97291598
Remove non-used revision template var.
2012-11-23 11:33:34 +01:00
baebfbb585
Fix get_version, insert and use get_git_commit_id.
2012-11-23 11:31:30 +01:00
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
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
c115ea59a0
Fixed typo in comment.
2012-11-22 21:48:49 +01:00
fa1c384d28
made use of defaults in get_or_create
2012-11-22 18:47:50 +01:00
1049141483
Created a default group for registered users
2012-11-22 18:39:54 +01:00
e168445497
fixed error, which allowed admins to delete the anonymous grou
2012-11-22 17:29:49 +01:00
1dc7d45670
sort persons in motions
2012-11-22 17:00:09 +01:00
8014f327a2
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
2012-11-22 16:35:26 +01:00
fbf81e7780
sort persons
2012-11-22 16:19:09 +01:00
ed33b47666
Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides
...
Conflicts:
openslides/locale/de/LC_MESSAGES/django.po
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 12:52:11 +01:00
9f51a24311
#419 - aftermath
...
- remove accidental print statements left over from debugging
- create missing groups on import
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 10:26:44 +01:00
36f83808fd
Implement #419 : Add group column for motion csv import
...
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-21 23:38:25 +01:00
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
8aec947303
Removed unused widget file (duplicate of welcome_widget.html).
2012-11-21 23:05:38 +01:00
830f85109d
Minor formatting work.
2012-11-21 23:03:14 +01:00
d5ee6d69b6
Enlarged users select box in new/edit group form.
2012-11-21 22:06:22 +01:00
4877eed46c
Updated translation.
2012-11-21 21:45:27 +01:00
ec1a15a835
#175 : Adjusted group slide; analog to user slide.
2012-11-21 21:45:19 +01:00
2acfd02144
Merge pull request #45 from normanjaeckel/GroupSlide
...
Insert a slide for groups
2012-11-21 12:18:17 -08:00
f3c865ee3c
#176 : Adjusted user slide. Show only relevant information in a nice and clear layout.
2012-11-21 21:05:56 +01:00
c5a2f896e2
Fixed typo in identifier 'assignment_candidates'.
2012-11-21 20:12:08 +01:00
da0757e40f
#417 : Don't hide vote results table if status is reset
2012-11-21 19:39:55 +01:00
17d813e08b
Show error message for NameError.
2012-11-21 19:36:12 +01:00
af6c403936
Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector.
2012-11-21 15:14:38 +01:00
06af94fb91
Fix assignment poll choosing the right method (yes-no-abstain True or False)
2012-11-21 15:03:29 +01:00
8e886a22ef
Insert a slide for groups
2012-11-21 14:22:30 +01:00
00e77ba0fc
Use join for the group list also in the participant view
2012-11-21 14:09:47 +01:00
5939b98772
Use join for group list in UserSlide.html
2012-11-21 14:07:14 +01:00
d69e5a246b
Fix urls.py - Redirect from / to the dahsboard
2012-11-21 13:41:16 +01:00
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
ec10f357cf
Used RedirectView from openslides.utils.views. Used reverse_lazy
...
instead of hard coded redirect url.
2012-11-20 12:19:12 +01:00
5e97ece5f4
#278 : Used cycle rowcolor in vote results table also for inavlid votes row
2012-11-19 23:52:48 +01:00
0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
93d2dc8d7d
Restructuring and optimization of assignment templates.
...
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
2012-11-19 22:54:09 +01:00
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
27fa32b718
Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard)
2012-11-17 22:14:49 +01:00
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
71eb529adf
Fixed #403 : Moved projector control icons into projector live widget (Added RequestContext to check perms in template.)
2012-11-17 20:59:30 +01:00
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
28cf531e4d
Pass along database path to create_settings if started as portable version
2012-11-09 13:45:52 +01:00
b8bbec3a04
Merge pull request #42 from emanuelschuetze/master
...
Several minor fixes for 1.3-beta2
2012-11-09 01:16:37 -08:00
6719cca7e1
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-09 09:52:00 +01:00
54fb61d211
fixed main.py and manage.py for the openslides.exe
2012-11-09 09:51:10 +01:00
81570b61e6
Rename submenu titel 'projector' to 'dashboard'.
2012-11-08 20:11:06 +01:00
216ac95cfb
Redirect to dashboard after submit widget selection form.
2012-11-08 20:08:09 +01:00
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
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
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
7c75f42d85
Updated translations.
2012-11-08 09:42:35 +01:00
cbea48ab7e
Merge pull request #40 from emanuelschuetze/master
...
Fixed type in pdf list
2012-11-08 00:26:12 -08:00
de7d4ed6cd
Merge pull request #34 from normanjaeckel/UserSlide
...
Add UserSlide with new template.
2012-11-08 00:25:04 -08:00
8d599d6428
Fixed type in participants PDF list.
2012-11-08 09:22:23 +01:00
f551b2fa6d
Merge pull request #39 from emanuelschuetze/master
...
Last translation update for 1.3-beta2
2012-11-07 13:43:02 -08:00
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
030058fb7c
Merge pull request #37 from andkit/master
...
Fix UnicodeError on widgets page
2012-11-07 13:35:24 -08:00
a3627b77b4
Added new allowed language (French).
2012-11-07 22:24:39 +01:00
b66a57d341
Prepared 1.3-beta2 release.
2012-11-07 22:21:55 +01:00
9d183e9746
Rename user group to group. Updated translations. Clean up new french po file.
2012-11-07 22:16:11 +01:00
7b64d464f5
Added user view url also for last_name.
2012-11-07 21:27:59 +01:00
32a76e2aad
Fix UnicodeError on widgets page
2012-11-07 21:12:52 +01:00
af4f923527
Fixed KeyError in main.py.
2012-11-07 20:48:07 +01:00
0330f74d1b
Merge pull request #35 from andkit/master
...
Fix missing translations (#415 )
2012-11-07 01:24:54 -08:00
4b2fddc9ce
Merge pull request #36 from ostcar/fr
...
Added fr translation. The work was done from Moira.
2012-11-07 01:24:09 -08:00
a691db5d30
updated fr translation
...
Thx to Moira
2012-11-07 10:22:32 +01:00
2d9b0a8848
delete the projector cache after 1 second.
2012-11-07 10:05:38 +01:00
13b5336af9
Merge pull request #33 from ostcar/manage
...
fixed manage.py
2012-11-07 00:59:35 -08:00
fbd77da788
Fix missing translations ( #415 )
...
- The text "motions" was used with a plural here, but it was also
present in other places without a plural, therefore the .po file
contained only a singular translation. Solved by disambiguating the
uses with a context
- The submitter field of the MotionManagerForm was missing a label
2012-11-07 00:12:15 +01:00
35e41873a0
Add UserSlide with new template.
2012-11-06 00:02:44 +01:00
41c1c5a2c8
Added fr translation
2012-11-05 18:41:53 +01:00
a363efe2ef
Fixed #390 : Added new user field 'about me'
2012-11-03 09:34:42 +01:00
005cb2f15e
Updated translations.
2012-11-03 08:59:34 +01:00
3c58d8d64b
fixed manage.py
2012-11-02 20:57:59 +01:00
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
3b4e19ad3b
Enhence template of UserView and GroupView
2012-10-31 14:47:42 +01:00
ac25e02e2d
Catch another IOError in get_version()
2012-10-31 14:38:06 +01:00
d9ccb02969
Changed version number string. Important for building portable version.
...
Used alpha|beta|rc without git commit hash.
Added 'dev' suffix which use git hash only. It is easier to handle in file names of releases.
2012-10-31 07:11:53 +01:00
8ffeadfe88
Cleared projector cache if countdown enabled or overlay message changed.
2012-10-30 23:45:06 +01:00
3dd5ce9e73
Fixed default password generation while CSV import.
2012-10-30 23:10:23 +01:00
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
Oskar Hahn