ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,932 Commits 6 Branches 42 Tags 64 MiB
5ba09ddb93
Commit Graph

1932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
97e5815664 Merge pull request #644 from normanjaeckel/ListOfSpeakersToPersonalInfoWidget 
Items now appear also in the personal info widget
 2013-05-12 13:58:13 -07:00
Norman Jäckel
a469831f1f Fixed link 'Put me on the list of speakers' when the list is already closed. 2013-05-12 02:06:55 +02:00
Norman Jäckel
af493d28e8 Items now appear also in the personal info widget (where someone is on the list of speakers). 2013-05-12 01:46:40 +02:00
Norman Jäckel
af6659a67e Hide list of speakers overlay on list of speakers slide 2013-05-12 01:16:41 +02:00
Norman Jäckel
3ba5fd2dc6 Fixed bad typo in import users function 2013-05-12 00:56:40 +02:00
Norman Jäckel
411f8d0892 Fixed hiding of orga items on summary slides 2013-05-11 16:26:43 +02:00
Norman Jäckel
76d7409830 Change version view. New way to get name and version from plugins. 2013-05-11 14:27:46 +02:00
Norman Jäckel
98c7611622 Fixed wrong permission on agenda detail view 2013-05-11 13:53:43 +02:00
Norman Jäckel
96f5122c00 Show category in motion table. Fix template when a motion has no category. 2013-05-11 00:20:42 +02:00
Oskar Hahn
8af50a36cc Merge pull request #625 from normanjaeckel/ListOfSpeakersRework 
Add second time field for list of speakers.
 2013-05-08 08:21:08 -07:00
Norman Jäckel
719b6ff790 Rework on list of speakers. Insert a method to get a formated list for various use in the templates. 2013-04-29 20:17:50 +02:00
Oskar Hahn
52e16d2e34 Show a defined value of last speakers 
Some work on the design of the speaker-list on the projector
 2013-04-29 20:05:42 +02:00
Norman Jäckel
0b85164b84 Add second time field for list of speakers. Now you can click begin and end speach. 2013-04-29 20:05:42 +02:00
Oskar Hahn
0df5c5a2e6 Merge pull request #631 from ostcar/Issue629 
Fixed #629
 2013-04-28 01:23:14 -07:00
Oskar Hahn
b0e5854833 Fixed #629 2013-04-28 10:21:31 +02:00
Oskar Hahn
a03422dcb7 Merge pull request #630 from ostcar/Issue604 
Fixed #604
 2013-04-28 01:05:22 -07:00
Oskar Hahn
04edef9d8a Fixed #604 2013-04-28 10:02:19 +02:00
Oskar Hahn
50077f1c03 Merge pull request #628 from ostcar/Issue580 
Fixed #580
 2013-04-28 00:40:57 -07:00
Oskar Hahn
100238bc66 Fixed #580 2013-04-28 09:37:15 +02:00
Oskar Hahn
04b3a196ad Merge pull request #620 from CatoTH/ckeditor-4.1.1 
Upgrade CKEditor from 4.1rc to 4.1.1
 2013-04-25 06:17:07 -07:00
Oskar Hahn
017561572d Merge pull request #621 from CatoTH/Issue615 
sortable and disableSelection are not always defined; lead to issue #615
 2013-04-25 06:16:32 -07:00
Oskar Hahn
0c2b0d4b1d Merge pull request #624 from normanjaeckel/MoveVersionPage 
Move Version page out of config menu. Insert Link into the footer.
 2013-04-25 06:15:12 -07:00
Norman Jäckel
b6f2176cc8 Move Version page out of config menu. Insert Link into the footer. 2013-04-25 12:37:44 +02:00
Emanuel Schütze
798bdf4bdc Merge pull request #622 from emanuelschuetze/master 
Updated CHANGELOG for 1.4
 2013-04-24 15:00:05 -07:00
