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

3464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schuetze
0dd3c3158f Updated angular-gettext en source file. 2016-02-09 16:49:55 +01:00
Emanuel Schuetze
eae50b46de Fixed closing tag for correct translation string 2016-02-09 16:49:32 +01:00
Norman Jäckel
0fe2b9cd8a Merge pull request #1962 from emanuelschuetze/templateFixes3 
Motion state translation strings are still used by motion pdf.
 2016-02-09 09:32:21 +01:00
Emanuel Schütze
657d45f268 Merge pull request #1960 from normanjaeckel/Gulp 
Fixed gulp-cssnano.
 2016-02-09 00:18:50 +01:00
Emanuel Schuetze
7248673b47 Motion state translation strings are still used by motion pdf. 
Reverted partly the changes in motion/signmals.py by a8544f016d.
 2016-02-09 00:11:48 +01:00
Norman Jäckel
6ccf1f0673 Merge pull request #1961 from emanuelschuetze/templateFixes2 
Refactored MotionPoll.
 2016-02-09 00:05:08 +01:00
Emanuel Schuetze
31102bd9d7 Refactored MotionPoll. 
Use new getVotes function for vote value and percent value.
Remove 'to_representation' function in motion serializer.py to get
special values in numbers (-1,-2) instead of translated strings.
 2016-02-08 23:56:44 +01:00
Norman Jäckel
801618d815 Fixed gulp-cssnano. 2016-02-08 23:51:57 +01:00
Emanuel Schütze
e6b1695c88 Merge pull request #1958 from normanjaeckel/Gulp 
Updated gulp-uglify.
 2016-02-08 23:31:59 +01:00
Norman Jäckel
086eb2937a Updated gulp-uglify. 2016-02-08 23:02:09 +01:00
Norman Jäckel
25a7f59b70 Merge pull request #1950 from normanjaeckel/Worker.js 
Simplified installing of JS and CSS libs. Fixed #1906.
 2016-02-08 22:35:28 +01:00
Norman Jäckel
3be21473a4 Merge pull request #1956 from emanuelschuetze/master 
Several template fixes
 2016-02-08 22:32:56 +01:00
Emanuel Schütze
6cd3e48e45 Merge pull request #1952 from normanjaeckel/ErrorMessages 
Used 'detail' for all ValidationError messages. See #1946.
 2016-02-08 22:22:43 +01:00
Emanuel Schuetze
96b4784d52 Show motion poll results on projector. 2016-02-08 22:15:31 +01:00
Norman Jäckel
87a97edd69 Used 'detail' for all ValidationError messages. See #1946. 2016-02-08 21:52:23 +01:00
Emanuel Schuetze
0a4cdb3717 Used copy of motionpoll for MotionPollUpdate dialog. 2016-02-08 21:41:01 +01:00
Emanuel Schuetze
82f2c4f003 Fixed quickEdit mode in agenda, motion, assignment. 
Refresh motion object after cancel.
 2016-02-08 21:37:20 +01:00
Emanuel Schuetze
6ba47a64d3 Agenda list view: allow to delete also motion and assignment items. 
Fixes #1943
 2016-02-08 21:07:35 +01:00
Emanuel Schuetze
f89f3a9933 Improved motion state dropdown element. 2016-02-08 20:34:12 +01:00
Emanuel Schuetze
4bbb153c42 Use Roboto font in projector header/footer. 2016-02-08 20:27:59 +01:00
Emanuel Schuetze
963bebac29 CKEditor v4.5.7 does not work (Syntax Error). 
Go back to last working version 4.5.6.
 2016-02-07 19:49:15 +01:00
Emanuel Schütze
c40dfb120b Merge pull request #1951 from normanjaeckel/Autoupdate 
Fixed problem with some REST requests during autoupdate. Fixed #1935.
 2016-02-07 14:17:33 +01:00
Norman Jäckel
0e784cde31 Fixed problem with some REST requests during autoupdate. Fixed #1935. 2016-02-05 23:55:06 +01:00
Norman Jäckel
8cb74c5e7a Simplified installing of JS and CSS libs. Fixed #1906. 2016-02-05 23:27:15 +01:00
Emanuel Schütze
378218e8a5 Merge pull request #1944 from normanjaeckel/README 
Updated README.
 2016-02-05 22:48:22 +01:00
Emanuel Schütze
fc35468faf Merge pull request #1947 from normanjaeckel/AssignmentPDF 
Fixed assignment PDF. Fixed #1940.
 2016-02-05 22:30:23 +01:00
