Oskar Hahn
99b4e8c494
Merge pull request #1771 from emanuelschuetze/fix1729
...
Added whitespace before triple dots in template (Fixes #1729 )
2015-12-12 11:05:58 +01:00
Oskar Hahn
63d4351c9a
Merge pull request #1773 from emanuelschuetze/csv-import
...
Improved agenda and users csv import (Fixes #1748 )
2015-12-12 11:05:03 +01:00
Emanuel Schuetze
f5efca1d1e
Added whitespace before triple dots in template ( Fixes #1729 )
2015-12-12 10:16:44 +01:00
Emanuel Schuetze
31c320f9ef
Improved csv import for agenda and users.
...
- Fix users list.
2015-12-12 10:12:22 +01:00
Oskar Hahn
66e0fe272b
Merge pull request #1764 from normanjaeckel/DefaultPermissions
...
Deleted Django's default permissions.
2015-12-12 09:32:40 +01:00
Oskar Hahn
9402d25f4f
Merge pull request #1767 from normanjaeckel/ItemDetailSlide
...
Removed item detail slide on server and client side.
2015-12-12 09:31:36 +01:00
Oskar Hahn
fae3747da6
Merge pull request #1769 from normanjaeckel/LoginLogout
...
Fixed login and logout view.
2015-12-12 09:30:00 +01:00
Oskar Hahn
fd90b15a0e
Merge pull request #1770 from emanuelschuetze/fix1728
...
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728 )
2015-12-12 09:28:20 +01:00
Oskar Hahn
d3fba3a24e
Merge pull request #1772 from emanuelschuetze/fix1750
...
Login dialog behavior if guest mode enabled/disabled (Fixes #1750 )
2015-12-12 09:25:36 +01:00
Emanuel Schuetze
c275b08178
Fixed some template bugs ( #1727 )
...
- Fixed z-index of messages and countdowns.
- Sidebar: Live view open by default. Improve section style.
- Set default value for open_posts in assignments create form.
- Redefine default values in motions create form.
2015-12-12 00:30:05 +01:00
Norman Jäckel
e0e74d6c3c
Fixed login, logout and password change view.
2015-12-11 23:58:59 +01:00
Emanuel Schuetze
041b01afe5
Login dialog behavior if guest mode enabled/disabled ( Fixes #1750 )
2015-12-11 21:18:45 +01:00
Emanuel Schuetze
ca94a4e720
Rename template variable 'isFilter' to 'isFilterOpen' ( Fixes #1728 )
2015-12-11 19:50:50 +01:00
Norman Jäckel
0701838bc8
Merge pull request #1765 from emanuelschuetze/WhoAmI
...
Login form
2015-12-11 15:44:02 +01:00
Norman Jäckel
da37f3a441
Removed item detail slide on server and client side.
...
There is now only a list of speakers slide.
2015-12-11 15:37:13 +01:00
Norman Jäckel
c73671805e
Merge pull request #1753 from emanuelschuetze/fix1704
...
Project related object (Fixes #1704 )
2015-12-11 15:25:56 +01:00
Emanuel Schuetze
5d29af5f52
Improved login form.
...
- Add redirect after aborting login. (Fixes #1762 )
- Use new state paramater 'guest_enabled' for login form.
2015-12-11 13:45:53 +01:00
Norman Jäckel
24cb58dc12
Added guest enabled info to WhoAmI view.
2015-12-11 13:44:58 +01:00
Oskar Hahn
c9adeb7fbb
Merge pull request #1766 from emanuelschuetze/fix1752
...
Fix user.id in password reset request (Fixes #1752 )
2015-12-10 22:19:51 +01:00
Emanuel Schuetze
9001456d19
Fix user.id in password reset request ( Fixes #1752 )
2015-12-10 15:03:18 +01:00
Norman Jäckel
114a38e4ee
Deleted Django's default permissions.
2015-12-10 00:31:27 +01:00
Norman Jäckel
f98b4f7840
Merge pull request #1760 from emanuelschuetze/cleanupExtras
...
Clean up extras directory.
2015-12-09 23:21:50 +01:00
Norman Jäckel
3919387cdf
Merge pull request #1759 from emanuelschuetze/removeDocs
...
Moved docs to own github repository.
2015-12-09 23:20:36 +01:00
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