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

1750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
c163d6984d Insert motion preamble in text field of the form of new motions (Fixed #643) 2013-05-16 01:38:51 +02:00
Oskar Hahn
a5a9848040 Merge pull request #654 from normanjaeckel/MetaFiles 
Update all meta files.
 2013-05-15 12:47:54 -07:00
Oskar Hahn
e6a83bd790 Merge pull request #658 from emanuelschuetze/template-improvements2 
Some more template improvements and updated translations
 2013-05-15 12:47:10 -07:00
Emanuel Schuetze
c1996b81fc Updated translation. 2013-05-15 09:43:59 +02:00
Emanuel Schuetze
4849955a16 Some more template improvements 
- Better config icon.
- Renamed media to files (only for GUI).
- Add datatable function for motion and asssignemnt overview table. Removed old filter/sorting code.
- Some more template styling work.
 2013-05-15 09:43:11 +02:00
Norman Jäckel
592cbcfe7d Update all meta files. 2013-05-15 01:59:18 +02:00
Oskar Hahn
cefd509ae4 Merge pull request #650 from emanuelschuetze/template-improvements 
Template improvements
 2013-05-14 14:31:53 -07:00
Emanuel Schuetze
d1b6c38880 Fixed #627 (Open Link in new Tab) by setting back bootstrap.min.js to 2.3.0 release. 
(bootstrap*.css are still from 2.3.1)
 2013-05-14 23:21:46 +02:00
Emanuel Schuetze
b082f8a8fc A lot of template improvements 
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.

Moved css code.
 2013-05-14 23:20:54 +02:00
Oskar Hahn
7a4d40283d Merge pull request #638 from normanjaeckel/MotionRework 
Motion identifier setting and versioning.
 2013-05-13 14:43:56 -07:00
Norman Jäckel
f07485627f Motion identifier setting and versioning. 
Now the view decides, whether to setup a new version or not. Automatic identifier setting is the default. Also some fixes of the motion save method.
 2013-05-13 23:13:14 +02:00
Oskar Hahn
b8b5acd5f2 Merge pull request #639 from normanjaeckel/Url_name_args 
Fixed 'Can't create agenda item of a motion'
 2013-05-13 11:51:15 -07:00
Oskar Hahn
e306f53906 Merge pull request #645 from normanjaeckel/Motion_CSV_Import 
Motion csv import
 2013-05-13 11:49:41 -07:00
Norman Jäckel
0f17f74fee Fix and update motion csv import. 2013-05-13 18:30:20 +02:00
Oskar Hahn
485518975a motion csv import 2013-05-13 18:25:59 +02:00
Norman Jäckel
864d20274e Fixed #636. Insert general url_name_args attribute to some generic views in utils.views. 2013-05-13 18:15:53 +02:00
Oskar Hahn
865860a96f Merge pull request #640 from normanjaeckel/Fixes 
Some Fixes
 2013-05-13 05:06:29 -07:00
Oskar Hahn
e9a361cfea Merge pull request #637 from normanjaeckel/ShowCategory 
Show category in motion table. Fix template when a motion has no category.
 2013-05-12 13:58:47 -07:00
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