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

29493 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
26c3fa7911 Annotate type 
Otherwise static code scanners will complain about this.
 2016-01-04 14:18:01 +01:00
Björn Schießle
ebc52300e7 Merge pull request #21435 from owncloud/improved_upgrade_messages 
don't show previous log level in upgrade message
 2016-01-04 13:40:52 +01:00
Jan-Christoph Borchardt
bfee488c56 remove unneeded 'goto' prefix from settings anchors 2016-01-04 12:59:32 +01:00
Björn Schießle
58b1221ad3 don't show previous log level in upgrade message 2016-01-04 11:50:07 +01:00
Jenkins for ownCloud
157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
JohannesKleine
792839b5c1 Merge branch 'master' into patch-1 2016-01-02 21:56:45 +01:00
Jenkins for ownCloud
6ca2da7d5c [tx-robot] updated from transifex 2016-01-02 01:54:46 -05:00
Roeland Jago Douma
4c7a7c8edc [3rdparty] Bump symfony/console to 2.8.0 2016-01-01 12:52:47 +01:00
Jenkins for ownCloud
dfec9f0c8a [tx-robot] updated from transifex 2016-01-01 01:55:10 -05:00
JohannesKleine
c95d1b2625 Update config.sample.php 
I corrected the word order.
 2015-12-31 14:48:19 +01:00
Jenkins for ownCloud
970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Thomas Müller
42897ac5cb Merge pull request #21402 from owncloud/view-getuserobject-cache 
Cache usermanager instance in view
 2015-12-30 20:04:51 +01:00
Robin Appelman
45d0396404 Cache sharing disabled in the view 2015-12-30 14:42:22 +01:00
Robin Appelman
2d9d0aedf8 Cache usermanager instance in view 2015-12-30 14:28:53 +01:00
Roeland Jago Douma
6bd15856b2 Added js tests for the Sharee API usage 2015-12-30 10:46:19 +01:00
mbi
63974992f9 Merge branch 'master' into master 2015-12-30 10:34:42 +01:00
Roeland Jago Douma
49031e0744 Fix unit tests 2015-12-30 08:58:04 +01:00
Roeland Jago Douma
f99fcd5dd6 Filter out share owner in sharee suggestion list 2015-12-30 08:58:04 +01:00
Roeland Jago Douma
fa7996aa8a Web sharing uses sharee endpoint 2015-12-30 08:58:04 +01:00
Jenkins for ownCloud
45c41e2b2c [tx-robot] updated from transifex 2015-12-30 01:55:47 -05:00
Thomas Müller
9e39e8f1c7 No more deprecation messages in error log 2015-12-29 17:31:28 +01:00
Thomas Müller
f57e77fe05 Merge pull request #21149 from owncloud/quota-wording 
shorten quota usage wording, fix overflow on mobile, fix #21129
 2015-12-29 16:33:24 +01:00
Thomas Müller
9392a555ae Merge pull request #21331 from switch-ch/fix_ms_log 
Fix owncloud logging with ms precision
 2015-12-29 16:32:52 +01:00
Christoph Wurst
598883ffa0 Remove unnecessary border from login button 2015-12-29 09:32:40 +01:00
Jan-Christoph Borchardt
e4cf53031b fix overlap and functionality of cropper 2015-12-28 19:23:40 +01:00
Jan-Christoph Borchardt
640adde3b9 improve layout of personal settings page 2015-12-28 18:50:50 +01:00
Jan-Christoph Borchardt
6e60b6ee7c shorten quota usage wording, fix overflow on mobile, fix #21129 2015-12-28 18:42:48 +01:00
Thomas Müller
9c4ab51735 Merge pull request #21364 from owncloud/bring_back_icons_filepicker 
Get the icon in javascript for the filepicker
 2015-12-28 10:21:58 +01:00
