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

22883 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
a496c34aea Check if imageflip is available 
* imageflip() isn't available in PHP < 5.5
* fixes #14130
 2015-02-12 10:21:20 +01:00
Morris Jobke
64216971d4 Merge pull request #14129 from owncloud/deprecate-oc-json 
Deprecate `OC_JSON` and `OCP\JSON`
 2015-02-12 10:05:30 +01:00
cmeh
f24f7f7c74 Orthography: "Back-end" -> Backend (without hyphen) and correction of "users" to the genitive "user's" 2015-02-12 08:18:24 +01:00
cmeh
01f89083ba Adding a missing space between value and unit 
Added the missing space between value and unit, as it is formatted in all other places across ownCloud.
 2015-02-12 08:14:12 +01:00
Jenkins for ownCloud
e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
Lukas Reschke
86139fcce8 Deprecate OC_JSON and OCP\JSON 
This deprecates – but not removes – those two classes and all functions in it. There is no reason that new developments should use those methods as with the AppFramework there is a replacement that allows testable code.

With the `@deprecated` annotation IDEs like PHPStorm will point out to the developer that a functionality is deprecated and that there is a better suited replacement.
 2015-02-12 00:56:13 +01:00
Lukas Reschke
2c899f1d43 Merge pull request #14126 from owncloud/remove-that-old-thing 
Remove unused file
 2015-02-11 23:59:00 +01:00
Lukas Reschke
1c1bd058e4 Remove unused file 
This file is unused and has been last modified two years ago. Furthermore it won't evne work anymore properly because it uses things  like `CONFIG_DATEFORMAT` which are gone a long time ago...
 2015-02-11 23:26:48 +01:00
Lode Hoste
27b35500a7 Disable application-specific favicons for non-user pages 2015-02-11 20:09:03 +01:00
Thomas Müller
99a97649f2 Merge pull request #14097 from yanntech/fix/utf8-check 
in some case charset can be in lower case.
 2015-02-11 18:04:54 +01:00
Vincent Petry
fbbb9fe0fd Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-post-hook 
Do not overwrite the shareType so the post hook is still correct
 2015-02-11 15:23:13 +01:00
Thomas Müller
0e4923b0f9 Merge pull request #14105 from owncloud/second-parameter-is-optional 
Second parameter is optional
 2015-02-11 15:07:20 +01:00
Lukas Reschke
0119d429fc Second parameter is optional 
Makes my IDE happier.
 2015-02-11 14:01:22 +01:00
Robin Appelman
9df18ffe75 only read permissions once 2015-02-11 13:11:31 +01:00
Robin Appelman
9bbfeada6b Only try to scan the children of directories 2015-02-11 13:11:31 +01:00
Robin Appelman
dc6468c2aa Cast mtimes and size to int 2015-02-11 13:11:28 +01:00
Robin Appelman
4242dd0d9d Reuse cache data of existing files during scan 2015-02-11 13:08:28 +01:00
Yann VERRY
1fcea6f1bd in some case charset can be in lower case. 
Add strtoupper() in UTF-8 check to avoid error message
 2015-02-11 11:59:33 +01:00
Jenkins for ownCloud
9baf7a0a3f [tx-robot] updated from transifex 2015-02-11 01:55:07 -05:00
Witali Rott
531c89a610 App install behind a Proxy 2015-02-11 07:47:50 +01:00
Morris Jobke
f65f5e0597 Merge pull request #14074 from RealRancor/documents_preview_notes 
Add hint for troubleshooting MS Word previews
 2015-02-11 01:11:31 +01:00
Thomas Müller
45dcca2fcb Merge pull request #13861 from owncloud/remove-disabled-files-repair-step 
Revert "enabled disabled files app in repair step"
 2015-02-10 22:46:53 +01:00
RealRancor
c5c632f8ff Add hint for troubleshooting MS Word previews 2015-02-10 22:35:16 +01:00
Morris Jobke
60cadf5647 [files_external] ftp tests 2015-02-10 22:34:58 +01:00
Lukas Reschke
e12b982dfc Merge pull request #14072 from owncloud/add-files-external-test-readme 
add readme for files external tests
 2015-02-10 21:45:21 +01:00
