Commit Graph

3495 Commits

Author SHA1 Message Date
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
Norman Jäckel 6541d49c99 Merge pull request #1928 from emanuelschuetze/updateTranslations
Show missing translations. Updated de and pt.
2016-01-31 10:19:18 +01:00
Oskar Hahn b6f7836678 Merge pull request #1930 from normanjaeckel/LoginModalText
Fixed login modal info text. Fixed #1924.
2016-01-31 01:36:30 +01:00
Emanuel Schuetze 2e0d57d310 Updated EN translation source files. 2016-01-30 11:34:47 +01:00
Norman Jäckel af0f8fcac6 Refactored logic in autoupdate.py concerning wsgi network connection variables. Fixed #1929." 2016-01-30 10:18:15 +01:00
Norman Jäckel 01aad229fe Fixed login modal info text. Fixed #1924. 2016-01-30 10:04:20 +01:00
Norman Jäckel 15bb62b39a Merge pull request #1926 from ostcar/fix_autoreload_in_django_1.9
Fix the start command not to reload if debug is False
2016-01-30 09:58:13 +01:00
Emanuel Schuetze fb41d0a219 Show missing translations. Updated de and pt. 2016-01-30 09:20:53 +01:00
Norman Jäckel 144037ff57 Merge pull request #1922 from ostcar/fix_tornado_on_windows
fix tornado on windows
2016-01-29 23:30:04 +01:00
Emanuel Schuetze 1216ea99d3 Refactor reconnect function of autoupdate. 2016-01-29 16:30:00 +01:00
Oskar Hahn fbf8b0aa62 Fix the start command not to reload if debug is False 2016-01-29 09:51:12 +01:00
Oskar Hahn 28171ac6ff Merge pull request #1923 from emanuelschuetze/beta3-fixes
Use correct special html character for projector template title.
2016-01-29 09:20:02 +01:00
Emanuel Schuetze 3cd49704fc Use correct special html character for projector template title. 2016-01-29 09:14:26 +01:00
Oskar Hahn 9292558db7 fix tornado on windows 2016-01-28 16:19:14 +01:00
Norman Jäckel 3e2874a9a0 Merge pull request #1918 from normanjaeckel/Release
Release
2016-01-27 23:45:36 +01:00
Norman Jäckel 2aa31bffbf Updated version to 2.0-dev 2016-01-27 23:41:16 +01:00
Norman Jäckel 95ac91893c Release 2.0b2 2016-01-27 23:41:16 +01:00
Norman Jäckel da30be5184 Merge pull request #1919 from emanuelschuetze/fix1904
Fixed TypeError caused by #1904.
2016-01-27 23:40:53 +01:00
Emanuel Schuetze 587f397171 Fixed TypeError caused by #1904.
"Resource.relationList is undefinded" after activating a slide.
2016-01-27 23:35:24 +01:00
Norman Jäckel 95160248ad Merge pull request #1917 from emanuelschuetze/readme
Updated README for 2.0b2
2016-01-27 23:01:26 +01:00