ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,970 Commits 6 Branches 42 Tags 64 MiB
6005934e3b
Commit Graph

1970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
6005934e3b Merge pull request #832 from normanjaeckel/Fix_Start_Option 
Start Browser on custom IP, fixed #827
 2013-07-25 14:01:13 -07:00
Norman Jäckel
2128e787bf Start Browser on custom IP, fixed #827 2013-07-25 17:03:04 +02:00
Emanuel Schütze
6b90ef6576 Merge pull request #820 from normanjaeckel/Release_1.4 
Release 1.4
 2013-07-08 11:38:52 -07:00
Norman Jäckel
9d01881986 Update version to 1.4.1-dev 2013-07-08 20:08:10 +02:00
Norman Jäckel
304c572f85 Release 1.4 2013-07-08 20:05:31 +02:00
Norman Jäckel
ab5f23d038 Merge pull request #819 from normanjaeckel/BeforeRelease 
Fix README and INSTALL
 2013-07-08 11:02:33 -07:00
Norman Jäckel
bf6f36f120 Fix README and INSTALL 2013-07-08 19:52:43 +02:00
Oskar Hahn
526eeb5cea Merge pull request #818 from ostcar/issue_814 
Fixed #814 Sorting of candidates in the assignment
 2013-07-08 05:27:19 -07:00
Oskar Hahn
47d70d5a73 Fixed #814 Sorting of candidates in the assignment 2013-07-08 14:08:27 +02:00
Oskar Hahn
f2d13e5ec9 Merge pull request #817 from ostcar/master 
Issue 794
 2013-07-08 05:03:40 -07:00
