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

39767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
25e08bc8a0
Allow 2048 and 4096 bit SFTP keys 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-06-29 09:32:24 +02:00
Nextcloud bot
928b6a376e
[tx-robot] updated from transifex 2017-06-29 00:08:26 +00:00
Andreas Jacobsen
b55c7032ad Added space between avatar and settings 
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
 2017-06-28 18:26:50 +02:00
Andreas Jacobsen
b4e05e8c58 Fixed typos 2017-06-28 14:27:08 +02:00
Andreas Jacobsen
5c43f71d62 Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/server into clean-settings-layout 2017-06-28 13:15:31 +02:00
Andreas Jacobsen
fe84dc73a8 Cleaned up personal settings page 
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
 2017-06-28 13:13:11 +02:00
Nextcloud bot
045d04332e
[tx-robot] updated from transifex 2017-06-28 00:08:18 +00:00
Andreas Jacobsen
88ac51d522 Cleaned up personal settings page 2017-06-27 20:21:54 +02:00
Jos Poortvliet
43301fddaf Update admin.php 
add a note on our staged roll-out.
 2017-06-27 17:00:06 +02:00
Arthur Schiwon
005ef115fb
move admin templates to the right place 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-27 12:25:37 +02:00
Arthur Schiwon
793de6a8d0
move encryption to security (and behind two factor things) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-27 12:21:18 +02:00
Nextcloud bot
3b80b72c04
[tx-robot] updated from transifex 2017-06-27 00:08:17 +00:00
Arthur Schiwon
6b5bbe1880
try to lower the timeout in an acceptance test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-26 14:42:07 +02:00
Arthur Schiwon
da53162656
We're on 13 now… 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-26 11:03:41 +02:00
Arthur Schiwon
cfa5eea902
fix typos and unnecessary white spaces 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-26 10:30:42 +02:00
Nextcloud bot
6e52c8a794
[tx-robot] updated from transifex 2017-06-26 00:08:31 +00:00
Nextcloud bot
665ded38aa
[tx-robot] updated from transifex 2017-06-25 00:08:18 +00:00
Michael Letzgus
c77fe1ab86 Optimize performance / Load CSS and JS in parallel on firefox 
Move the inline <script> after the external <script> because the internal JS between CSS <link> and external JS makes firefox loading CSS and JS not in parallel.
The internal js is now parsed last but will still be executed first since everything else is deferred js.

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-06-24 11:35:40 +02:00
Nextcloud bot
4526b8d6a3
[tx-robot] updated from transifex 2017-06-24 00:08:29 +00:00
Morris Jobke
b4fa812a3d Improve logging of trash bin inconsistencies 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-23 16:09:00 -05:00
Morris Jobke
944e560155 Merge pull request #5517 from nextcloud/enhanced-failure-logging 
Enhance the logging if the part file can not be renamed
 2017-06-23 16:06:03 -05:00
Morris Jobke
86efe9569a Merge pull request #5518 from nextcloud/deprecate-old-log 
Deprecate static writeLog() method
 2017-06-23 16:03:13 -05:00
Arthur Schiwon
b6b19346b4
forgotten test adjustments 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 22:19:18 +02:00
Morris Jobke
d6adc0eba1 Deprecate static writeLog() method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-23 11:21:46 -05:00
Arthur Schiwon
8750d5b802
take out additional (legacy) settings section from tests 
because it is dependent whether anything else registers into it and
\OC_App is static

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 14:34:55 +02:00
Arthur Schiwon
39ca06e6b9
fix setting up encryption section 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:38:33 +02:00
Arthur Schiwon
c5df6db631
move twofactor_* into security 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:18:08 +02:00
Arthur Schiwon
d881a3c37b
adapt to force language changes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:15:08 +02:00
Arthur Schiwon
a596251d6b
avoid marking two sections as active when they have the same name 
… in both personal and admin.
 2017-06-23 12:38:06 +02:00
Arthur Schiwon
b7ce492c59
adapt encryption 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
f6ecc46cfa
adapt twofactore_backupcodes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
7817811d13
do not offer additional settings when there is no content 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
1ace1657b6
adapt federatedfilesharing 
also drops IE8 switch

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
9c85f55202
remove obsolete file 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
26ca563545
Fix and extend acceptance tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
8a8e78d439
already declared in Trait 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
2b128ca576
update autoloader 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
ab814e7786
drone wasn't satisfied yet 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:43 +02:00
Arthur Schiwon
1cdb49d6db
adjust another test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
0762d3dd3e
…and adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
07cf046216
take over changes from #5166 and follow #5267 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
d7a2290ce1
take over changes from #5084 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Robin Appelman
0dcce5a835
move personal external storage settings to it's own section 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-23 12:37:42 +02:00
Robin Appelman
6e314ddabe
fix getting sections 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-23 12:37:42 +02:00
Robin Appelman
e8f5c21db9
Fix trait usage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
28fd18de43
add missing pieces to Settings Manager and fix and extend its unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:41 +02:00
Arthur Schiwon
f873182965
remove obsolete files 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:41 +02:00
Arthur Schiwon
3dca4de8b3
add Additional (+ Fallback) section for Personal settings 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
7f48b6f14f
Adopt DB and Manager to personal settings structure 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
d56e86cfde
sync clients have their own place 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00