Emanuel Schuetze
8388774f12
template: Minor style changes.
2013-02-05 21:33:07 +01:00
Emanuel Schuetze
0c5459f96e
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
2013-02-05 20:40:55 +01:00
Emanuel Schuetze
e822efdc81
Some template style work.
2013-02-04 13:06: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
ef7f6cf476
Permission system for MotionVersions
2013-02-03 13:24:29 +01:00
Oskar Hahn
65a18953bd
Added translatable log to the new motion system
2013-02-02 21:40:23 +01:00
Oskar Hahn
4cc6539f0c
Added get_allowed_actions to new motion app
2013-02-02 10:24:28 +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
1a2f0a1b5a
Added links to set and reset the state of a motion
2013-02-01 17:20:11 +01:00
Oskar Hahn
fb82a1787b
Add workflows for motions
2013-02-01 16:33:45 +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
da7a7a9d68
Add Poll-system to the new motion app
2013-02-01 12:51:54 +01:00
Emanuel Schuetze
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +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
1f87749742
Save the submitters to the motion
2013-01-26 15:25:54 +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
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
Emanuel Schuetze
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +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
804f842650
Updated the url template tag
2012-12-14 15:10:14 +01:00
Emanuel Schuetze
94928c20c5
Updated translation msg strings.
2012-11-27 21:22:57 +01:00
René Köcher
36f83808fd
Implement #419 : Add group column for motion csv import
...
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-21 23:38:25 +01:00
Emanuel Schuetze
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
Andy Kittner
fbd77da788
Fix missing translations ( #415 )
...
- The text "motions" was used with a plural here, but it was also
present in other places without a plural, therefore the .po file
contained only a singular translation. Solved by disambiguating the
uses with a context
- The submitter field of the MotionManagerForm was missing a label
2012-11-07 00:12:15 +01:00
Oskar Hahn
681d909fa3
rename application to motion
2012-10-24 11:07:36 +02:00
