wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32739 commits 157 branches 562 tags 714 MiB
Commit graph

3063 commits

Author SHA1 Message Date
Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Lukas Reschke
edf62eb41a
Add user ID to log entries in admin page 2016-06-10 15:38:21 +02:00
Joas Schilling
372213b052 Add developer documentation, website and bug to the applist (#25041) 2016-06-10 15:15:27 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09 
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
 2016-06-09 18:45:12 +02:00
blizzz
51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Jörn Friedrich Dreyer
75870c943c
decrease initial users to load to 50 
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
 2016-06-09 14:00:00 +02:00
Vincent Petry
90c1ec1c49 Merge pull request #25014 from owncloud/admin-datadircheck-fix 
Use temporary htaccesstest.txt for data dir security check
 2016-06-09 11:58:28 +02:00
Jenkins for ownCloud
355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Jan-Christoph Borchardt
81145ee57c THIS IS NEXTCLOUD! adjusting the design 2016-06-08 17:02:18 +02:00
Vincent Petry
fb087a0261
Use temporary htaccesstest.txt for data dir security check 2016-06-07 18:36:13 +02:00
Jörn Friedrich Dreyer
2989584b45 decrease initial users to load to 50 
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
 2016-06-07 11:40:04 +02:00
Jenkins for ownCloud
fb5fb6a9b5 [tx-robot] updated from transifex 2016-06-06 06:51:58 -04:00
Jenkins for ownCloud
c0a91ddca7 [tx-robot] updated from transifex 2016-06-05 02:00:36 -04:00
Jenkins for ownCloud
4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Vincent Petry
2d5bee0661 Merge pull request #24954 from owncloud/issue-24536-language-name-reused-for-fallback-languages 
Do not use the language name, when it's not the one from the language…
 2016-06-03 10:50:59 +02:00
Jenkins for ownCloud
f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Joas Schilling
1b5797a4e5
Do not use the language name, when it's not the one from the language we want 2016-06-01 17:07:51 +02:00
Vincent Petry
7b4459d28d Merge pull request #24912 from owncloud/session-tokens-apache-auth 
Create session tokens for apache auth users
 2016-06-01 10:56:10 +02:00
Jenkins for ownCloud
a9f666f36e [tx-robot] updated from transifex 2016-06-01 01:56:03 -04:00
Christoph Wurst
c58d8159d7
Create session tokens for apache auth users 2016-05-31 17:07:49 +02:00
MTRichards
397da7620e Update personal.php (#24923) 2016-05-31 15:58:02 +02:00
Vincent Petry
ba6226259d Merge pull request #24889 from owncloud/add-warning-wrong-transaction-isolation-level 
Add a warning when the transaction isolation level is not READ_COMMITED
 2016-05-31 10:13:23 +02:00
Jenkins for ownCloud
b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00
Joas Schilling
4da5a74192
Add a warning when the transaction isolation level is not READ_COMMITED 2016-05-30 12:31:33 +02:00
Jenkins for ownCloud
c870e77546 [tx-robot] updated from transifex 2016-05-29 01:55:25 -04:00
Jenkins for ownCloud
c778fa062c [tx-robot] updated from transifex 2016-05-28 01:55:21 -04:00
Jenkins for ownCloud
a95275d27b [tx-robot] updated from transifex 2016-05-27 01:55:35 -04:00
Lukas Reschke
aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud
567381e361 [tx-robot] updated from transifex 2016-05-26 01:56:23 -04:00
Joas Schilling
cbba55a26c
Move Group_LDAP and Group_Proxy to PSR-4 2016-05-25 16:04:56 +02:00
Jenkins for ownCloud
6972f4dc50 [tx-robot] updated from transifex 2016-05-25 02:03:38 -04:00
Jenkins for ownCloud
f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Vincent Petry
d3fb5d618e Merge pull request #24748 from owncloud/login-explicitly 
Log in explicitly, save login name when generating browser/device tokens
 2016-05-24 17:51:49 +02:00
Vincent Petry
ecb2bbf730 Merge pull request #24809 from owncloud/remove-console-log 
remove debug console.log
 2016-05-24 13:58:03 +02:00
Christoph Wurst
1671d8e337
remove debug console.log 2016-05-24 13:40:01 +02:00
Vincent Petry
fdddc11f63 Merge pull request #22929 from owncloud/bugfix-removequota-subadmins 
Bugfix removequota subadmins
 2016-05-24 12:13:57 +02:00
Christoph Wurst
ad10485cec
when generating browser/device token, save the login name for later password checks 2016-05-24 11:49:15 +02:00
Christoph Wurst
74277c25be
add button to invalidate browser sessions/device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst
6495534bcd
add button to add new device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst
12431aa399
list user's auth tokens on the personal settings page 2016-05-23 09:11:12 +02:00
Jenkins for ownCloud
357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Vincent Petry
6934840083 Merge pull request #24307 from owncloud/systemtags-perminterface 
Add interface methods for permission check for system tags
 2016-05-21 19:06:54 +02:00
Jenkins for ownCloud
bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Vincent Petry
79f6b7b7ff
Make it possible to exclude admin groups from groups select2 2016-05-20 17:56:02 +02:00
Vincent Petry
37ef9dfd65
Fix default quota field from reviews 2016-05-20 16:28:30 +02:00
Jenkins for ownCloud
67162e636e [tx-robot] updated from transifex 2016-05-20 01:54:52 -04:00
Vincent Petry
819b725022 Merge pull request #24634 from owncloud/sharesettings-sort 
fix admin link share settings sorting, use same order as in sidebar
 2016-05-17 10:12:19 +02:00