Andy Kittner
073c98d6b1
Remove note about installing openslides before building the portable
2012-11-22 00:29:20 +01:00
Andy Kittner
720a993259
Copy openslides from local checkout to site-packages
...
We reverted to using the checkout instead of an installed openslides
version when building the portable, but we still want openlides to be
placed together with all the other packages
2012-11-18 14:38:22 +01:00
Andy Kittner
b4a4d15a7f
Revert "Treat openslides the same way as other packages"
...
This reverts commit 14ba868df4
2012-11-18 14:21:11 +01:00
Oskar Hahn
f40f091658
Merge pull request #43 from emanuelschuetze/master
...
Final commits for 1.3-beta2
2012-11-09 04:54:58 -08:00
Andy Kittner
28cf531e4d
Pass along database path to create_settings if started as portable version
2012-11-09 13:45:52 +01:00
Emanuel Schuetze
491e26c3f1
Changed beta2 relase date.
2012-11-09 13:21:50 +01:00
Oskar Hahn
b8bbec3a04
Merge pull request #42 from emanuelschuetze/master
...
Several minor fixes for 1.3-beta2
2012-11-09 01:16:37 -08:00
Oskar Hahn
6719cca7e1
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-09 09:52:00 +01:00
Oskar Hahn
54fb61d211
fixed main.py and manage.py for the openslides.exe
2012-11-09 09:51:10 +01:00
Emanuel Schuetze
945081f7a6
Some minor changes and restructure work on howto create probable document.
2012-11-09 09:25:14 +01:00
Emanuel Schuetze
81570b61e6
Rename submenu titel 'projector' to 'dashboard'.
2012-11-08 20:11:06 +01:00
Emanuel Schuetze
216ac95cfb
Redirect to dashboard after submit widget selection form.
2012-11-08 20:08:09 +01:00
Emanuel Schuetze
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
Emanuel Schuetze
533c65562d
Don't allow to deactivate or delete the superuser or yourself.
...
Otherwise it's very danger to lock out your current (superuser) session.
2012-11-08 18:57:53 +01:00
Oskar Hahn
6d5e9d7d61
Merge pull request #41 from emanuelschuetze/master
...
Fixed translations of widget names.
2012-11-08 00:46:59 -08:00
Emanuel Schuetze
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
Emanuel Schuetze
7c75f42d85
Updated translations.
2012-11-08 09:42:35 +01:00
Oskar Hahn
cbea48ab7e
Merge pull request #40 from emanuelschuetze/master
...
Fixed type in pdf list
2012-11-08 00:26:12 -08:00
Oskar Hahn
de7d4ed6cd
Merge pull request #34 from normanjaeckel/UserSlide
...
Add UserSlide with new template.
2012-11-08 00:25:04 -08:00
Emanuel Schuetze
8d599d6428
Fixed type in participants PDF list.
2012-11-08 09:22:23 +01:00
Oskar Hahn
f551b2fa6d
Merge pull request #39 from emanuelschuetze/master
...
Last translation update for 1.3-beta2
2012-11-07 13:43:02 -08:00
Emanuel Schuetze
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
Oskar Hahn
030058fb7c
Merge pull request #37 from andkit/master
...
Fix UnicodeError on widgets page
2012-11-07 13:35:24 -08:00
Oskar Hahn
0a6945bf08
Merge pull request #38 from emanuelschuetze/master
...
Last fixes for 1.3-beta2
2012-11-07 13:33:59 -08:00
Emanuel Schuetze
a3627b77b4
Added new allowed language (French).
2012-11-07 22:24:39 +01:00
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
