Oskar Hahn
|
a08cf84ab8
|
Wrote docstrings to the motion app
|
2013-02-05 18:46:46 +01:00 |
Emanuel Schuetze
|
8f05ada6a1
|
template style and new icons
|
2013-02-05 17:05:40 +01:00 |
Stefan Frauenknecht
|
d6084f7c8b
|
Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time.
|
2013-02-05 16:36:57 +01:00 |
Emanuel Schuetze
|
80b0ab5252
|
template: Updated dashboard. Fixed ajax functionality. Adapted style.
|
2013-02-05 11:24:41 +01:00 |
Emanuel Schuetze
|
6db0210ef3
|
Updated jquery form plugin to v3.26.0-2013.01.28
|
2013-02-05 11:22:01 +01:00 |
Emanuel Schuetze
|
5e44bba941
|
Updated jquery from 1.9.0 to 1.9.1.
|
2013-02-05 11:15:23 +01:00 |
Emanuel Schuetze
|
404bf7f0b5
|
template: Added missing back link.
|
2013-02-04 13:38:29 +01:00 |
Emanuel Schuetze
|
36f5c97dbe
|
Added assignment context menu (more actions). Fixed 'back to election' link.
|
2013-02-04 13:18:10 +01:00 |
Emanuel Schuetze
|
e822efdc81
|
Some template style work.
|
2013-02-04 13:06:36 +01:00 |
Oskar Hahn
|
a34731c00e
|
fixed pep8 in motion.pdf
|
2013-02-03 20:12:44 +01:00 |
Oskar Hahn
|
90614cc637
|
Updated some views for the new utils.views style
|
2013-02-03 19:43:36 +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
|
b8a353fa7c
|
Added PDF view for the motions
|
2013-02-03 18:18:29 +01:00 |
Oskar Hahn
|
42082ae3c2
|
fixed pep8
|
2013-02-03 14:14:07 +01:00 |
Oskar Hahn
|
cbd4acbd4b
|
fixed motion tests
|
2013-02-03 13:55:42 +01:00 |
Oskar Hahn
|
ef7f6cf476
|
Permission system for MotionVersions
|
2013-02-03 13:24:29 +01:00 |
Oskar Hahn
|
e7c65b3db1
|
Moved some methodes from utils.views.DeleteView to QuestionMixin
|
2013-02-03 13:23:55 +01:00 |
Oskar Hahn
|
f4ea611fb8
|
Wrote log messages for motion changes
|
2013-02-03 10:02:06 +01:00 |
Oskar Hahn
|
65a18953bd
|
Added translatable log to the new motion system
|
2013-02-02 21:40:23 +01:00 |
Oskar Hahn
|
15b13c2bcd
|
Handel null=True in PersonField
|
2013-02-02 21:19:37 +01:00 |
Oskar Hahn
|
2e430b4406
|
check permission in motion view
|
2013-02-02 10:59:07 +01:00 |
Oskar Hahn
|
3ffb16d4d8
|
Fixed pep8 errors
|
2013-02-02 10:52:13 +01:00 |
Oskar Hahn
|
4cc6539f0c
|
Added get_allowed_actions to new motion app
|
2013-02-02 10:24:28 +01:00 |
Oskar Hahn
|
a27bd7eade
|
Add motion to agenda
|
2013-02-02 00:51:08 +01:00 |
Oskar Hahn
|
910e0f17e7
|
Add slide Date to the motion
|
2013-02-02 00:37:43 +01:00 |
Oskar Hahn
|
1518543a9a
|
Added motion widget and deletion of motions
|
2013-02-02 00:27:16 +01:00 |
Oskar Hahn
|
0f7d0e349c
|
Fixed URLs in projector views
|
2013-02-02 00:26:08 +01:00 |
Oskar Hahn
|
bd317aed31
|
Wrote tests for openslides.motion.models.Motion
|
2013-02-01 19:19:18 +01:00 |
Oskar Hahn
|
6c3eb0f765
|
fixed urls in views from the participant app
|
2013-02-01 17:35:27 +01:00 |
Oskar Hahn
|
1a2f0a1b5a
|
Added links to set and reset the state of a motion
|
2013-02-01 17:20:11 +01:00 |
Oskar Hahn
|
ac41a02ac5
|
Block supporting, unsupporting and creation of poll in some states
|
2013-02-01 16:44:06 +01:00 |
Oskar Hahn
|
fb82a1787b
|
Add workflows for motions
|
2013-02-01 16:33:45 +01:00 |
Stefan Frauenknecht
|
7f03e02e9a
|
Item type changed from CharField to IntegerField. Constant type names added.
|
2013-02-01 15:13:40 +01:00 |
Stefan Frauenknecht
|
9f3dae8059
|
ConfigForm: Base classes reordered
|
2013-02-01 14:47:51 +01:00 |
Stefan Frauenknecht
|
c595701597
|
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
|
2013-02-01 14:41:52 +01:00 |
Oskar Hahn
|
3f02a28002
|
Added a poll delete view to the new motion app
|
2013-02-01 13:24:44 +01:00 |
Oskar Hahn
|
b6256b73e0
|
Changed utils.views.DeleteView
|
2013-02-01 13:24:30 +01:00 |
Emanuel Schuetze
|
d3b679442c
|
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling.
|
2013-02-01 12:55:04 +01:00 |
Oskar Hahn
|
da7a7a9d68
|
Add Poll-system to the new motion app
|
2013-02-01 12:51:54 +01:00 |
Oskar Hahn
|
adeaf248ef
|
Changed utils.- and poll.views
|
2013-02-01 12:51:01 +01:00 |
Stefan Frauenknecht
|
5a9b7fdca5
|
Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
|
2013-01-31 20:37:55 +01:00 |
Stefan Frauenknecht
|
9746b3818f
|
Rework code to ommit unnecessary filter call.
|
2013-01-31 20:32:29 +01:00 |
Stefan Frauenknecht
|
3dfd16558a
|
Blanks removed
|
2013-01-31 18:35:52 +01:00 |
Emanuel Schuetze
|
033ecd9497
|
Added new glyphicons icons.
|
2013-01-31 10:20:53 +01:00 |
Emanuel Schuetze
|
82ad5e2de0
|
Major changes for new twitter bootstrap template (e.g. replaced icons)
|
2013-01-31 10:19:56 +01:00 |
Stefan Frauenknecht
|
65ebcbc991
|
#41 Time for each agenda item finished
|
2013-01-30 17:39:53 +01:00 |
Stefan Frauenknecht
|
bc9dcffff4
|
#41 Time for each agenda item
|
2013-01-29 14:28:42 +01:00 |
Oskar Hahn
|
d911e311d6
|
Let the user support and unsupport the motion
|
2013-01-26 18:18:02 +01:00 |
Oskar Hahn
|
7bcfa16737
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides into new_motion
Conflicts:
openslides/motion/templates/motion/view.html
openslides/utils/views.py
|
2013-01-26 17:57:35 +01:00 |
Oskar Hahn
|
87e42cf9f8
|
Let the user choose if the motion should have a new version
via config or form
|
2013-01-26 17:09:13 +01:00 |
Oskar Hahn
|
0702d49e2e
|
Save the supporter
|
2013-01-26 16:42:23 +01:00 |
Oskar Hahn
|
d3b340769b
|
Added motion config tab
|
2013-01-26 16:33:55 +01:00 |
Oskar Hahn
|
ecb6419f8c
|
fixed apply and success url in utils.views
|
2013-01-26 16:19:53 +01:00 |
Oskar Hahn
|
567e6c975a
|
Show initial submitters in the update-form
|
2013-01-26 16:05:30 +01:00 |
Oskar Hahn
|
8708ba5da6
|
Only save new version, when version-data has changed
|
2013-01-26 15:39:35 +01:00 |
Oskar Hahn
|
1f87749742
|
Save the submitters to the motion
|
2013-01-26 15:25:54 +01:00 |
Oskar Hahn
|
1ae140c11e
|
Add docstrings to the motion class
|
2013-01-26 12:28:51 +01:00 |
Roland Geider
|
bebaadf850
|
Actually do the right check for further args
|
2013-01-23 21:24:02 +01:00 |
Roland Geider
|
3bfead298d
|
Add custom management command to start the application with tornado
|
2013-01-23 21:12:36 +01:00 |
Roland Geider
|
a14f9b30ad
|
Fix help text
|
2013-01-23 19:37:12 +01:00 |
Andy Kittner
|
22e8457894
|
Add an option to suppress starting of web browser (closes #436)
|
2013-01-22 21:04:07 +01:00 |
Roland Geider
|
70407feab8
|
Use the tornado server to serve the application
|
2013-01-19 10:51:42 +01:00 |
Emanuel Schuetze
|
b8532fabe4
|
Removed files from images to img dir.
|
2013-01-18 22:23:31 +01:00 |
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 |
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 |
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 |
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 |
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
|
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
|
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
|
b79fedc215
|
fixed jsonfield for django 1.5
|
2012-12-14 15:36:57 +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 Schuetze
|
c83348923a
|
Set version number to 1.3.1a0-dev (unreleased)
|
2012-12-10 22:36:18 +01: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
|
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
|
67f6b36ebc
|
Updated fr translation from transifex
|
2012-12-09 14:17:52 +01: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
|
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 |