Oskar Hahn
fb25473abc
Merge pull request #49 from emanuelschuetze/master
...
Some minor changes for 1.3
2012-11-22 02:22:06 -08:00
Oskar Hahn
c815db308d
Merge pull request #51 from andkit/portable
...
Use checkout instead of installed version to build portable version
2012-11-22 02:19:01 -08:00
Andy Kittner
073c98d6b1
Remove note about installing openslides before building the portable
2012-11-22 00:29:20 +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
e5262ea983
Merge remote branch 'upstream/master'
2012-11-21 23:06:01 +01:00
Emanuel Schuetze
8aec947303
Removed unused widget file (duplicate of welcome_widget.html).
2012-11-21 23:05:38 +01:00
Emanuel Schuetze
830f85109d
Minor formatting work.
2012-11-21 23:03:14 +01:00
Oskar Hahn
6b6bd95a07
Merge pull request #48 from emanuelschuetze/master
...
Some polishing work (II)
2012-11-21 13:59:15 -08:00
Emanuel Schuetze
9da7055fc2
Updated INSTALL section: use git instead of hg repository.
2012-11-21 22:12:00 +01:00
Emanuel Schuetze
d5ee6d69b6
Enlarged users select box in new/edit group form.
2012-11-21 22:06:22 +01:00
Emanuel Schuetze
bcfc4531d4
Gender German default group names
2012-11-21 22:05:33 +01:00
Emanuel Schuetze
4877eed46c
Updated translation.
2012-11-21 21:45:27 +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
Oskar Hahn
50a6113703
Merge pull request #47 from emanuelschuetze/master
...
Some polishing work
2012-11-21 12:17:56 -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
Emanuel Schuetze
c5a2f896e2
Fixed typo in identifier 'assignment_candidates'.
2012-11-21 20:12:08 +01:00
Emanuel Schuetze
da0757e40f
#417 : Don't hide vote results table if status is reset
2012-11-21 19:39:55 +01:00
Emanuel Schuetze
17d813e08b
Show error message for NameError.
2012-11-21 19:36:12 +01:00
Oskar Hahn
bddf011f6e
Merge pull request #46 from normanjaeckel/Fixes
...
Some fixes for 1.3
2012-11-21 08:44:06 -08:00
Norman Jäckel
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
Norman Jäckel
06af94fb91
Fix assignment poll choosing the right method (yes-no-abstain True or False)
2012-11-21 15:03:29 +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
Norman Jäckel
d69e5a246b
Fix urls.py - Redirect from / to the dahsboard
2012-11-21 13:41:16 +01:00
Oskar Hahn
9122052ba6
Merge pull request #44 from emanuelschuetze/master
...
Some fixes for 1.3
2012-11-20 08:38:19 -08:00
Emanuel Schuetze
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
Emanuel Schuetze
ec10f357cf
Used RedirectView from openslides.utils.views. Used reverse_lazy
...
instead of hard coded redirect url.
2012-11-20 12:19:12 +01:00
Emanuel Schuetze
5e97ece5f4
#278 : Used cycle rowcolor in vote results table also for inavlid votes row
2012-11-19 23:52:48 +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
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
Emanuel Schuetze
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
Emanuel Schuetze
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
Andy Kittner
720a993259
Copy openslides from local checkout to site-packages
...
We reverted to using the checkout instead of an installed openslides
version when building the portable, but we still want openlides to be
placed together with all the other packages
2012-11-18 14:38:22 +01:00
Andy Kittner
b4a4d15a7f
Revert "Treat openslides the same way as other packages"
...
This reverts commit 14ba868df4
2012-11-18 14:21:11 +01:00
Emanuel Schuetze
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
Emanuel Schuetze
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
Emanuel Schuetze
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
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
Oskar Hahn
f40f091658
Merge pull request #43 from emanuelschuetze/master
...
Final commits for 1.3-beta2
2012-11-09 04:54:58 -08:00
Andy Kittner
28cf531e4d
Pass along database path to create_settings if started as portable version
2012-11-09 13:45:52 +01:00
Emanuel Schuetze
491e26c3f1
Changed beta2 relase date.
2012-11-09 13:21:50 +01:00
Oskar Hahn
b8bbec3a04
Merge pull request #42 from emanuelschuetze/master
...
Several minor fixes for 1.3-beta2
2012-11-09 01:16:37 -08:00
Oskar Hahn
6719cca7e1
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-09 09:52:00 +01:00
Oskar Hahn
54fb61d211
fixed main.py and manage.py for the openslides.exe
2012-11-09 09:51:10 +01:00
Emanuel Schuetze
945081f7a6
Some minor changes and restructure work on howto create probable document.
2012-11-09 09:25:14 +01:00
Emanuel Schuetze
81570b61e6
Rename submenu titel 'projector' to 'dashboard'.
2012-11-08 20:11:06 +01:00
