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

3231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
ea6a6206a0 Merge pull request #1756 from emanuelschuetze/fix1750 
Redirect to login dialog if user is not logged in (Fixes #1750)
 2015-12-09 23:16:22 +01:00
Oskar Hahn
dac76df0c9 Merge pull request #1751 from normanjaeckel/ChangeGulp 
Updated Gulpfile. Fixed #1746.
 2015-12-09 22:59:48 +01:00
Emanuel Schuetze
4539b99d1f Clean up extras directory. 
- moved 'extras/logo' to 'logo'
- moved 'csv-examples' to http://files.openslides.org/csv-examples/
- removed unused 'benchmark' and 'scripts' directories
 2015-12-09 22:32:19 +01:00
Emanuel Schuetze
f264c3911e Moved docs to own github repository. 
See https://github.com/OpenSlides/openslides-docs
 2015-12-09 22:25:03 +01:00
Emanuel Schuetze
f050e04f0a Redirect to login dialog if user is not logged in (Fixes #1750) 2015-12-09 20:45:52 +01:00
Emanuel Schuetze
7bffeba93e Project related object (Fixes #1704) 
- Override generic project and isProjected function in agenda.
- Fix project and isProjected function for list of speakers and move
  to jsDataModel of Agenda.
 2015-12-09 20:02:08 +01:00
Norman Jäckel
17dc0943a3 Updated Gulpfile. Fixed #1746. 2015-12-08 18:43:28 +01:00
Norman Jäckel
5e3ff74575 Merge pull request #1745 from normanjaeckel/Release-2.0b1 
Release 2.0b1
 2015-12-07 22:01:04 +01:00
Norman Jäckel
1f63f84fde Update version to 2.0b2-dev 2015-12-07 21:55:56 +01:00
Norman Jäckel
c5e3a14a82 Release 2.0b1 2015-12-07 21:55:17 +01:00
Norman Jäckel
28eda0f0b1 Updated setup.py. 2015-12-07 21:54:33 +01:00
Norman Jäckel
1415461141 Merge pull request #1744 from emanuelschuetze/readme 
Updated Readme.
 2015-12-07 21:54:08 +01:00
Emanuel Schuetze
d583561342 Updated README and CHANGELOG for 2.0b1. 2015-12-07 21:42:20 +01:00
Emanuel Schuetze
f4fb3f9460 Remove old unused win32 portable and gui code. 
Moved to new repositories:
https://github.com/OpenSlides/openslides-portable
https://github.com/OpenSlides/openslides-gui
 2015-12-07 20:43:22 +01:00
Norman Jäckel
9344e20b34 Merge pull request #1743 from normanjaeckel/Translations 
Updated German translation.
 2015-12-07 20:22:50 +01:00
Norman Jäckel
2f4b7c192c Updated French translation. 2015-12-07 20:11:46 +01:00
Norman Jäckel
00dd0b419a Updated German translation. 2015-12-07 20:06:05 +01:00
Norman Jäckel
55a0c327e4 Merge pull request #1742 from normanjaeckel/LanguageFile 
Updated English language file.
 2015-12-07 19:57:33 +01:00
Norman Jäckel
075c00ac4f Updated English language file. 2015-12-07 15:43:45 +01:00
Norman Jäckel
d368bedfc9 Merge pull request #1741 from emanuelschuetze/translations 
Updated English translation strings.
 2015-12-07 15:36:18 +01:00
Emanuel Schuetze
3c5f49a127 Updated English translation strings. 2015-12-07 15:15:12 +01:00
Oskar Hahn
87c63f0d19 Merge pull request #1740 from normanjaeckel/FontsRepo 
Used our own repository for Open Sans font.
 2015-12-07 10:26:37 +01:00
Norman Jäckel
1b1e8f8ba2 Used our own repository for Open Sans font. 2015-12-06 23:55:30 +01:00
Norman Jäckel
586f781f8d Merge pull request #1738 from emanuelschuetze/templateFixes 
Template fixes
 2015-12-06 18:33:30 +01:00
Emanuel Schuetze
5c6977c46d Template fixes 2015-12-06 17:26:10 +01:00
Norman Jäckel
871f911be5 Merge pull request #1739 from emanuelschuetze/translations 
Updated translation strings and pot file.
 2015-12-06 13:48:36 +01:00
Emanuel Schuetze
232ce522fe Updated translation strings and pot file. 2015-12-06 07:25:07 +01:00
Oskar Hahn
37cd431aa9 Merge pull request #1737 from emanuelschuetze/motion-csv-import 
Add motion csv import (Fixes #1675)
 2015-12-05 23:53:08 +01:00
Emanuel Schuetze
d987a1138d Added motion csv import (Fixes #1675) 
using pre-import checks and preview table.
 2015-12-05 21:44:19 +01:00
Oskar Hahn
5fad933371 Merge pull request #1736 from emanuelschuetze/newFavicon 
Use transparent favicon.
 2015-12-04 09:37:55 +01:00
Emanuel Schuetze
f5452082f0 Use transparent favicon. 
- Added favicon to projector template.
 2015-12-02 14:20:59 +01:00
Oskar Hahn
31f46ce177 Merge pull request #1735 from normanjaeckel/Fix 
Fixed comment.
 2015-12-02 11:17:27 +01:00
Norman Jäckel
696bfb0883 Fixed comment. 2015-12-01 15:45:35 +01:00
Oskar Hahn
acbe929706 Merge pull request #1734 from emanuelschuetze/fixTranslationAgendaSupplement 
Fixed translations in agendaSupplement.
 2015-12-01 14:22:41 +01:00
Emanuel Schuetze
b81704a88f Fixed translations in agendaSupplement. 2015-12-01 13:45:54 +01:00
Oskar Hahn
3dd3a2f4fd Merge pull request #1732 from emanuelschuetze/fixTranslations 
Fixed gettext strings in JavaScript.
 2015-12-01 13:38:21 +01:00
Emanuel Schuetze
e23121ed0f Updated language menu. 
- improved header menu style
- define new Languages factory
- make it easier to define new languages
 2015-12-01 12:06:15 +01:00
Emanuel Schuetze
bf940b177c Fixed gettext strings in JavaScript. 
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
 2015-11-30 23:52:42 +01:00
Oskar Hahn
727aa5d0e2 Merge pull request #1731 from normanjaeckel/GermanTranslation 
Added German translation.
 2015-11-30 23:18:59 +01:00
Norman Jäckel
139a5173b8 Added German translation. 2015-11-30 21:30:37 +01:00
Norman Jäckel
6cfa7f2309 Merge pull request #1725 from normanjaeckel/Fixes 
Several fixes.
 2015-11-30 21:12:59 +01:00
Norman Jäckel
f84b8f29ac Template and translation changes. Updated English language files. 2015-11-30 21:06:31 +01:00
Norman Jäckel
ea24202833 Merge pull request #1730 from emanuelschuetze/template-fix 
Fix translation tags.
 2015-11-30 20:58:09 +01:00
Emanuel Schuetze
5cf2134e95 Fix translation tags. 2015-11-30 20:52:02 +01:00
Norman Jäckel
9504cfe348 Merge pull request #1723 from emanuelschuetze/newTemplateDesign 
New template design
 2015-11-30 20:40:37 +01:00
Emanuel Schuetze
fa267b68c2 New template design 
- Great thanks to Jörn Bensch (from triagonale.de) for new base
  template!
- A lot of adaptations in all templates for new design.
 2015-11-30 20:36:33 +01:00
Oskar Hahn
aab8b28393 Merge pull request #1724 from emanuelschuetze/project-item-fix 
Added own isProjected function for Agenda factory (Fixes #1704)
 2015-11-30 14:49:17 +01:00
Oskar Hahn
ca201758e8 Merge pull request #1715 from emanuelschuetze/template-improvements 
Template improvements
 2015-11-29 22:32:08 +01:00
Emanuel Schuetze
2b5c9c09b2 Template improvements 
- use modal dialogs for new/edit views of customslide/motions/assigments
- use hover actions in all list views
- Show assignment candidate names
- support yesnoabstain/vote assignment poll
- Generic solution for open edit dialog.
 2015-11-29 22:26:59 +01:00
Oskar Hahn
e046dd5302 Merge pull request #1719 from normanjaeckel/AssignmentRESTReq 
Added error message if a new cnadidate is already nominated.
 2015-11-29 22:22:36 +01:00