Commit Graph

1254 Commits

Author SHA1 Message Date
Emanuel Schuetze b66a57d341 Prepared 1.3-beta2 release. 2012-11-07 22:21:55 +01:00
Emanuel Schuetze 9d183e9746 Rename user group to group. Updated translations. Clean up new french po file. 2012-11-07 22:16:11 +01:00
Emanuel Schuetze 7b64d464f5 Added user view url also for last_name. 2012-11-07 21:27:59 +01:00
Andy Kittner 32a76e2aad Fix UnicodeError on widgets page 2012-11-07 21:12:52 +01:00
Emanuel Schuetze af4f923527 Fixed KeyError in main.py. 2012-11-07 20:48:07 +01:00
Oskar Hahn 0330f74d1b Merge pull request #35 from andkit/master
Fix missing translations (#415)
2012-11-07 01:24:54 -08:00
Oskar Hahn 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
Oskar Hahn a691db5d30 updated fr translation
Thx to Moira
2012-11-07 10:22:32 +01:00
Oskar Hahn 2d9b0a8848 delete the projector cache after 1 second. 2012-11-07 10:05:38 +01:00
Oskar Hahn 13b5336af9 Merge pull request #33 from ostcar/manage
fixed manage.py
2012-11-07 00:59:35 -08: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
Norman Jäckel 35e41873a0 Add UserSlide with new template. 2012-11-06 00:02:44 +01:00
Oskar Hahn 41c1c5a2c8 Added fr translation 2012-11-05 18:41:53 +01:00
Oskar Hahn 79e619949a Merge pull request #32 from emanuelschuetze/master
Some fixes for 1.3
2012-11-03 02:49:52 -07:00
Emanuel Schuetze a363efe2ef Fixed #390: Added new user field 'about me' 2012-11-03 09:34:42 +01:00
Emanuel Schuetze 005cb2f15e Updated translations. 2012-11-03 08:59:34 +01:00
Emanuel Schuetze d05a73335b Merge remote branch 'upstream/master' 2012-11-03 07:58:11 +01:00
Oskar Hahn 3c58d8d64b fixed manage.py 2012-11-02 20:57:59 +01:00
Oskar Hahn 424d10cb63 Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1'
Conflicts:
	openslides/__init__.py
	openslides/projector/views.py
2012-10-31 15:27:47 +01:00
Norman Jäckel 3b4e19ad3b Enhence template of UserView and GroupView 2012-10-31 14:47:42 +01:00
Norman Jäckel ac25e02e2d Catch another IOError in get_version() 2012-10-31 14:38:06 +01:00
Emanuel Schuetze 60c01770b7 Fixed folder list for .gitattributes. 2012-10-31 09:06:56 +01:00
Emanuel Schuetze e430974543 Added .gitattributes for ignoring files with 'git archive' export. 2012-10-31 09:04:38 +01:00
Oskar Hahn 0397849a79 Merge pull request #23 from emanuelschuetze/master
prepare 1.3-beta1 release
2012-10-31 00:27:13 -07:00
Emanuel Schuetze d9ccb02969 Changed version number string. Important for building portable version.
Used alpha|beta|rc without git commit hash.
Added 'dev' suffix which use git hash only. It is easier to handle in file names of releases.
2012-10-31 07:11:53 +01:00
Emanuel Schuetze 8ffeadfe88 Cleared projector cache if countdown enabled or overlay message changed. 2012-10-30 23:45:06 +01:00
Emanuel Schuetze 3dd5ce9e73 Fixed default password generation while CSV import. 2012-10-30 23:10:23 +01:00
Emanuel Schuetze 9a522f3835 Use participant_sort_users_by_first_name config var for overview table, participant list (pdf) and first time passwords (pdf). 2012-10-30 23:00:24 +01:00
Emanuel Schuetze 4ee518dd96 Updated translations (for sorting participants). 2012-10-30 22:59:37 +01:00
Emanuel Schuetze aa0abec970 Fixed motion csv import error. 2012-10-30 22:30:32 +01:00
Emanuel Schuetze 145a52eb24 Updated translations. 2012-10-30 22:16:43 +01:00
Emanuel Schuetze 85771c4af6 Fixed participant CSV import. 2012-10-30 22:05:03 +01:00
Emanuel Schuetze f62b7f299b Changed admin full name to "Adminstrator". 2012-10-30 21:02:39 +01:00
Emanuel Schuetze 053c3be030 Added Mac OS X specific file .DS_Store to .gitignore. 2012-10-30 20:48:58 +01:00
Emanuel Schuetze d9fbfeff84 for pull request #23: Removed "You have access to apps" code from welcome widget. 2012-10-30 20:18:16 +01:00
Emanuel Schuetze 51a762b4c6 Prepared 1.3-beta1 release. 2012-10-30 20:05:54 +01:00
Emanuel Schuetze 0c797aa476 Merge remote branch 'upstream/master' 2012-10-30 20:03:17 +01:00
Norman Jäckel c13f4ba52d Add UserView and GroupView part 2 2012-10-30 00:07:25 +01:00
Oskar Hahn 9dc799ef5e fixed projector_cache.
It still does not work, but it does show changes on slides now
2012-10-29 23:26:10 +01:00
Oskar Hahn f4e1f83f15 rename test_name_surfix in test_name_suffix in participant/tests.py 2012-10-29 16:27:15 +01:00
Norman Jäckel b213e75223 Enhancement to ticket # 389 (Message on assignment slide when no vote results yet available) 2012-10-29 10:16:12 +01:00
Oskar Hahn 79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +01:00
Oskar Hahn 76534cf287 Merge pull request #31 from normanjaeckel/master
Fix SupportView
2012-10-28 09:48:47 -07:00
Norman Jäckel 21c12a6d32 Fix POST request in SupportView 2012-10-28 17:44:15 +01:00
Oskar Hahn a100fd5d78 Merge pull request #30 from normanjaeckel/SupportView_in_motion
New: Support view in motion
2012-10-28 07:19:10 -07:00
Norman Jäckel 9d3d095162 Clean up SupportView. Raise error message at GET request instead of POST. 2012-10-28 02:09:47 +02:00
Norman Jäckel 015dc159ed Add UserView and GroupView part 1 2012-10-27 18:17:22 +02:00
Norman Jäckel 3f0c31d12b Add user widget and group widget, see # 379 2012-10-26 18:16:09 +02:00
Norman Jäckel 1063e7011a Change query for assignments in personal_info_widget 2012-10-26 17:14:46 +02:00
Norman Jäckel 510aca54eb Add widget with personal info, ticket #25 2012-10-25 23:58:32 +02:00