6057 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sean Engelhardt	faef3ac97e	Hotfix for MotionStatute	2018-10-12 13:11:05 +02:00
Finn Stutzenstein	64e9cb9e29	Merge pull request #3910 from FinnStutzenstein/superadmin ... Superadmin group	2018-10-12 09:16:33 +02:00
FinnStutzenstein	1e4eacecfd	New superadmin group	2018-10-12 07:58:18 +02:00
Finn Stutzenstein	8cd55352c6	Merge pull request #3894 from FinnStutzenstein/newMotionFeatures ... New motion features	2018-10-12 07:34:43 +02:00
FinnStutzenstein	f7d392f1fc	New motion features ... - Added weight and sort_parent fields to the motion model - Added motion sort view (adapted from agenda) - Added statute-paragraph model and tests for it - Added statute_paragraph foreign key to the motion model - Created migrations for sorting and statute-paragraph	2018-10-12 07:15:58 +02:00
Sean	db29d1cab1	Merge pull request #3915 from MaximilianKrambach/os3/fonts ... os3: Change default font to Roboto	2018-10-11 15:07:34 +02:00
Maximilian Krambach	831b0a42ae	add roboto/roboto-condensed font, set as used font (wip)	2018-10-11 14:37:20 +02:00
Finn Stutzenstein	24abdc7bd0	Merge pull request #3905 from FinnStutzenstein/commentfields ... Motion comment section list	2018-10-09 14:03:30 +02:00
FinnStutzenstein	b1ea59ea28	Motion comment section list	2018-10-09 13:57:55 +02:00
Finn Stutzenstein	d1bc995830	Merge pull request #3908 from tsiegleauq/ul-groups ... Add group matrix.	2018-10-09 13:41:33 +02:00
sean	33922f1abf	Add group matrix. ... Create, Read, Update, Delete works	2018-10-09 13:36:30 +02:00
Finn Stutzenstein	81aa763ae9	Merge pull request #3895 from MaximilianKrambach/os3/settings ... implement settings	2018-10-09 13:13:33 +02:00
Maximilian Krambach	5c1092b537	implement settings ... Whats still missing, but has not a high priority: - DateTimePicker. Entering dates through the popup works (but only with a hack in the config-field.component update() method). Displaying values from the server does not work. Also the localisation is missing. See attempts to fix it in the sheared module. - Errors, if the server cannot be reached. Should be solved in another PR fixing the datasendservice and make generic error messages. - Custom translations are missing	2018-10-09 13:06:44 +02:00
Finn Stutzenstein	8a04951940	Merge pull request #3865 from FinnStutzenstein/OpenSlides-3-tests ... OpenSlides 3 tests	2018-10-08 14:16:55 +02:00
Tobias Hößl	9f291308aa	Initial tests for OpenSlides3. Parallel execution of server and client ... tests.	2018-10-08 14:10:18 +02:00
Sean	5d4faa288b	Merge pull request #3897 from jsaalfeld/angular7 ... Updating Angular to the new 7 RC	2018-10-01 17:26:48 +02:00
Jochen Saalfeld	e013aeea64	Updating Angular to the new 7 beta ... This enables us to use Drag n Drop and other components, without using any plugins.	2018-10-01 09:06:40 +02:00
Finn Stutzenstein	19d78a3361	Merge pull request #3890 from FinnStutzenstein/plugins3 ... App initialization	2018-09-28 15:55:37 +02:00
Sean	9e0872878a	Merge pull request #3901 from tsiegleauq/motion_control+fix ... Add motion controls + small fixes	2018-09-28 15:51:22 +02:00
Sean Engelhardt	0c05eb38e2	Add motion controls + small fixes	2018-09-28 15:18:20 +02:00
Oskar Hahn	2b5df310af	Merge pull request #3892 from ostcar/update-dev-tools ... update the dev tools	2018-09-28 15:13:04 +02:00
FinnStutzenstein	be9f98cfd0	App initialization ... Used for internal apps as well as for plugins. The pluginpart is currently missing, in fact that the main OpenSlides part is more important. Apps can give their models and mainmenu entries. Routes are not enabled, because the routes have to be static for webpack to build the bundles. If we want to keep lazy loading, I see no possibility to encapsulate the routes from the site-routing module.	2018-09-28 15:03:04 +02:00
Sean	b6ad0d759c	Merge pull request #3891 from tsiegleauq/cu-user ... User create update and details view Some open tasks left (features are quire heavy). See recent issues	2018-09-28 12:42:30 +02:00
sean	adb7556be0	User create update and details view	2018-09-28 12:29:33 +02:00
Norman Jäckel	8bc7828e60	Merge pull request #3868 from tsiegleauq/remove_root_package-lock ... Remove package-lock from root, add it to gitignore (fixes #3858)	2018-09-24 21:11:19 +02:00
Emanuel Schütze	d4f9da9cdb	Merge pull request #3889 from FinnStutzenstein/fixImagePlugin ... Fix image plugin	2018-09-24 13:06:50 +02:00
Sean	781a2dcdf8	Merge pull request #3887 from jsaalfeld/categories ... implementing categories	2018-09-24 10:53:30 +02:00
Jochen Saalfeld	d785d77207	restructuring patching of values to ensure type safety ... fix disappearing submitters (hopefully) - replaced "motion from form values" function with deserialize - fix some typos - make id id again null, in contrast to undefined, will be send to the server... Better typing and changed the create/update signatures in BaseViewModel - use object as default type for BaseModel. - use partial objects for updating - Displayable should not have an id. Moved this into own interface Identifiable and make the id in the BaseViewMotion abstract. - create only takes a BaseModel. A ViewModel should not exists so far. - Updated the update and create method for motions.	2018-09-24 10:45:53 +02:00
Oskar Hahn	07a8a5c3cb	update the dev tools	2018-09-23 18:07:49 +02:00
Oskar Hahn	b6968fdfd5	Merge pull request #3843 from ostcar/ensuce_cache ... ensures test on startup	2018-09-23 17:12:04 +02:00
Oskar Hahn	9af6bf1606	ensures test on startup	2018-09-23 16:57:49 +02:00
FinnStutzenstein	eebd7a1fce	Fix image plugin	2018-09-20 13:06:02 +02:00
Jochen Saalfeld	48526d6c19	implementing categories	2018-09-20 11:22:24 +02:00
Emanuel Schütze	d2c4aff7a4	Merge pull request #3888 from emanuelschuetze/release2.3 ... Release 2.3	2018-09-20 09:33:18 +02:00
Emanuel Schütze	dca94333e8	Update version to 2.3.1-dev	2018-09-20 09:27:03 +02:00
Emanuel Schütze	772c032357	Release 2.3	2018-09-20 09:24:34 +02:00
Emanuel Schütze	7b9d84dabd	Merge pull request #3886 from FinnStutzenstein/export-filename ... Fixed filenames in motion export dialog	2018-09-18 19:37:02 +02:00
FinnStutzenstein	2815d5f62c	Fixed filenames in motion export dialog	2018-09-18 15:03:55 +02:00
Finn Stutzenstein	849da27745	Merge pull request #3877 from tsiegleauq/views ... Create more list views	2018-09-18 11:52:10 +02:00
Emanuel Schütze	3481ca58d8	Merge pull request #3885 from emanuelschuetze/translations ... Updated German translations.	2018-09-18 11:23:17 +02:00
Emanuel Schütze	7a9921a85f	Updated German translations.	2018-09-18 10:42:57 +02:00
Sean Engelhardt	80cfeaac35	Create more list views ... Also: - Update dependencies - Clean up proxy file	2018-09-18 10:21:59 +02:00
Emanuel Schütze	9432367f1b	Merge pull request #3884 from FinnStutzenstein/fixes ... Little fixes for current master (fixes #3883, fixes #3882, fixes #3880)	2018-09-18 09:57:01 +02:00
FinnStutzenstein	f17951f363	Little fixes for current master (fixes #3883, fixes #3882, fixes #3880)	2018-09-18 09:49:40 +02:00
Finn Stutzenstein	582c2603a6	Merge pull request #3860 from FinnStutzenstein/fixed-config-variables ... Moved the collection of config variables before the generation of ang…	2018-09-18 07:56:12 +02:00
FinnStutzenstein	180dedfc38	Moved the collection of config variables before the generation of angular constants	2018-09-18 07:50:33 +02:00
Emanuel Schütze	c164766fa5	Merge pull request #3879 from emanuelschuetze/readme ... Updated 'used software' links in README. Fixed formatting for pypi.	2018-09-17 10:24:17 +02:00
Emanuel Schütze	f340048d56	Updated 'used software' links in README. Fixed formatting for pypi.	2018-09-17 09:46:51 +02:00
Sean	9d59da1352	Merge pull request #3869 from FinnStutzenstein/modelInterface ... Introduce more basemodel functionality used by the agenda, generic views	2018-09-14 11:06:30 +02:00
FinnStutzenstein	1ee76de417	Handling of titles, projection and content objects in items ... Restructure the titles for motion, motion-block, assignment and topic. Less possibilities for more clear code. Added mote base models enabling functionalities of projection and being a content object for items	2018-09-14 08:36:35 +02:00