Commit Graph

3087 Commits

Author SHA1 Message Date
Emanuel Schuetze
da4ed365bc Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0). 2013-01-18 22:10:00 +01:00
Emanuel Schuetze
a4592ec849 Reworked projector activate buttons in agenda widget. 2013-01-18 21:44:47 +01:00
Oskar Hahn
7722149768 Merge pull request #83 from normanjaeckel/master
Update requirements
2013-01-18 07:04:54 -08:00
Norman Jäckel
595eac2c11 Update requirements: set version of coverage to 3.6 2013-01-17 22:33:52 +01:00
Emanuel Schuetze
a52368d296 Set next release to 1.4. Added 1.3.1 CHANGELOG from stable/1.3.x branch 2013-01-09 21:40:54 +01:00
Emanuel Schuetze
586425354d Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
Oskar Hahn
0231fe37f5 Start to rewrite the motion app 2013-01-08 20:22:03 +01:00
Oskar Hahn
4a7badea8f Merge pull request #81 from normanjaeckel/Fixes_2
Some fixes. Update requirements.txt and setup.py.
2013-01-05 15:38:11 -08:00
Norman Jäckel
d5cbf80bf5 Set to Django 1.5c1 2013-01-06 00:33:03 +01:00
Stefan Frauenknecht
aee24425bc Ticket 433 - Organisational items 2013-01-05 23:52:29 +01:00
Norman Jäckel
deb0d5b2e5 Some fixes. Update requirements.txt and setup.py. 2013-01-05 23:20:38 +01:00
Emanuel Schuetze
369f418b0e Fixed missing endif 2013-01-05 15:43:52 +01:00
Oskar Hahn
ece772540f Merge pull request #80 from ostcar/master
pep8, django1.5 and smal fix
2013-01-05 06:33:27 -08:00
Emanuel Schuetze
13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +01:00
Oskar Hahn
6417f5f107 fixed pep8 error 2013-01-05 14:56:22 +01:00
Oskar Hahn
2fcf0b3a07 fixed typo in utils/views.py 2013-01-05 14:46:05 +01:00
Oskar Hahn
56510f94a8 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-01-05 13:44:35 +01:00
Stefan Frauenknecht
bb74674c41 Deprecated import django.conf.urls.defaults adjusted. 2013-01-05 12:39:20 +01:00
Oskar Hahn
ae8641bcad Raise an error if an CreateView does not define a apply_url 2013-01-05 01:48:03 +01:00
Oskar Hahn
3229d86d4d Import urls.py needed django functions from django.conf.urls 2013-01-05 01:05:38 +01:00
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