Commit Graph

23 Commits

Author SHA1 Message Date
Norman Jäckel ee9e2729d1 Updated CHANGELOG, README.rst, requirements files, .travis.yml and setup.py. 2014-05-05 21:25:17 +02:00
Oskar Hahn 6ae503e009 fix for python2.6 and pip 1.5 2014-03-11 23:50:30 +01:00
Norman Jäckel ff183c03a3 Rename requrirements. This fixes #676. 2013-05-23 23:46:14 +02:00
Norman Jäckel 1a58298daf Update metafiles for new packaging style 2013-05-16 23:54:49 +02:00
Norman Jäckel b9d4af7de7 Use Fabric in travis and insert a fabfile for developers 2013-04-16 00:19:59 +02:00
Oskar Hahn 43cd5aba00 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-14 22:44:11 +01:00
Oskar Hahn 545d4be04f fixed update of person_api 2013-03-14 22:32:00 +01:00
Norman Jäckel edce8c59f1 Fix PEP8, and forgotten import change. Update .travis. 2013-03-12 21:56:13 +01:00
Oskar Hahn 14f062f59f Django 1.5 release 2013-02-27 12:27:54 +01:00
Oskar Hahn 342404518b fixed travis 2013-02-03 20:06:00 +01:00
Oskar Hahn 139ba74459 Merge remote-tracking branch 'emanuel/newtemplate' into new_template
Conflicts:
	.travis.yml
	INSTALL.txt
	openslides/agenda/templates/agenda/base_agenda.html
	openslides/agenda/templates/agenda/edit.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/agenda/templates/agenda/widget.html
	openslides/assignment/templates/assignment/base_assignment.html
	openslides/assignment/templates/assignment/config.html
	openslides/assignment/templates/assignment/edit.html
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/poll_view.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/templates/assignment/widget.html
	openslides/config/templates/config/general.html
	openslides/motion/templates/motion/base_motion.html
	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/motion/templates/motion/widget.html
	openslides/motion/views.py
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/edit.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_widget.html
	openslides/participant/templates/participant/import.html
	openslides/participant/templates/participant/login.html
	openslides/participant/templates/participant/overview.html
	openslides/participant/templates/participant/password_change.html
	openslides/participant/templates/participant/settings.html
	openslides/participant/templates/participant/user_widget.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/control_countdown.html
	openslides/projector/templates/projector/control_overlay_message.html
	openslides/projector/templates/projector/custom_slide_widget.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/projector/templates/projector/new.html
	openslides/projector/templates/projector/overlay_widget.html
	openslides/templates/base.html
	openslides/utils/template.py
	openslides/utils/views.py
	requirements.txt
2013-02-03 19:03:18 +01:00
Oskar Hahn 3ffb16d4d8 Fixed pep8 errors 2013-02-02 10:52:13 +01:00
Norman Jäckel deb0d5b2e5 Some fixes. Update requirements.txt and setup.py. 2013-01-05 23:20:38 +01:00
Emanuel Schuetze 13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +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 366b8e0f1f Droped support for python 2.5 2012-12-14 14:21:53 +01:00
Oskar Hahn 6ccde4256e added testing packages to the requirements.txt file 2012-12-01 18:07:44 +01:00
Oskar Hahn bdfb714013 fixed pep8 in pdf.py 2012-11-26 10:35:29 +01:00
Oskar Hahn a0e4519b62 fixed travis pep8 line 2012-11-26 10:19:45 +01:00
Oskar Hahn c276bce780 Let travis test pep8 2012-11-26 10:11:36 +01:00
Oskar Hahn a7c13e3285 added script to create a local settings 2012-11-24 16:22:48 +01:00
Oskar Hahn ddd251a742 fix for travis 2012-11-24 15:43:17 +01:00
Oskar Hahn 4eed43f782 Configured the repo for travis 2012-11-24 15:26:20 +01:00