ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,536 Commits 6 Branches 42 Tags 64 MiB
78924f966f
Commit Graph

53 Commits

Author SHA1 Message Date
Oskar Hahn
32137b6523 Use python3 
python3.3 and python3.4 are supported
 2014-08-24 21:21:11 +02:00
Norman Jäckel
2bfa5f3a72 Prepared for release. 
Small style changes, CHANGELOG and README.rst update.
 2014-05-19 22:55:54 +02:00
Emanuel Schuetze
30eaabb376 Added README.txt for plugin dir in portable version. 2014-05-19 21:26:38 +02:00
Roland Geider
e9d52245cb Replace own CKeditor with dedicated app 2014-05-19 00:00:18 +02:00
Emanuel Schütze
2774753574 Portable build fix: Install missing roman package. 2014-05-13 21:03:26 +02:00
Emanuel Schütze
7add4c5691 Portable: Create empty plugins directory. 
Fixed file permissions.
 2014-05-05 21:01:25 +02:00
Andy Kittner
09757f4f0d Update copyright to 2014 2014-05-05 00:55:36 +02:00
Emanuel Schuetze
157d4bdc14 New poll slides for motion and assignment. (Fixed #862) 
Move result table from assignment slide to assignment poll slide.
Use "result" in singular for motion and election results.
 2014-05-02 23:40:23 +02:00
Emanuel Schütze
87cd81f1ff Updated packages in requirements_production.txt and prepare_portable.py 
Added new license files of packages for portable version.
 2014-04-28 21:30:39 +02:00
Norman Jäckel
e6dad6d087 Merge part of stable/1.5.x into master. 
Conflicts:
	CHANGELOG
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/__init__.py
	openslides/core/templates/base.html
	requirements_production.txt
	tests/config/test_config.py
 2014-04-08 20:33:07 +02:00
Emanuel Schütze
3d7ecab8e4 Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2 
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/assignment/views.py
	openslides/core/static/img/circle.png
	openslides/motion/pdf.py
	openslides/utils/pdf.py
 2014-04-07 22:35:52 +02:00
Emanuel Schütze
8a1837de30 Added new package "backports.ssl_match_hostname" for portable build script. 2014-03-31 23:52:33 +02:00
Emanuel Schütze
b5fb83c026 Fixed #551: Used unicode font for circle in ballot pdf. Removed pillow. 
That fixed also #1140 (Server error when trying to view ballot paper pdf)
 2014-03-29 13:20:31 +01:00
Oskar Hahn
a6fa8457cc Merge remote-tracking branch 'openslides/stable/1.5.x' 
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/motion/templates/motion/motion_list.html
	openslides/projector/templates/projector.html
	requirements_production.txt
 2014-03-12 19:29:22 +01:00
Emanuel Schuetze
aa2ed9bbad Fixed #1177 and #1209: Added new requirments for portable: setuptools (pkg_resources) and jsonfield. 2014-01-29 09:17:17 +01:00
Emanuel Schuetze
13eb0ccb30 Fixed #1190: Wrong sorting of motion identifier 
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
 2014-01-21 23:14:39 +01:00
Dominik Breu
a3bf29acf2 remove the last occurence of gnu gpl license header fix #1130 2013-12-01 22:52:08 +01:00
Emanuel Schuetze
d67c562b7a Added wxpython license file. (Fixed #1109) 2013-11-22 20:48:28 +01:00
Emanuel Schuetze
1fb0a21d0b Some more template fixes: 
- Fixed #992 (Use correct countdown format)
- Fixed #909 (Backend und projector template style)
  * Search bar with same border-radius like login button.
  * Projector: Fixed overlay message style. Allow HTML code (use template filter 'safe').
  * Dashboard: Tooltips, Buttons and Widget fixes.
- Fixed template does not exists error if custom slide is activated.
- Countdown: Add css to show negative countdown in red.
- Add missing translation strings to English po file (for transifex).
 2013-11-10 20:50:30 +01:00
Dominik Breu
4672d98d76 add missing license html6lib-python 2013-11-10 19:54:20 +01:00
Andy Kittner
f7d2e8aaad Add correct wxpython version to PACKAGES.txt (fixes #821) 2013-11-09 00:03:21 +01:00
Dominik Breu
ce78d1aa7f fix issue #933 and Windows like line ends (CRLF) 2013-11-06 22:51:53 +01:00
Oskar Hahn
0752d476e4 Change to MIT Licence 
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
 2013-11-04 14:57:30 +01:00
Oskar Hahn
47c60078b3 Use sockjs instead of only websocket 2013-10-27 20:50:10 +01:00
Emanuel Schuetze
571e3d9efc Fixed portable build error for pillow package. Updated create_portable.txt. 2013-10-24 08:51:12 +02:00
Emanuel Schuetze
f1a8993452 Used reportlabs qrcode widget (instead of extra qrcode package). 2013-10-21 21:27:07 +02:00
Norman Jäckel
f74cce96cb Melt INSTALL.txt, THANKS and README.txt to new README.rst. Change metadate for portable version. 2013-10-21 19:46:52 +02:00
Emanuel Schuetze
e277b8babf Full text search with haystack and whoosh. 
Updated THANKS file.
Portable: Added haystack and whoosh.
 2013-10-16 08:58:35 +02:00
Andy Kittner
2b4602068b Update version resource with pywin32 when no compiler is available 2013-07-04 23:29:44 +02:00
Andy Kittner
5ba09ddb93 Implement #791: dynamically load python27.dll from DLLs/ directory 2013-06-29 14:31:11 +02:00
Norman Jäckel
a0c023cf45 Use ordinal numbers in assignment and motion polls, fixes #456. Include humanize app to portable 2013-06-13 15:48:55 +02:00
Andy Kittner
56b02f8598 Update portable to use new gui frontend 
- switch portable to use gui frontend

 - add version resource and icon to portable

 - Regenerate openslides.exe
 2013-06-04 00:08:53 +02:00
Emanuel Schuetze
1d1f5fa218 Added html support for motion text. 
Use html parser 'beautifulsoup' to replace html tags which not supported by reportlab pdf.
'pip install bs4' required.

Fixed nested ol lists and unicode warning.

New requirement: beautifulsoup4

HTML support for reportlab.

Move parse html code into new function. Added missing html support in pdf for motion reason.

Added version number for bleach and beautifulsoup4. Moved to core requirements block.

Added bs4, bleach and html5lib requirements to portable build script. Updated portable readme for 1.4.
 2013-04-18 13:23:40 +02:00
Emanuel Schuetze
71437eaaf7 Updated win32 portable build script. 
prepare_portable.py:
 Added new site-packages tornado and qrcode.
 Fix incorrect exclude patterns. (by Andy)
 Do not exclude unittest from bundled modules for portable (by Andy)
Updated license files for win32.
requirements.txt: Updated all required packages and current version numbers.
MANIFEST.in: updated file structure
 2013-04-12 00:04:32 +02:00
Emanuel Schuetze
29b37dad74 Fixed file name and path to renamed groups_de.json file. 2012-11-27 22:31:41 +01:00
Andy Kittner
220abe45c3 Copy _ctypes.pyd 
We need ctypes to determine the local app data directory (used for
settings.py when portable dir is not writable)
 2012-11-24 15:01:54 +01:00
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
Emanuel Schuetze
945081f7a6 Some minor changes and restructure work on howto create probable document. 2012-11-09 09:25:14 +01:00
Andy Kittner
ce87353cd4 Update instructions for building the portable 2012-08-27 21:54:12 +02:00
Andy Kittner
7f6f7a9340 Rebuild openslides.exe 2012-08-27 21:49:05 +02:00
Andy Kittner
cc20ec3456 Add special handling to determine default settings for portable version 
The portable version will prefer to create it's settings in it's own
directory and only fallback to a user-specific path
($LOCAL_APPDATA/openslides) if this directory is not writable
 2012-08-27 21:48:46 +02:00
Andy Kittner
14ba868df4 Treat openslides the same way as other packages 
OpenSlides will now be copied from (and to) site-packages in the same
way as it's dependencies
 2012-08-27 20:24:41 +02:00
Norman Jäckel
bdbe49efc6 Update INSTALL and create_portable.txt (#209) 2012-06-23 11:18:55 +02:00
Andy Kittner
5f70c9a42c Copy initial_data.json to win32 redistributable 2012-05-21 22:06:29 +02:00
Andy Kittner
9d81a0b871 Use README.txt for source distribution as well as for win32-portable 2012-04-27 23:29:39 +02:00
Emanuel Schuetze
df8b3a98b7 #117: Updated win32 readme and howto files. 2012-04-27 22:33:40 +02:00
Emanuel Schuetze
f80fcb0b92 Add missing license header. 2012-04-25 22:36:09 +02:00
Andy Kittner
c8ceb7ab3d Small improvements to portable build script (fixes #157) 
- Make notice that prebuild openslides.exe is used instead of
   compiling it from source a bit friendlier so it isn't confused
   with an error

 - Reduce span of try/except to avoid masking errors when we only
   want to gracefully handle the case that no compiler is present

 - Show "success" message after creating the portable zip
 2012-04-25 20:24:48 +02:00