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

3426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Emanuel Schuetze
f0b93370d6 Updated README for 2.0b2 2016-01-27 22:59:43 +01:00
Emanuel Schütze
30e6e1aa13 Merge pull request #1916 from normanjaeckel/Metadata 
Updated metadata files.
 2016-01-27 22:55:56 +01:00
Norman Jäckel
4c313c05e0 Merge pull request #1915 from normanjaeckel/Languages 
Updated angular-gettext language file.
 2016-01-27 22:55:00 +01:00
Norman Jäckel
d141fd3692 Updated metadata files. 2016-01-27 22:53:12 +01:00
Norman Jäckel
1b1d41b9b8 Updated angular-gettext language file. 2016-01-27 22:33:05 +01:00
Norman Jäckel
c4281c6bc7 Merge pull request #1912 from emanuelschuetze/fixAgenda 
Check if user is allowed to see detail view link in agenda list.
 2016-01-27 22:25:56 +01:00
Norman Jäckel
70d32f1e47 Merge pull request #1914 from emanuelschuetze/fixGulp 
Fixed gulp 'pot' task. Fixed typos in translation strings.
 2016-01-27 22:23:29 +01:00
Norman Jäckel
cdc01c06cd Merge pull request #1913 from normanjaeckel/Translations 
Updated translations.
 2016-01-27 22:22:03 +01:00
Norman Jäckel
fea0287a20 Updated translations. 2016-01-27 22:16:54 +01:00
Emanuel Schuetze
3c7d03547c Set default of item.weigth to 10000. 
So new items are placed at the end of agenda.
After sorting weight is updated.
 2016-01-27 22:16:46 +01:00
Emanuel Schuetze
0ce0b9cd18 Fixed gulp 'pot' task. Fixed typos in translation strings. 2016-01-27 22:11:24 +01:00
Emanuel Schuetze
fc22711a9c Check if user is allowed to see detail view link in agenda list. 
Fixes #1886
 2016-01-27 21:19:32 +01:00
Norman Jäckel
65cbecb3c2 Merge pull request #1911 from normanjaeckel/Languages 
Updated language files.
 2016-01-27 20:58:13 +01:00
Norman Jäckel
4aaa474761 Updated language files. 2016-01-27 20:55:27 +01:00
Norman Jäckel
bdc5312148 Merge pull request #1905 from emanuelschuetze/requirements 
Updated bower requirements (Fixes #1758)
 2016-01-27 20:52:03 +01:00
Emanuel Schuetze
10e77136da Updated bower requirements (Fixes #1758) 2016-01-27 20:44:19 +01:00
Norman Jäckel
352e32334e Merge pull request #1901 from emanuelschuetze/fix1895 
Translate permission strings. (Fixes #1895)
 2016-01-27 20:42:07 +01:00
Norman Jäckel
e041656115 Merge pull request #1903 from emanuelschuetze/pdfMediafilePresentation 
Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664).
 2016-01-27 20:40:23 +01:00
André Böhlke
d3ed15db29 Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664). 
Thanks to André Böhlke for contribution core functionality!
Some additional template improvements by Emanuel.
 2016-01-27 20:36:21 +01:00