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

2922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
e24ae3fd2a Merge pull request #1552 from ostcar/projector_client 
Projector client
 2015-06-18 23:29:14 +02:00
Oskar Hahn
a4c00d5ee3 Angular Client 
* Split angular app into a site- and a projector app
* Created client slide api and slides for customslide and user
* JS-function to activate a slide
 2015-06-18 23:23:34 +02:00
Oskar Hahn
a5d9f0bb42 Merge pull request #1554 from normanjaeckel/UserResetPassword 
Added view to reset user's password.
 2015-06-18 23:16:45 +02:00
Oskar Hahn
a8eb54655f Merge pull request #1553 from normanjaeckel/VersionView 
Added version view via REST API.
 2015-06-18 23:15:12 +02:00
Norman Jäckel
466fab8752 Added view to reset user's password. 2015-06-18 22:45:23 +02:00
Norman Jäckel
211e39be2c Added version view via REST API. 2015-06-18 21:48:20 +02:00
Norman Jäckel
c5fbe2e9ee Refactored config API. 
Removed form_field attributes.
Added extra fields for HTML rendering like label and help text.
Added fields for sorting and grouping. Removed old collection system.
Added config groups to config view via OPTIONS requests.
Regrouped all variables.
Added validation. Changed internal handling.
 2015-06-18 21:13:30 +02:00
Norman Jäckel
4506d787ee Merge pull request #1550 from ostcar/remove_old_static 
Removed old static files
 2015-06-18 19:01:05 +02:00
Oskar Hahn
dc675e173b Removed old static files 2015-06-18 18:24:54 +02:00
Norman Jäckel
2eed3dea4b Merge pull request #1545 from normanjaeckel/Config 
Renamed config variables. Fixed error in settings.
 2015-06-17 13:14:28 +02:00
Norman Jäckel
632ca2bd9a Renamed config variables. Fixed error in settings. 2015-06-17 12:07:09 +02:00
Oskar Hahn
b703655153 Merge pull request #1522 from emanuelschuetze/agenda-import 
Added two agenda import ways.
 2015-06-16 20:33:23 +02:00
Emanuel Schuetze
b7abf770c7 Added two agenda import ways. 
Note: CSV example file was updated because English csv header strings are
required now.
 2015-06-16 20:29:09 +02:00
Oskar Hahn
8544bc329f Merge pull request #1544 from normanjaeckel/Changelog 
Updated CHANGELOG.
 2015-06-16 20:28:03 +02:00
Norman Jäckel
d08d58518f Updated CHANGELOG. 2015-06-16 17:41:19 +02:00
Norman Jäckel
51455e8563 Merge pull request #1539 from ostcar/delete_old_stuff 
Delete old stuff.
 2015-06-16 17:32:38 +02:00
Oskar Hahn
fbf7d0e43d Remove old thinks not needed for the 2.0 release: 
* django templates
* widgets
* views
* mppt
* main_menu
* projector 1.x api

Sorted all imports
Add a ending slash to each url with a redirect view
 2015-06-16 17:07:39 +02:00
Norman Jäckel
95683949ec Merge pull request #1536 from emanuelschuetze/portable-fixes 
Fixed FileFinder importer for plugin detection in portable.
 2015-06-16 17:00:30 +02:00
Oskar Hahn
1ccd2ab91c Merge pull request #1529 from normanjaeckel/RESTConfig 
Added config update view.
 2015-06-16 16:18:33 +02:00
Norman Jäckel
3e2aa6c081 Update 2015-06-16 14:04:38 +02:00
Emanuel Schuetze
ea908419be Fixed FileFinder importer for plugin detection in portable. 
Updated setuptools version for openslides-gui.
 2015-06-16 10:38:54 +02:00
Oskar Hahn
237b0630ca Merge pull request #1535 from normanjaeckel/RESTProjectorPermissions 
Added permission check for objects required for active projector elem…
 2015-06-16 10:35:42 +02:00
Norman Jäckel
6f02d769cc Added config update view. 2015-06-15 18:24:23 +02:00
Norman Jäckel
5813b8341c Added permission check for objects required for active projector elements. 2015-06-15 18:22:15 +02:00
Oskar Hahn
a604f36634 Merge pull request #1537 from normanjaeckel/RESTPoll 
Added create, updated and destroy view for assignment polls.
 2015-06-15 16:34:11 +02:00
Oskar Hahn
208dddc7aa Merge pull request #1519 from ostcar/rest-anonymous-user 
Fix anonymous user for rest requests
 2015-06-15 16:03:08 +02:00
Oskar Hahn
cb1b262c92 Fix anonymous user for rest requests 2015-06-15 15:54:39 +02:00
Norman Jäckel
ccaa1eaf27 Added create, updated and destroy view for assignment polls. 2015-06-14 23:26:06 +02:00
Norman Jäckel
a033f74ba1 Merge pull request #1527 from ostcar/start_browser_on_localhost 
Start the browser on 127.0.0.1.
 2015-06-12 13:01:00 +02:00