Morris Jobke
64a3e6eb22 add rreadme for files external tests 2015-02-10 20:43:32 +01:00
Morris Jobke
11283c57d9 Merge pull request #11056 from AdamWill/9885-opcode 
add function to invalidate one opcache file, use it if possible #9885
 2015-02-10 17:21:15 +01:00
Vincent Petry
bd01ff135a Merge pull request #13190 from is-apps/master-sftp-key 
Add SFTP public key authentication support
 2015-02-10 16:44:29 +01:00
Lukas Reschke
5ae03fd650 Merge pull request #14028 from frsela/charset_utf8 
Setting default charset to UTF-8 in .htaccess and .user.ini
 2015-02-10 10:38:12 +01:00
Morris Jobke
f7bbe081b3 [files_external] add SMB autotest 2015-02-10 10:30:10 +01:00
Fernando Rodriguez Sela
66b584ae7e Setting default charset to UTF-8 in .htaccess and .user.ini 2015-02-10 09:39:06 +01:00
Jenkins for ownCloud
124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Morris Jobke
1bb6de7c1b Merge pull request #13425 from owncloud/phpdoc_cleanup 
Cleanup of PHPDoc return types
 2015-02-10 01:14:00 +01:00
Morris Jobke
4a99849c6c Merge pull request #13663 from owncloud/issue/13624-notification-when-favorting-fails 
Only update favorite icon if the operation was successful
 2015-02-10 00:05:39 +01:00
Morris Jobke
068f6107c6 Merge pull request #13842 from owncloud/is_file_2_is_readable 
check if cache files are readable
 2015-02-09 23:45:32 +01:00
Morris Jobke
297b52fa4c Merge pull request #14007 from owncloud/fix-broken-master 
[master] Request requires a second parameter
 2015-02-09 23:34:14 +01:00
Thomas Müller
c60dabd11b Request requires a second parameter 2015-02-09 23:06:55 +01:00
Thomas Müller
4872d6c08a Merge pull request #13923 from owncloud/l10n-ignore-jsmin 
Ignore minified js in translation process
 2015-02-09 21:07:13 +01:00
Lukas Reschke
74de345c7f Merge pull request #13511 from owncloud/naturalsort_speeeeeed 
NaturalSort performance improvements
 2015-02-09 18:39:52 +01:00
Vincent Petry
c4d9ae8af4 Merge pull request #13928 from owncloud/prevent_ghost_files_master 
prevent creation of ghost directories
 2015-02-09 18:15:45 +01:00
Vincent Petry
5296767393 Merge pull request #13921 from owncloud/ocs-af 
Add a controller and reponse for ocs
 2015-02-09 18:11:47 +01:00
Vincent Petry
605e2357a1 Merge pull request #13852 from owncloud/cache-app-versions 
Cache app versions
 2015-02-09 18:03:19 +01:00
Vincent Petry
c7fcd42edb Merge pull request #13870 from owncloud/drop-oc-preferences-2 
drop OC\Preferences
 2015-02-09 17:49:05 +01:00
Vincent Petry
b7b8c0c2e5 Merge pull request #13869 from owncloud/drop-oc-preferences 
drop OC_Preferences
 2015-02-09 17:48:36 +01:00
Lukas Reschke
47c7eb4e70 Merge pull request #13973 from owncloud/enhancement/security/13366 
Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
 2015-02-09 17:35:19 +01:00
Robin McCorkell
a79757bc37 Store FileInfo::getType() result for future use 2015-02-09 16:34:11 +00:00
Robin McCorkell
44c330aa5d Performance improvements for NaturalSort 
A combination of using isset() instead of count() or strlen(), caching the
chunkify function, and replacing is_numeric() with some comparisons
 2015-02-09 16:32:43 +00:00
Vincent Petry
5d8f1a1de3 Merge pull request #13854 from owncloud/avatar-exists 
Add a better way to check if an avatar exists for the user
 2015-02-09 17:06:24 +01:00
blizzz
dc475ab3e0 Merge pull request #13925 from owncloud/fix-13898 
no fruitless count attempts, and notification should disappear
 2015-02-09 16:55:50 +01:00
Joas Schilling
018f9fddaf Merge pull request #13977 from owncloud/tempmanager-check-handle 
Check directory handle before we use it
 2015-02-09 16:40:56 +01:00