Norman Jäckel
2ba675c1b6 Fixed assignment PDF. Fixed #1940. 2016-02-05 21:22:47 +01:00
Norman Jäckel
48d8ca9004 Updated README. 2016-02-05 20:57:21 +01:00
Emanuel Schütze
773ce0537d Merge pull request #1945 from normanjaeckel/MinifyCSS 
Removed gulp-minify-css. Added gulp-cssnano. Fixed #1890.
 2016-02-05 16:32:14 +01:00
Norman Jäckel
b25ba01c0f Removed gulp-minify-css. Added gulp-cssnano. Fixed #1890. 2016-02-05 15:33:17 +01:00
Norman Jäckel
eaea41564c Merge pull request #1942 from emanuelschuetze/assignmentPolls 
Refactored AssignmentPoll (Fixed #1848)
 2016-02-05 13:46:22 +01:00
Emanuel Schuetze
494c9aee94 Refactored AssignmentPoll (Fixed #1848) 
Add percents and progressbars.
Template fixes and improvements for polls.
 2016-02-05 00:32:18 +01:00
Emanuel Schütze
af10737388 Merge pull request #1941 from emanuelschuetze/2.0b3 
2.0b3
 2016-02-03 21:46:56 +01:00
Emanuel Schuetze
d92e7e0ecf Update version to 2.0b4-dev 2016-02-03 21:18:59 +01:00
Emanuel Schuetze
7a785b3092 Release 2.0b3 2016-02-03 21:18:45 +01:00
Emanuel Schütze
1090ad695d Merge pull request #1939 from emanuelschuetze/updateTranslations1 
Updated languages DE, PT, FR, CS, ES (angular-gettext only) Fixes #1925
 2016-02-03 21:12:29 +01:00
Emanuel Schuetze
f944efaf76 Show html text in motion and users detail view correctly. 
Remove white-space-pre-line css class.
 2016-02-03 21:04:46 +01:00
Emanuel Schuetze
6997e49851 Updated languages DE, PT, FR, CS, ES (angular-gettext only) 2016-02-03 20:27:56 +01:00
Emanuel Schütze
ac47b9dd64 Merge pull request #1938 from emanuelschuetze/updatedENSource 
Updated EN source file for angular-gettext.
 2016-02-03 16:56:57 +01:00
Emanuel Schuetze
142ceaaffc Updated EN source file for angular-gettext. 2016-02-03 15:32:35 +01:00
Oskar Hahn
eef82d7e72 Merge pull request #1936 from emanuelschuetze/pagination 
Add Pagination and improve import.
 2016-02-03 15:24:21 +01:00
Oskar Hahn
59294b1fcb Merge pull request #1937 from emanuelschuetze/mediafileImprovements 
Mediafile: Improvements for pdf presentaiton and list view.
 2016-02-03 15:11:41 +01:00
Emanuel Schuetze
af023f30bc Mediafile: Improvements for pdf presentaiton and list view. 2016-02-03 00:46:17 +01:00
Emanuel Schuetze
8ae3e1d468 Add Pagination and improve import. 
- Use Pagination for users and item list and users import table.
- Improve agenda import: Allow to define agenda item stuff like
  duration, comment, type.
 2016-02-02 22:48:06 +01:00
Norman Jäckel
8b72f6d821 Merge pull request #1933 from emanuelschuetze/agendaTree 
Optimize agenda tree save method on client side.
 2016-02-01 23:56:20 +01:00
Norman Jäckel
3b7af68da8 Merge pull request #1932 from ostcar/fix_autoupdate 
Fix the autoupdate
 2016-02-01 23:55:18 +01:00
Oskar Hahn
09cbe8c9e4 Fix the autoupdate 2016-02-01 23:21:50 +01:00
Emanuel Schuetze
f30d62a11f Optimize agenda tree save method on client side. 
with ui-tree
Fixes #1660
 2016-02-01 23:06:13 +01:00
Oskar Hahn
a2d8b41d55 Merge pull request #1931 from normanjaeckel/LocalHostVar 
Refactored logic in autoupdate.py concerning wsgi network connection …
 2016-02-01 21:27:13 +01:00
Oskar Hahn
7d6c202200 Merge pull request #1927 from emanuelschuetze/autoconnect 
Refactor reconnect function of autoupdate.
 2016-02-01 21:25:58 +01:00