Emanuel Schuetze
1fc61c1e42 Updated CHANGELOG for 1.4a1. 2013-04-24 23:31:47 +02:00
Tobias Hößl
5865a73a3e sortable and disableSelection are not always defined; lead to issue #615 2013-04-24 19:51:33 +02:00
Tobias Hößl
4aa033989a Upgrade CKEditor from 4.1rc to 4.1.1 2013-04-24 19:04:02 +02:00
Emanuel Schütze
b34677291b Merge pull request #617 from emanuelschuetze/master 
1.4a1 release
 2013-04-24 06:58:49 -07:00
Emanuel Schuetze
8ca8b6911d Set version to 1.4b1-dev 2013-04-24 15:50:49 +02:00
Emanuel Schuetze
b43a6ae1f6 Release 1.4-alpha1 2013-04-24 15:31:55 +02:00
Emanuel Schuetze
e268d43580 Fixed motion poll pdf (use correct delegates group, use template without header/footer) 2013-04-24 15:14:29 +02:00
Emanuel Schuetze
5071daa148 Updated translations. 2013-04-24 14:36:04 +02:00
Emanuel Schuetze
31cb82efd2 Updated README, INSTALL and THANKS for 1.4-alpha1 release. 2013-04-24 14:26:09 +02:00
Oskar Hahn
851e1ce805 Merge pull request #614 from ostcar/list_of_speaker_csv_export 
fab command, to run scripts with the OpenSlides settings
 2013-04-24 05:07:04 -07:00
Oskar Hahn
8c9d1d134e Merge pull request #616 from emanuelschuetze/last-1.4a1-changes 
Minor template fixes
 2013-04-24 05:06:52 -07:00
Oskar Hahn
9d78d44e5b fab command, to run scripts with the OpenSlides settings 
Add two example scripts
 2013-04-24 13:06:04 +02:00
Emanuel Schuetze
210df06c76 Minor template fixes. 2013-04-24 11:58:09 +02:00
Oskar Hahn
3872097311 Merge pull request #610 from emanuelschuetze/last-1.4a1-changes 
A lot of template improvements and translation fixes
 2013-04-24 02:39:29 -07:00
Emanuel Schuetze
81b82c559d Updated jQuery UI to v1.10.2. 
Changed link in agenda view to static file.
 2013-04-24 11:34:24 +02:00
Emanuel Schuetze
472c79d9c5 Added Roland to AUTHORS file. (Thanks for contributing CKEditor support!) 2013-04-24 10:50:24 +02:00
Emanuel Schuetze
abad75c129 A lot of template improvements and translation fixes 
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
 2013-04-24 10:38:03 +02:00
Oskar Hahn
26824f7545 Merge pull request #613 from ostcar/anonymous_person 
Fixed saving anonymous user in a PersonField
 2013-04-24 00:38:03 -07:00
Oskar Hahn
f581169e1e Fixed saving anonymous user in a PersonField 2013-04-24 09:28:58 +02:00
Oskar Hahn
e755712403 Merge pull request #611 from emanuelschuetze/Issue543 
Sorting agenda items with nestedSortable.
 2013-04-23 22:52:17 -07:00
Tobias Hößl
acba281581 Sorting agenda items with nestedSortable. 2013-04-23 17:24:27 +02:00
Oskar Hahn
7bdb1ee10c Merge pull request #607 from normanjaeckel/Rename_State_Attribute 
Rename the state flag dont_set_new_version_active to leave_old_version_a...
 2013-04-22 13:58:36 -07:00
Norman Jäckel
7fbe609d04 Rename the state flag dont_set_new_version_active to leave_old_version_active. 2013-04-22 22:31:58 +02:00
Oskar Hahn
150c4d6205 Merge pull request #606 from ostcar/master 
Fixed list of speakers overlay cache problem
 2013-04-22 13:20:57 -07:00
Oskar Hahn
ba75a34017 Fixed list of speakers overlay cache problem 2013-04-22 22:09:09 +02:00
Oskar Hahn
a4b671f0ac Merge pull request #602 from ostcar/motion_poll_pdf 
Motion poll pdf
 2013-04-22 12:49:54 -07:00