Oskar Hahn
1014617b0f Merge pull request #811 from normanjaeckel/Windows64bit 
Update INSTALL. OpenSlides for Windows 64-bit (fixed #810).
 2013-07-08 04:57:53 -07:00
Oskar Hahn
8ebf3f9038 Merge pull request #815 from emanuelschuetze/csv-files 
Updated CSV files with demo data. Minor fixes for motion.
 2013-07-08 04:49:08 -07:00
Oskar Hahn
7023fea0ef Merge pull request #816 from emanuelschuetze/translation 
Updated German translation (some typos).
 2013-07-08 04:47:22 -07:00
Oskar Hahn
f39e8dd92e Fixed #794 bug when a non speaking list slide was active, when a projector tab was opend 2013-07-08 13:44:44 +02:00
Emanuel Schuetze
b12fdb09cd Updated German translation (some typos). 2013-07-08 13:40:06 +02:00
Norman Jäckel
46906eec21 Update INSTALL. OpenSlides for Windows 64-bit (fixed #810). 2013-07-08 13:19:40 +02:00
Emanuel Schuetze
69c7832701 Updated csv example files for motion and participants - in DE and EN used in demo database. 
Updated motion csv import test.
 2013-07-08 10:11:48 +02:00
Oskar Hahn
f2de7e540e Merge pull request #812 from normanjaeckel/UpdateDoc 
German documentation: Insert short comment on HTML in agenda text fields...
 2013-07-07 23:16:00 -07:00
Oskar Hahn
6a8a94697f Merge pull request #813 from normanjaeckel/RenamePermissions 
Rename visual strings of permissions
 2013-07-07 23:15:39 -07:00
Norman Jäckel
d703ef9c4f Rename visual strings of permissions: Add plural s (fix #797). Also update all language files. 2013-07-08 00:03:47 +02:00
Norman Jäckel
eeda7a4639 German documentation: Insert short comment on HTML in agenda text fields (fixed #808). 2013-07-07 23:34:48 +02:00
Emanuel Schuetze
5bff15762e Motion detail template: Removed category from title (already in meta block) 2013-07-07 23:04:26 +02:00
Emanuel Schuetze
7e5c3f6a27 Removed whitespace in filename of motion pdf (identifier: PrefixNumber). 2013-07-07 22:00:10 +02:00
Oskar Hahn
aca2570cb7 Merge pull request #800 from andkit/portable-improvements 
Portable improvements
 2013-07-06 23:57:00 -07:00
Oskar Hahn
04ee38dcc0 Merge pull request #809 from emanuelschuetze/fixes-1.4 
Fixed #798 and #803
 2013-07-05 08:08:48 -07:00
Oskar Hahn
06a2660439 Merge pull request #807 from emanuelschuetze/handbuch 
(docs) Fixed typos and missing quote signs for chapter titles.
 2013-07-05 08:07:39 -07:00
Oskar Hahn
04e691ef7c Merge pull request #806 from normanjaeckel/Some_Issues 
Some issues
 2013-07-05 08:06:38 -07:00
Oskar Hahn
69ef67e729 Merge pull request #799 from normanjaeckel/WorkflowImage 
Insert workflow overview image and table in German documentation
 2013-07-05 08:04:01 -07:00
Emanuel Schuetze
3fadb99ffd Fixed #803 (Groups not translated on user detail view and overview pdf) 2013-07-05 15:49:10 +02:00
Emanuel Schuetze
4625c4731d Updated translation. Fixed #798 (typo in translation of permissions). 2013-07-05 14:51:37 +02:00
Emanuel Schuetze
dbd660520a (docs) Fixed typos and missing quote signs for chapter titles. 2013-07-05 14:20:37 +02:00
Andy Kittner
b568546fb8 Add some explanation to is_portable(); fixes #729 2013-07-04 23:29:56 +02:00
Andy Kittner
2b4602068b Update version resource with pywin32 when no compiler is available 2013-07-04 23:29:44 +02:00
Norman Jäckel
d226c5f852 Update windows installing instruction (fixed #792) 2013-07-04 15:40:47 +02:00
Norman Jäckel
834851acbd Typo in assignment view (fixed #805) 2013-07-04 15:40:47 +02:00
Norman Jäckel
abae3b7281 Insert workflow overview image and table in German documentation 
Thanks to Hannah Imbusch for the nice overview images.
Fixed #778.
 2013-07-04 15:40:11 +02:00
Emanuel Schütze
af1acf1839 Merge pull request #801 from emanuelschuetze/changelog 
Updated CHANGELOG (fixed #699).
 2013-07-04 06:23:17 -07:00
Emanuel Schuetze
2bef329cfd Updated CHANGELOG (fixed #699). 2013-07-02 09:19:25 +02:00
Andy Kittner
5ba09ddb93 Implement #791: dynamically load python27.dll from DLLs/ directory 2013-06-29 14:31:11 +02:00
Emanuel Schütze
b2dda49234 Merge pull request #795 from emanuelschuetze/1.4-fixes2 
Some motion (pdf) fixes for 1.4
 2013-06-28 04:09:58 -07:00
Emanuel Schuetze
5dd65cb173 Fixed motion pdf and template issues: 
- Fixed #790 (Unicode Error while creating motion pdf if motion text contains umlauts and motion is imported from CSV)
- Fixed #742: Added categories and identifier to motion pdf.
- Fixed wrong title order (app title - OpenSlides).
 2013-06-28 12:43:58 +02:00
Oskar Hahn
c12a0efa21 Merge pull request #788 from emanuelschuetze/translations 
Updated translations.
 2013-06-27 05:54:50 -07:00
Emanuel Schuetze
db7e22229e Fixed comments by norman. 2013-06-27 09:20:28 +02:00
Emanuel Schuetze
cf773c34a8 Updated translations. 2013-06-26 21:36:06 +02:00
Oskar Hahn
46812a96f6 Merge pull request #787 from andkit/fix-761 
Fix issues when starting portable from a non-ascii path (#761)
 2013-06-26 10:14:58 -07:00
Oskar Hahn
bf8482fc03 Merge pull request #786 from emanuelschuetze/1.4-fixes 
Some template and doc fixes
 2013-06-26 10:11:28 -07:00
Oskar Hahn
c15c5047e6 Merge pull request #775 from ostcar/issue-765b 
Fixes #765. Avoids the django AbstracUser username validator
 2013-06-26 10:09:19 -07:00
Norman Jäckel
cc6aa27167 Documentation: Whitespace in the username, fixed #782 2013-06-26 19:00:52 +02:00
Oskar Hahn
7d1eb5207a Fixes #765. Avoids the django AbstracUser username validator 
Also changed added a white-space in the default username again
 2013-06-26 19:00:52 +02:00
Andy Kittner
92f044689d Fix issues when starting portable from a non-ascii path 2013-06-25 22:23:30 +02:00