Commit Graph

1617 Commits

Author SHA1 Message Date
Oskar Hahn
2f28655a25 Show Tabs if there do not define some permissions 2013-01-05 01:03:42 +01:00
Oskar Hahn
8401cae983 Merge pull request #79 from normanjaeckel/master
Fix typo in motion template.
2013-01-04 10:31:48 -08:00
Norman Jäckel
d842214e26 Fix typo in template. 2013-01-04 19:14:56 +01:00
Oskar Hahn
5d754984a3 fixed pep8 errors 2013-01-04 12:39:42 +01:00
Oskar Hahn
7c2d53560d Merge pull request #78 from ostcar/master
There is not alpha0
2013-01-04 02:56:33 -08:00
Oskar Hahn
bd243313e5 Merge pull request #77 from ostcar/django1.5
Changes for Django1.5
2013-01-04 02:51:20 -08:00
Oskar Hahn
c1903848f2 Update openslides/__init__.py 2013-01-04 11:49:43 +01:00
Emanuel Schuetze
d671740966 Fixed merged errors. 2013-01-02 23:22:12 +01:00
Emanuel Schuetze
4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate
Conflicts:
	openslides/application/views.py
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/views.py
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_overview.html
	openslides/participant/templates/participant/overview.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/dashboard.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/static/styles/base.css
	openslides/templates/base.html
	openslides/templates/front_page.html
	openslides/utils/utils.py
2013-01-02 23:01:43 +01:00
Oskar Hahn
4cc3d42bab clean up the .gitignore 2012-12-16 18:28:24 +01:00
Oskar Hahn
8a84f72891 fixed more url-template-tags 2012-12-16 17:35:06 +01:00
Oskar Hahn
5ea863ca81 Let the user choose the language in his settings 2012-12-16 17:26:53 +01:00
Oskar Hahn
37d4c82434 let travis manuell download django as long it is not on pypi 2012-12-14 15:50:26 +01:00
Oskar Hahn
b79fedc215 fixed jsonfield for django 1.5 2012-12-14 15:36:57 +01:00
Oskar Hahn
594efc44ad updated requirements.txt 2012-12-14 15:36:41 +01:00
Oskar Hahn
804f842650 Updated the url template tag 2012-12-14 15:10:14 +01:00
Oskar Hahn
366b8e0f1f Droped support for python 2.5 2012-12-14 14:21:53 +01:00
Oskar Hahn
a07146098b Changed Version to 1.4.dev 2012-12-14 14:14:01 +01:00
Emanuel Schütze
c07a76c22f Merge pull request #75 from emanuelschuetze/master
Set version number to 1.3.1a
2012-12-10 13:38:18 -08:00
Emanuel Schuetze
9910bc698f Merge remote branch 'upstream/master' 2012-12-10 22:36:52 +01:00
Emanuel Schuetze
67b9adc0be Udated package description. 2012-12-10 22:36:37 +01:00
Emanuel Schuetze
c83348923a Set version number to 1.3.1a0-dev (unreleased) 2012-12-10 22:36:18 +01:00
Emanuel Schütze
4fde552728 Merge pull request #74 from emanuelschuetze/master
1.3 release date
2012-12-10 12:41:50 -08:00
Emanuel Schuetze
7a9441d639 Merge remote branch 'upstream/master' 2012-12-10 21:40:57 +01:00
Emanuel Schuetze
56f360e7ed Added 1.3 release date to CHANGELOG. 2012-12-10 21:39:52 +01:00
Emanuel Schütze
4e381e7ecf Merge pull request #72 from emanuelschuetze/master
1.3 final changes
2012-12-10 11:36:16 -08:00
Emanuel Schuetze
bf98224ebd Fixed missing translation. 2012-12-10 20:34:37 +01:00
Emanuel Schuetze
9a0bca7fea Set 1.3 final release. 2012-12-10 20:30:32 +01:00
Emanuel Schuetze
8f369ed71c Updated INSTALL and README for 1.3 release.
Use 'openslides' command instead of 'python start.py' for Linux/MacOS install instruction.
2012-12-10 20:29:00 +01:00
Emanuel Schuetze
56a5778260 Updated translation (fixed minor typo). 2012-12-10 20:06:17 +01:00
Emanuel Schuetze
c48c4e0e90 Added missing remove icon (for unsupport motion button). 2012-12-10 19:44:35 +01:00
Oskar Hahn
332f1d8a27 Merge pull request #71 from ostcar/master
fr translation
2012-12-09 05:19:21 -08:00
Oskar Hahn
67f6b36ebc Updated fr translation from transifex 2012-12-09 14:17:52 +01:00
Oskar Hahn
1173cd610b Merge pull request #70 from ostcar/master
translation
2012-12-09 04:01:00 -08:00
Oskar Hahn
84324cf317 Updated translations 2012-12-09 12:59:56 +01:00
Oskar Hahn
0369edae1e Added translationcontext for posts in assignment 2012-12-09 10:48:45 +01:00
Oskar Hahn
442e5fba60 Added fr translation 2012-12-09 10:40:41 +01:00
Oskar Hahn
48dd6e2526 Merge pull request #69 from ostcar/master
Revert the fr translation because of encoding errors
2012-12-05 11:10:29 -08:00
Oskar Hahn
fc4c4c3f95 Revert "Updated fr translation"
This reverts commit 7ff0825dc3.
2012-12-05 20:07:11 +01:00
Oskar Hahn
05c029d8e5 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2012-12-04 00:20:41 +01:00
Oskar Hahn
7ff0825dc3 Updated fr translation 2012-12-04 00:20:11 +01:00
Oskar Hahn
932f023da6 Merge pull request #68 from normanjaeckel/Fixes
Some small fixes
2012-12-01 10:41:54 -08:00
Norman Jäckel
046db10d3a Hide group registered in the group widget.
Make custom slides text scrollable.

Fix template of personal_info_widget.
2012-12-01 19:32:58 +01:00
Oskar Hahn
f6e2ea63a5 Merge pull request #67 from ostcar/master
requirements.txt
2012-12-01 10:20:49 -08:00
Oskar Hahn
6ccde4256e added testing packages to the requirements.txt file 2012-12-01 18:07:44 +01:00
Oskar Hahn
cf360de5fa Merge pull request #66 from normanjaeckel/Version_String
New version string, fixes for the manage.py and update INSTALL
2012-12-01 06:18:01 -08:00
Norman Jäckel
a5022a3f00 Fix pep8 in openslides/__init__.py 2012-12-01 14:05:19 +01:00
Norman Jäckel
c9956f6380 Clean up INSTALL 2012-12-01 13:51:00 +01:00
Norman Jäckel
4410e454c8 Update test for version string. 2012-12-01 13:39:29 +01:00
Norman Jäckel
343710ad1a Merge remote-tracking branch 'ostcar/windows_manage' into Version_String 2012-12-01 13:16:17 +01:00