Oskar Hahn
e836bccb72 Start the browser on 127.0.0.1 
Fixed #1525
 2015-06-11 11:37:01 +02:00
Norman Jäckel
5de7365c9a Merge pull request #1526 from normanjaeckel/AgendaSpeakerREST 
Added view to add and remove users from the list of speakers.
 2015-05-29 13:08:10 +02:00
Norman Jäckel
80588610f0 Merge pull request #1506 from normanjaeckel/DjangoRESTFrameworkProjector 
Added REST API for projector. Introduced new projector API.
 2015-05-29 12:50:39 +02:00
Norman Jäckel
dc7d27a985 Added REST API for projector. Introduced new projector API. 
Added custom slide projector element class.
Added welcome slide as custom slide.
Added user slide projector element class.
Added clock, countdown ans message projector elements.
Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API).
Added migrations to core app.
Fixed and wrote tests.
Updated CHANGELOG.
 2015-05-29 12:44:25 +02:00
Norman Jäckel
0853701cdd Added view to begin and end speach. 2015-05-27 15:42:32 +02:00
Norman Jäckel
95be18b78e Added view to add and remove users from the list of speakers. 2015-05-26 18:42:39 +02:00
Oskar Hahn
9c51313a82 Merge pull request #1517 from normanjaeckel/MotionRESTAPIChanges 
Added motion views.
 2015-05-18 07:26:00 +02:00
Norman Jäckel
b30afbd635 Added several motion REST API views. 
Added motion creation view, motion update view, version permit and delete view, view to support motions, view to set and reset state. Refactored motion submitters and supporters.
 2015-05-13 12:22:50 +02:00
Norman Jäckel
d816e0c045 Merge pull request #1513 from emanuelschuetze/angular-templates 
New angular templates (part 1)
 2015-05-12 14:12:10 +02:00
Emanuel Schuetze
8d638a908d Added new angularjs templates 
for agenda, motions, assignments, users and mediafiles apps.

Users app:
- Show permissions in group form (Fixed #1500)
- Added experimental csv import for users.

Agenda:
- new agenda sort view.
- Added experimental angular-xeditable for item-list view.

General:
- Added core.tag templates.
- Added mediafiles templates.
- Remove old template and js files. Remove old views.
- Skip old tests.

Added external angular modules:
- angular-loading-bar (Fixed #1448)
- ui-tree (for sorting agenda tree)
- ng-fab-forms (for better form validation)
- ui-bootstrap (for modal window, dropdown, popover)
- ngBootbox (for confirm delete dialogs in agenda and users app)
 2015-05-06 09:19:16 +02:00
Emanuel Schütze
ccbe93c10f Merge pull request #1514 from emanuelschuetze/new-logo 
New OpenSlides logo.
 2015-05-06 09:18:39 +02:00
Oskar Hahn
9f93208afd Merge pull request #1512 from normanjaeckel/AssignmentRESTAPIChanges 
Assignment REST API changes
 2015-04-19 21:26:58 +02:00
Norman Jäckel
d0dc2f8934 Set assignment phase index to zero. Added views to manage candidatures. 2015-04-19 21:20:39 +02:00
Emanuel Schuetze
e6c3e18144 New OpenSlides logo. (Thanks to Rene!) 2015-04-17 20:34:54 +02:00
Oskar Hahn
26655f3200 Merge pull request #1511 from ostcar/agenda_rest 
Send seperat tree for agenda items
 2015-04-17 17:16:36 +02:00
Oskar Hahn
505e587d6f Send tree for agenda items 2015-04-17 16:46:13 +02:00
Norman Jäckel
1bc6aef205 Merge pull request #1510 from ostcar/rename-apps 
Rename apps.
 2015-03-29 23:15:30 +02:00
Oskar Hahn
0b5f75339e Rename apps and permissions 
* Fixed agenda permissions
* Renamed assignment to assignments, fixed assignments permission names
* Renamed mediafile to mediafiles
* Renamed motion to motions. Fixed motions permission names
 2015-03-29 20:35:53 +02:00
Oskar Hahn
c66c0c738b Merge pull request #1507 from normanjaeckel/DevDir 
Changed development settings path.
 2015-03-15 11:59:37 +01:00
Norman Jäckel
9b369e1afc Changed development settings path. 
Settings and user data live now at development/var/.
Move your existing directory or create new settings and database.
 2015-03-06 16:43:13 +01:00
Norman Jäckel
146548a309 Merge pull request #1466 from ostcar/django_urls 
Use django url patterns in angular
 2015-03-03 11:27:05 +01:00