Commit Graph

6719 Commits

Author SHA1 Message Date
Sebastian Sdorra
c5c66ef4ea Close branch bugfix/encoding_i18n_servlet 2019-02-01 09:55:03 +00:00
Sebastian Sdorra
c249d603d7 remove unused shiro rule and fixed some deprecated method calls 2019-02-01 09:44:25 +01:00
Sebastian Sdorra
0a29f41835 verify encoding and content type 2019-02-01 09:42:19 +01:00
Mohamed Karray
34542e5cf1 fix i18n encoding 2019-02-01 08:51:07 +01:00
Sebastian Sdorra
c1e6ac98a8 Merged in bugfix/forbid_empty_groups_users_at_global_permission (pull request #167)
disable add admin group/user button when entry is empty
2019-02-01 07:30:31 +00:00
Sebastian Sdorra
82aff17337 Close branch bugfix/forbid_empty_groups_users_at_global_permission 2019-02-01 07:30:31 +00:00
Iwan Schindler
6ff8e410f2 de/en language modifications 2019-01-31 14:22:15 +01:00
René Pfeuffer
ed57450dc3 Add unit test 2019-01-31 12:00:40 +01:00
René Pfeuffer
bd91036f72 Add unit test 2019-01-31 11:56:27 +01:00
Iwan Schindler
ddf89e4555 Fixed spelling, typos in de/en language files 2019-01-31 11:42:02 +01:00
René Pfeuffer
225fb0a705 Validate groups and users in backend, too 2019-01-31 11:39:16 +01:00
Maren Süwer
03fd0d6f88 Merged in bugfix/user_editing (pull request #166)
Bugfix/user editing
2019-01-31 09:41:55 +00:00
Maren Süwer
e7a96cfe8f Close branch bugfix/user_editing 2019-01-31 09:41:55 +00:00
René Pfeuffer
77a1b9b55d Merge with 2.0.0-m3 2019-01-31 10:41:07 +01:00
Maren Süwer
8dc2204b3f renaming 2019-01-31 10:37:48 +01:00
René Pfeuffer
f6ae41069d Merge with 2.0.0-m3 2019-01-31 09:42:16 +01:00
Daniel Huchthausen
5ae0cffda0 add translation for commons.json 2019-01-30 20:26:31 +01:00
Daniel Huchthausen
989a5c1afb add translation for config.json 2019-01-30 20:11:26 +01:00
Daniel Huchthausen
83477e4dbf fixes typo 2019-01-30 19:28:21 +01:00
Daniel Huchthausen
4c4bfaeb9c add translation for groups.json 2019-01-30 19:25:27 +01:00
Daniel Huchthausen
94b4b57bae add translation for users.json 2019-01-30 19:16:33 +01:00
Daniel Huchthausen
6209465b91 change Nutzer into Benutzer 2019-01-30 19:04:57 +01:00
Daniel Huchthausen
73ae771aa8 add translation for permissions.json 2019-01-30 19:02:48 +01:00
Daniel Huchthausen
8c487e6fa2 add translation for repos.json 2019-01-30 18:59:48 +01:00
Maren Süwer
784c160679 Merged in feature/btn_spacing (pull request #168)
Feature/btn spacing
2019-01-30 15:26:46 +00:00
Maren Süwer
b1e839d236 Close branch feature/btn_spacing 2019-01-30 15:26:46 +00:00
Maren Süwer
e878fac686 remove color props 2019-01-30 15:58:55 +01:00
Maren Süwer
946fcf818c Merged in feature/general_color (pull request #165)
Feature/general color
2019-01-30 11:14:04 +00:00
Maren Süwer
6d598eafa9 Close branch feature/general_color 2019-01-30 11:14:04 +00:00
Sebastian Sdorra
4f72f1d304 remove unused repositories to speedup build 2019-01-30 10:32:29 +01:00
Sebastian Sdorra
297ecc46db Merged in broDom/scm-manager/dep-updates-2.x (pull request #37) 2019-01-29 17:54:46 +01:00
Sebastian Sdorra
eba07dc006 merge repository heads 2019-01-29 16:01:36 +01:00
Florian Scholdei
554b24a199 prettier 2019-01-29 14:55:10 +01:00
Florian Scholdei
c331aa55e3 used new Component 2019-01-29 14:02:36 +01:00
Sebastian Sdorra
d820605186 fixed integration of mercurial config changes of 1.x 2019-01-29 14:00:11 +01:00
Sebastian Sdorra
588e248863 fixed UnitTests for AbstractManager after merge with 1.x 2019-01-29 13:46:03 +01:00
Sebastian Sdorra
428734e0c7 port GitNonFastForwardITCase from scm-webapp to scm-it 2019-01-29 13:36:13 +01:00
Sebastian Sdorra
ac83dd93c8 fix execution of integration tests, by updating jetty to 9.4.14.v20181114 2019-01-29 13:35:11 +01:00
Philipp Czora
75c369f022 Merged in feature/repository_permissions (pull request #158)
Feature repository permissions
2019-01-29 12:30:36 +00:00
Philipp Czora
0ceabe454b Close branch feature/repository_permissions 2019-01-29 12:30:36 +00:00
Philipp Czora
65a3899043 Merged 2.0.0-m3 2019-01-29 13:05:23 +01:00
Philipp Czora
38172fb8a1 Fixed test 2019-01-29 11:12:49 +01:00
Florian Scholdei
6420e20cfe added ButtonGroup component 2019-01-29 11:06:11 +01:00
Philipp Czora
92df3201ee Minor cleanup 2019-01-29 10:47:54 +01:00
Sebastian Sdorra
c42028433f map nonFastForwardDisallowed field from GitConfig and added ui 2019-01-29 10:26:11 +01:00
Philipp Czora
5eb4d321a9 Fixed equals() and hashCode() of RepositoryRole 2019-01-29 10:25:12 +01:00
Sebastian Sdorra
b231499cd0 merge with branch 1.x 2019-01-29 09:42:03 +01:00
Philipp Czora
ec4fd48e1e Minor cleanup / typo fixes 2019-01-29 09:34:27 +01:00
Philipp Czora
9c31125cde Fixed type import 2019-01-28 16:54:38 +01:00
Philipp Czora
d997fc09b3 Fixed minor flow issues 2019-01-28 16:48:57 +01:00