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

1993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
1113b6d861 Added template filter 'absolute_url' 2013-08-19 11:21:29 +02:00
Oskar Hahn
967c199a56 Removed utils from INSTALLED_APPS. 
Moved utils.management and utils.templatetags to core
 2013-08-11 09:40:14 +02:00
Oskar Hahn
b8d23164f7 Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	openslides/__init__.py
 2013-07-29 20:52:05 +02:00
Oskar Hahn
ed8e57a995 Merge pull request #843 from normanjaeckel/Release_1.4.1 
Release 1.4.1
 2013-07-29 11:28:49 -07:00
Norman Jäckel
1225c5bbb6 Update version to 1.4.2-dev 2013-07-29 20:19:29 +02:00
Norman Jäckel
119fb90bfd Release 1.4.1 2013-07-29 20:17:26 +02:00
Oskar Hahn
3d32438417 Merge pull request #842 from normanjaeckel/CHANGLOG_1.4.1 
Changlog 1.4.1
 2013-07-29 11:12:42 -07:00
Norman Jäckel
8301895236 Update CHANGELOG and INSTALL 2013-07-29 20:09:47 +02:00
Oskar Hahn
adddc7c044 Merge pull request #841 from ostcar/issue-833 
Issue 833
 2013-07-29 10:48:11 -07:00
Oskar Hahn
b03e8cc06b Fixed #833 2013-07-29 19:45:06 +02:00
Oskar Hahn
764113e024 Merge pull request #840 from emanuelschuetze/motion-version-warnings 
Show each motion detail version warning in one line
 2013-07-29 01:54:12 -07:00
Emanuel Schuetze
20d7a3b539 Add paragraph around each motion version warning (to show each warning in one line). 2013-07-29 09:06:36 +02:00
Oskar Hahn
edad6115b4 Merge pull request #837 from normanjaeckel/issue-822-additional-new 
Disable deleting active versions of a motion
 2013-07-28 13:19:21 -07:00
Norman Jäckel
30c3f5ea64 Disable deleting active versions of a motion 2013-07-28 01:14:15 +02:00
Oskar Hahn
b7edee8fdf Merge pull request #836 from ostcar/issue-833 
Fixed tooltip and duration in agenda.
 2013-07-27 15:29:21 -07:00
Oskar Hahn
5fdea2f213 Merge pull request #830 from ostcar/issue-822 
Use get_active_version in motion.__unicode__()
 2013-07-27 15:28:49 -07:00
Oskar Hahn
8743d75d10 Use get_active_version in motion.__unicode__() 
Fixes the bug, that motion.__unicode__() raises an AttributeError, if the active_version
was None.

Fixes #822
 2013-07-27 10:11:28 +02:00
Oskar Hahn
b39cb8e8a4 Fixed tooltip and duration in agenda. 
The tooltip did not show the end of an agenda item, but of the hole event.

If a item was closed, it was not used to calculate the end of the event.

Fixed #833
 2013-07-27 10:02:40 +02:00
Oskar Hahn
b5513f5b08 Merge pull request #835 from emanuelschuetze/czech-translation 
Czech translation
 2013-07-27 00:52:41 -07:00
Emanuel Schuetze
bb538953ee Added Czech translation (Thanks to Pavel Fric!) 2013-07-26 21:37:58 +02:00
Oskar Hahn
7726fa87a9 Merge pull request #831 from ostcar/issue-823 
Generate poll-urls via model_url
 2013-07-25 14:11:33 -07:00
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
Oskar Hahn
b83b1c49e9 Generate poll-urls via model_url 
Fixed Bug to wrong poll urls
Fixed #823
 2013-07-18 09:50:54 +02:00
Oskar Hahn
ec3db2ffff Prepare OpenSlides master for the next major release 2013-07-18 08:50:08 +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