a97cf4a680
Motion import improved:
...
- add semicolon support (use utils/csv_ext.py as participant import)
- show all warnings of each line in one warning message
- show success message with total counter (x of n motions imported).
- improved warning and error strings
2013-05-30 22:23:38 +02:00
9fb2052b3d
Bugfixing, template improvements, translation updates.
...
- Fixed #649 : Clean old motion fragments in template and pdf (about motion notes).
- Fixed motion pdf issues: missing submitters, voting result and make motion state translateable- Added post_save function also for UserUpdateView.
2013-05-29 22:59:24 +02:00
fa8b9d3888
Fixed translation issue for motion state.
2013-05-16 22:53:38 +02:00
b5a5acbf2c
Some last (template) improvements for next release
...
- Added dataTable function for group overview table.
- Added default form help text for groups and an explanation for group overview table.
- Updated translation.
- Translate group name in form.
- Username: FirstName instead of First_Name
- Hide group 'registered' from UserForm
- Linked persons/candidates/submitter etc. to UserView
- Fixed permissions in template
Translation
2013-05-16 21:03:42 +02:00
c1996b81fc
Updated translation.
2013-05-15 09:43:59 +02:00
b082f8a8fc
A lot of template improvements
...
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.
Moved css code.
2013-05-14 23:20:54 +02:00
5071daa148
Updated translations.
2013-04-24 14:36:04 +02:00
abad75c129
A lot of template improvements and translation fixes
...
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
2013-04-24 10:38:03 +02:00
0587c2019a
Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code.
...
Fixed csv import (added success url).
Added large csv file for testing import of >1000 participants.
Removed lage csv example file for paticipants (will be sustitute by a test script in future).
2013-03-14 22:34:40 +01:00
e101fb8212
Merge branch 'master' into agenda-orga-items
...
Conflicts:
openslides/agenda/static/styles/agenda.css
openslides/agenda/templates/agenda/config.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/static/styles/base.css
requirements.txt
2013-02-11 22:36:19 +01:00
6b4ee0e4f6
Updated translation.
2013-02-05 23:09:23 +01:00
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
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
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
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
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +01:00
65ebcbc991
#41 Time for each agenda item finished
2013-01-30 17:39:53 +01:00
bc9dcffff4
#41 Time for each agenda item
2013-01-29 14:28:42 +01:00
aee24425bc
Ticket 433 - Organisational items
2013-01-05 23:52:29 +01:00
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
bf98224ebd
Fixed missing translation.
2012-12-10 20:34:37 +01:00
56a5778260
Updated translation (fixed minor typo).
2012-12-10 20:06:17 +01:00
67f6b36ebc
Updated fr translation from transifex
2012-12-09 14:17:52 +01:00
84324cf317
Updated translations
2012-12-09 12:59:56 +01:00
0369edae1e
Added translationcontext for posts in assignment
2012-12-09 10:48:45 +01:00
442e5fba60
Added fr translation
2012-12-09 10:40:41 +01:00
fc4c4c3f95
Revert "Updated fr translation"
...
This reverts commit 7ff0825dc3
2012-12-05 20:07:11 +01:00
7ff0825dc3
Updated fr translation
2012-12-04 00:20:11 +01:00
ae35a8c719
Updated translations
2012-11-27 21:30:45 +01:00
ed33b47666
Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides
...
Conflicts:
openslides/locale/de/LC_MESSAGES/django.po
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 12:52:11 +01:00
9f51a24311
#419 - aftermath
...
- remove accidental print statements left over from debugging
- create missing groups on import
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 10:26:44 +01:00
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
4877eed46c
Updated translation.
2012-11-21 21:45:27 +01:00
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
7c75f42d85
Updated translations.
2012-11-08 09:42:35 +01:00
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
9d183e9746
Rename user group to group. Updated translations. Clean up new french po file.
2012-11-07 22:16:11 +01:00
0330f74d1b
Merge pull request #35 from andkit/master
...
Fix missing translations (#415 )
2012-11-07 01:24:54 -08:00
4b2fddc9ce
Merge pull request #36 from ostcar/fr
...
Added fr translation. The work was done from Moira.
2012-11-07 01:24:09 -08:00
a691db5d30
updated fr translation
...
Thx to Moira
2012-11-07 10:22:32 +01:00
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
41c1c5a2c8
Added fr translation
2012-11-05 18:41:53 +01:00
a363efe2ef
Fixed #390 : Added new user field 'about me'
2012-11-03 09:34:42 +01:00
005cb2f15e
Updated translations.
2012-11-03 08:59:34 +01:00
4ee518dd96
Updated translations (for sorting participants).
2012-10-30 22:59:37 +01:00
145a52eb24
Updated translations.
2012-10-30 22:16:43 +01:00
87d5f4b6f8
Updated german translation
2012-10-24 12:55:25 +02:00
12d8527255
Updated translations.
2012-09-18 22:40:30 +02:00
56e3fe7a37
fix translation
2012-09-13 21:56:50 +02:00
0cf0e58af9
Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
...
Conflicts:
openslides/assignment/models.py
2012-09-13 15:28:35 +02:00
ef7deb90c9
translate agenda hidden filter in js
2012-09-13 15:21:43 +02:00
7376b7a692
Updated translations.
2012-09-11 20:50:53 +02:00
bc25937aa0
Updated translations.
2012-09-11 19:57:22 +02:00
7fde53a09e
Updated template with twitter bootstrap. Step 1: agenda and application.
2012-09-05 00:20:28 +02:00
bd64a6cb5c
Merge branch 'stable/1.2.x'
...
Conflicts:
openslides/application/models.py
openslides/application/views.py
openslides/participant/forms.py
openslides/participant/views.py
2012-08-13 19:16:42 +02:00
c52f8f3ca7
changed application to motion and permitted to authorized in message-strings
2012-08-05 22:31:20 +02:00
e34f90aad1
update german translation
2012-07-28 11:09:00 +02:00
feb82bd531
Updated translation.
2012-07-25 23:21:30 +02:00
172b90ea1b
#328 : Translated application status error message.
2012-07-24 07:32:20 +02:00
0c0f3d09da
#328 : Show error message if application status is already set.
2012-07-23 23:17:03 +02:00
9d2a011958
update translation
2012-07-23 09:33:19 +02:00
078125a1a2
update translation
2012-07-20 11:05:04 +02:00
ba783489f2
changle end of line to windows for some files
2012-07-20 10:55:07 +02:00
f928abd006
merge
2012-07-19 11:16:38 +02:00
70b161c539
added name for participant app in __init__
...
removed some files, added though branch merge
2012-07-19 11:11:07 +02:00
c678b557fa
#311 : Updated first login message and translations.
2012-07-19 08:21:51 +02:00
4fe77f89d3
Updated translations.
2012-07-18 21:15:12 +02:00
9b3103d4a8
#284 : Updated i18n links and added gettext requirement note.
2012-07-18 20:44:02 +02:00
365f844164
update translation
2012-07-18 10:53:19 +02:00
2a0e7ef2c4
Updated translation.
2012-07-16 22:37:59 +02:00
d428841735
Fixed translation.
2012-07-16 22:26:07 +02:00
9c03726bef
#295 : Change link to button.
2012-07-13 07:44:42 +02:00
b4ee5dfff4
#293 : Updated translation.
2012-07-13 07:34:15 +02:00
cea2bbbf7d
update translation
2012-07-12 14:19:08 +02:00
81fc7ae560
update translation
2012-07-10 02:53:49 +02:00
403f8e7917
update translation
2012-07-10 02:21:27 +02:00
eb3adcd8ca
update translation
2012-07-07 11:20:30 +02:00
4e0f8670f1
update translation
2012-07-04 15:48:40 +02:00
198eefbfdd
rewrote projector overlay widget
2012-07-04 02:43:26 +02:00
60570ea962
#245 update translation
2012-06-30 15:21:27 +02:00
35e112a7d7
update translation
2012-06-30 12:24:23 +02:00
09e6eec6f2
fix translation error in professional support
2012-06-29 00:38:34 +02:00
587ce4093d
update translation
2012-06-29 00:27:27 +02:00
e9c680f5e1
update translation
2012-06-24 21:55:46 +02:00
b963b61385
update german translation
2012-06-23 15:36:02 +02:00
f7eab29ed5
Fixed missing translation in poll_view assignment template (table head).
2012-05-23 14:31:12 +02:00
0acf6734e9
Updated translations.
2012-05-21 22:02:55 +02:00
0007a1dfa8
Add log messages when poll is updated/deleted ( #187 )
2012-05-20 23:12:50 +02:00
c4450bf14e
Updated translations.
2012-05-20 20:02:48 +02:00
e005863336
Changed/ added logmessages for applications ( #184 , #187 )
...
- Added a logmessage when a version is accepted/ rejected
- Made logmessage for trivial changes more explicit and include
the names of the changed fields
- Updated translations
2012-05-19 12:46:54 +02:00
3f4119f182
#199 : Changed login error message. Updated translation.
2012-05-19 08:44:46 +02:00
c19025ceb3
#190 : Fixed typo in translation.
2012-05-14 23:10:17 +02:00
1d6a0bee4e
#174 : Change form field 'groups' to 'user groups'.
2012-05-14 23:04:00 +02:00
31ae7c38c9
#192 : i18n-de: Beamer -> Projektor
2012-05-14 22:16:13 +02:00
304013649b
Changed default event description. Updated tranlsations.
2012-05-14 22:08:40 +02:00
114b719cad
Added comment column in agenda overview.
2012-05-14 21:55:36 +02:00
Emanuel Schuetze