Thomas Müller
edd051dc02 Merge pull request #21291 from owncloud/refactor-call-check 
Refactor OC_Util::callCheck
 2015-12-28 10:21:44 +01:00
Thomas Müller
7693c6d84a Merge pull request #21254 from owncloud/files-uploadcanceliconfix 
Correctly render uploadtext indicator only on folders
 2015-12-28 10:21:38 +01:00
Thomas Müller
24271cf953 Merge pull request #21216 from owncloud/fopen-statcache 
Clear SMB statcache after fopen
 2015-12-28 10:21:26 +01:00
Thomas Müller
eb509bcbe6 Merge pull request #17333 from owncloud/php7-scalar-types-controllers 
Prefer scalar type hints over phpdoc annotation
 2015-12-28 10:21:14 +01:00
Thomas Müller
245dac7e81 Merge pull request #20992 from owncloud/log-in-noselect 
prevent selecting on log in page to solve ugliness on accidental selection
 2015-12-28 10:18:30 +01:00
Jenkins for ownCloud
89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Thomas Müller
d8c2d0051a Merge pull request #21368 from owncloud/xenopathic-mailmap 
Update mailmap for myself
 2015-12-27 09:57:40 +01:00
Jenkins for ownCloud
6fe60569f5 [tx-robot] updated from transifex 2015-12-27 01:54:38 -05:00
Jenkins for ownCloud
33a83a0926 [tx-robot] updated from transifex 2015-12-25 01:55:16 -05:00
Robin Appelman
5f3c462743 Merge pull request #21093 from owncloud/migrate-no-user 
Dont break the files_external migrator if no user is logged in
 2015-12-24 16:43:28 +01:00
Robin McCorkell
7e66ea89e6 Add mention bot for Robin McCorkell 2015-12-24 11:52:13 +00:00
Robin McCorkell
a09ffaedb4 Correct mailmap for Robin McCorkell to robin@mccorkell.me.uk 2015-12-24 11:51:37 +00:00
Jan-Christoph Borchardt
1622589ac5 prevent selecting on log in page to solve ugliness on accidental selection 2015-12-24 11:01:31 +01:00
Roeland Douma
fd96331e59 Merge pull request #21323 from owncloud/placeholder_sane_precission 
[Avatars] Calculate 'sane' hue precissions
 2015-12-24 11:01:27 +01:00
Roeland Jago Douma
2fc458479e [Avatars] Calculate 'sane' hue precissions 
We used to get the numeric value of the entrire md5 string which is a
128bit integer. We would then devide this by the maxval of a 128bit int.

There is no need for such huge computations. As we just require a value
between 0 and 255. Thus using two 16 bit values is more than enough to
get the precision we need. By just taking the MSB we get nearly
identical results.
 2015-12-24 10:50:12 +01:00
Roeland Jago Douma
b2df7b6b8a Fix unit test 2015-12-24 09:20:26 +01:00
Bernhard Posselt
23c754aed3 prefer scalar type hints over phpdoc annotation 
use method exists lookup to be safe and not break on old hhvm versions

add test that checks if type hint is preferred over annotation
 2015-12-24 09:20:26 +01:00
Roeland Jago Douma
9be43e10af Since the server no longer calculates the icon 
The server no longer calculates the icon. So we have the js side do it
for us.
 2015-12-24 08:59:32 +01:00
Jenkins for ownCloud
9cdc3f0558 [tx-robot] updated from transifex 2015-12-24 01:55:14 -05:00
Thomas Müller
1b369870f2 Merge pull request #21347 from owncloud/fix-unit-tests-on-master 
Fix unit tests
 2015-12-23 10:11:18 +01:00
Lukas Reschke
cebeb0e052 Fix unit tests 
Fixes https://github.com/owncloud/core/issues/21345
 2015-12-23 09:11:22 +01:00
Jenkins for ownCloud
726f7e5fa8 [tx-robot] updated from transifex 2015-12-23 02:02:31 -05:00