02fe1817cb
Merge pull request #3927 from MaximilianKrambach/tags
...
Tags
2018-10-24 11:50:24 +02:00
126a16b553
Implement tags
2018-10-24 11:23:34 +02:00
e3cf8102de
Merge pull request #3911 from jsaalfeld/motions_in_categories
...
Motions in categories
2018-10-23 14:20:29 +02:00
2a06075315
Repair Categories, DataSend and Motion Detail
...
update to angular 7
2018-10-23 13:44:47 +02:00
a7b01fc09c
implementing sorting in categories ( fixes #3903 )
2018-10-23 13:19:43 +02:00
454488028f
Merge pull request #3909 from tsiegleauq/shared-detail-bar
...
Shared detail bar
2018-10-23 12:31:02 +02:00
4d26316e1e
Enhance os-head-bar
...
Headbar now works with multi slot transclusion
Supports more cases and detail bar
Also adds some UI UX improvements
2018-10-23 11:47:18 +02:00
794b978627
Merge pull request #3907 from CatoTH/OpenSlides-3-ChangeRecommendations
...
Line Numbering / Change Recommendations
2018-10-23 09:45:30 +02:00
46ad38a98a
Change recommendations
2018-10-22 18:45:08 +02:00
db25ac6bf4
Diff & Line numbering services
2018-10-22 18:44:58 +02:00
645ae4a784
Merge pull request #3939 from ostcar/update_requirements
...
update requirements
2018-10-20 23:16:12 +02:00
570d32dd6b
update requirements
2018-10-19 22:56:00 +02:00
214a310069
Merge pull request #3919 from FinnStutzenstein/statute
...
statute paragraphs list view
2018-10-19 07:50:04 +02:00
64f6f35e31
statute paragraphs list view
2018-10-19 07:41:15 +02:00
236dc21d62
Merge pull request #3926 from ostcar/new_autoupdate_format
...
New autoupdate format
2018-10-19 07:40:42 +02:00
5b5d0e395a
new autoupdate format
2018-10-19 07:35:59 +02:00
1ba3af968d
Merge pull request #3925 from ostcar/cache_improvements
...
Improve redis cache
2018-10-16 22:06:06 +02:00
313df50575
Merge pull request #3916 from MaximilianKrambach/os3/fonts
...
Switch heading fonts to roboto-condensed
2018-10-16 14:47:10 +02:00
2dcf8e8de5
Switch heading fonts to roboto-condensed
2018-10-16 10:58:36 +02:00
bc442210fb
Improve redis cache
...
* delete only keys with prefix
* Make redis_provider atomic with transactions and lua scripts
* improve lock
* generate change_id in redis to make sure it is uniq
* use miliseconds as starttime
* add argument use max_change_id to get_{full|resticted}_data
2018-10-15 23:37:26 +02:00
becdef26a8
Merge pull request #3923 from ostcar/new-master
...
Merge OpenSlides-3 branch into the master branch
2018-10-13 07:46:31 +02:00
b1fa3ca263
Merge remote-tracking branch 'upstream/OpenSlides-3' into new-master
2018-10-13 07:38:09 +02:00
1b3a287642
Merge pull request #3917 from MaximilianKrambach/os3/material-icons
...
Adding material icons
2018-10-12 15:20:21 +02:00
2cc9188962
Add Material Icon library
...
replace font-awesome icons with material icons
2018-10-12 15:13:57 +02:00
54ee775c64
Merge pull request #3920 from tsiegleauq/statute-hotfix
...
Hotfix for MotionStatute
2018-10-12 13:20:28 +02:00
faef3ac97e
Hotfix for MotionStatute
2018-10-12 13:11:05 +02:00
64e9cb9e29
Merge pull request #3910 from FinnStutzenstein/superadmin
...
Superadmin group
2018-10-12 09:16:33 +02:00
1e4eacecfd
New superadmin group
2018-10-12 07:58:18 +02:00
8cd55352c6
Merge pull request #3894 from FinnStutzenstein/newMotionFeatures
...
New motion features
2018-10-12 07:34:43 +02:00
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
db29d1cab1
Merge pull request #3915 from MaximilianKrambach/os3/fonts
...
os3: Change default font to Roboto
2018-10-11 15:07:34 +02:00
831b0a42ae
add roboto/roboto-condensed font, set as used font (wip)
2018-10-11 14:37:20 +02:00
24abdc7bd0
Merge pull request #3905 from FinnStutzenstein/commentfields
...
Motion comment section list
2018-10-09 14:03:30 +02:00
b1ea59ea28
Motion comment section list
2018-10-09 13:57:55 +02:00
d1bc995830
Merge pull request #3908 from tsiegleauq/ul-groups
...
Add group matrix.
2018-10-09 13:41:33 +02:00
33922f1abf
Add group matrix.
...
Create, Read, Update, Delete works
2018-10-09 13:36:30 +02:00
81aa763ae9
Merge pull request #3895 from MaximilianKrambach/os3/settings
...
implement settings
2018-10-09 13:13:33 +02:00
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
8a04951940
Merge pull request #3865 from FinnStutzenstein/OpenSlides-3-tests
...
OpenSlides 3 tests
2018-10-08 14:16:55 +02:00
9f291308aa
Initial tests for OpenSlides3. Parallel execution of server and client
...
tests.
2018-10-08 14:10:18 +02:00
5d4faa288b
Merge pull request #3897 from jsaalfeld/angular7
...
Updating Angular to the new 7 RC
2018-10-01 17:26:48 +02:00
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
19d78a3361
Merge pull request #3890 from FinnStutzenstein/plugins3
...
App initialization
2018-09-28 15:55:37 +02:00
9e0872878a
Merge pull request #3901 from tsiegleauq/motion_control+fix
...
Add motion controls + small fixes
2018-09-28 15:51:22 +02:00
0c05eb38e2
Add motion controls + small fixes
2018-09-28 15:18:20 +02:00
2b5df310af
Merge pull request #3892 from ostcar/update-dev-tools
...
update the dev tools
2018-09-28 15:13:04 +02:00
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
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
adb7556be0
User create update and details view
2018-09-28 12:29:33 +02:00
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
Sean