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

6281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
c94f78c430 Fix message_list loop with a map 2013-05-23 23:19:53 +02:00
Norman Jäckel
894f16ec53 Several template and bug fixes, some minor view behavior changes 2013-05-23 00:32:32 +02:00
Emanuel Schütze
9b5850a12b Merge pull request #671 from emanuelschuetze/release1.4b1 
Release1.4b1
 2013-05-16 16:36:42 -07:00
Emanuel Schuetze
c59f729a80 Set version to 1.4b2 2013-05-17 01:33:04 +02:00
Emanuel Schuetze
d5221d2ab5 Release 1.4b1. 2013-05-17 01:31:45 +02:00
Emanuel Schütze
82337bec7e Merge pull request #670 from normanjaeckel/PreRelease 
Fixed setup.py
 2013-05-16 16:27:18 -07:00
Norman Jäckel
8456bdc0c6 Fixed setup.py 2013-05-17 01:17:07 +02:00
Emanuel Schütze
ebdd017cd8 Merge pull request #669 from normanjaeckel/ManifestFix 
Fixed MANIFEST.in
 2013-05-16 15:12:39 -07:00
Norman Jäckel
1505a500d2 Fixed MANIFEST.in 2013-05-17 00:10:11 +02:00
Emanuel Schütze
3ccb8755e3 Merge pull request #667 from emanuelschuetze/NoEmptyFirstAndLastName 
No empty first and last name
 2013-05-16 15:08:39 -07:00
Emanuel Schütze
37321a7743 Merge pull request #664 from normanjaeckel/Packaging 
Update metafiles for new packaging style
 2013-05-16 15:03:35 -07:00
Emanuel Schuetze
eedc79ca8f Added non_field.errors in form.html. 2013-05-16 23:59:22 +02:00
Norman Jäckel
bf58f2a6cc Ensure that the user has either a first name or a last name 2013-05-16 23:59:22 +02:00
Norman Jäckel
1a58298daf Update metafiles for new packaging style 2013-05-16 23:54:49 +02:00
Emanuel Schütze
41abe871dd Merge pull request #668 from normanjaeckel/PEP8_2 
Fixed Pep 8 Error
 2013-05-16 14:53:45 -07:00
Norman Jäckel
a65a4662ae Fixed Pep 8 Error 2013-05-16 23:44:07 +02:00
Emanuel Schütze
4234ebcfe8 Merge pull request #665 from emanuelschuetze/template4 
Fixed translation issue for motion state.
 2013-05-16 13:59:45 -07:00
Emanuel Schuetze
fa8b9d3888 Fixed translation issue for motion state. 2013-05-16 22:53:38 +02:00
Emanuel Schütze
6dbd606232 Merge pull request #660 from normanjaeckel/TranslatedStateChanged 
Translate changed state in motion log (Fixed #656)
 2013-05-16 13:37:09 -07:00
Emanuel Schütze
60bce17728 Merge pull request #663 from emanuelschuetze/template-improvement3 
More template improvements and translation updates.
 2013-05-16 13:28:25 -07:00
Emanuel Schütze
92c96bfb96 Merge pull request #3 from normanjaeckel/FixTests 
Fixed motion tests
 2013-05-16 13:06:32 -07:00
Norman Jäckel
148ac53d11 Translate changed state in motion log (Fixed #656) 
The database has to be reset.
 2013-05-16 21:51:11 +02:00
Norman Jäckel
60c81c010e Fixed motion tests 2013-05-16 21:41:41 +02:00
Emanuel Schuetze
b5a5acbf2c Some last (template) improvements for next release 
- Added dataTable function for group overview table.
- Added default form help text for groups and an explanation for group overview table.
- Updated translation.
- Translate group name in form.
- Username: FirstName instead of First_Name
- Hide group 'registered' from UserForm
- Linked persons/candidates/submitter etc. to UserView
- Fixed permissions in template

Translation
 2013-05-16 21:03:42 +02:00
Oskar Hahn
e76aa499f3 Merge pull request #659 from normanjaeckel/LogMotionImport 
Log Entry for imported motions Fixed #655
 2013-05-16 04:36:39 -07:00
Oskar Hahn
9a881eceeb Merge pull request #651 from normanjaeckel/Workflow_Adjustablility_2 
Workflow adjustablility (new feature)
 2013-05-16 04:35:58 -07:00
Oskar Hahn
1dab39012c Merge pull request #661 from normanjaeckel/PermitRejectVersionLog 
Log permitting and rejecting motion versions (Fixed #657)
 2013-05-16 04:31:41 -07:00
Oskar Hahn
c0b45afac6 Merge pull request #662 from normanjaeckel/MotionPreamble 
Insert motion preamble in text field of the form of new motions
 2013-05-16 04:31:10 -07:00
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
Norman Jäckel
5adf55bc8c Log permitting and rejecting motion versions (Fixed #657) 2013-05-16 01:28:39 +02:00
Norman Jäckel
27da18f489 Fixed #655 Log Entry for imported motions 2013-05-16 00:58:37 +02:00
Norman Jäckel
bca8d3af15 Update view contains possibility for managers to change the workflow. Also other small fixes. 2013-05-16 00:25:44 +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