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

22868 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
e5731b6e1a Use better way to check for the existence of smbclient 2015-02-16 13:52:11 +01:00
Robin Appelman
d2255a1d30 New SMB storage backend 2015-02-16 13:52:11 +01:00
Thomas Müller
78febb2ee5 Merge pull request #14201 from owncloud/propagator-dont-decrease-mtime 
Dont lower the mtime of a folder when propagating changes
 2015-02-16 11:32:17 +01:00
Thomas Müller
09a33b11a4 Merge pull request #13809 from owncloud/fix-autoloader-message 
Properly show the warning about the missing composer autoloader
 2015-02-16 10:41:24 +01:00
Thomas Müller
d001c4e375 Merge pull request #13922 from owncloud/smb-autotest-external 
[files_external] add SMB autotest
 2015-02-16 10:27:55 +01:00
Thomas Müller
d5ca5c7bcc Merge pull request #14138 from owncloud/fix-image-flip-php53 
Don't flip image in PHP 5.4
 2015-02-16 10:26:56 +01:00
Jenkins for ownCloud
786ff6a5a3 [tx-robot] updated from transifex 2015-02-16 01:54:30 -05:00
Jenkins for ownCloud
31c0cce092 [tx-robot] updated from transifex 2015-02-15 01:54:31 -05:00
Jenkins for ownCloud
2f851ff8bb [tx-robot] updated from transifex 2015-02-14 01:54:42 -05:00
Thomas Müller
d665b7a4b1 Merge pull request #14206 from owncloud/issue/14204-revert-14171 
Issue/14204 revert #14171
 2015-02-13 16:06:34 +01:00
Joas Schilling
113fd47a0b Update version to a higher one then before 2015-02-13 15:24:53 +01:00
Joas Schilling
3a5b0a8cfc Revert "Improve: Index for file_map" 
This reverts commit c9b5608405.
 2015-02-13 15:15:28 +01:00
Joas Schilling
6039523cd6 Revert "Incorporate review changes" 
This reverts commit f6a452cabf.
 2015-02-13 15:15:10 +01:00
Robin Appelman
6ecfcde954 update test 2015-02-13 15:01:05 +01:00
Robin Appelman
134243d3e5 Dont lower the mtime of a folder when propagating changes 2015-02-13 14:30:05 +01:00
Morris Jobke
1393563965 Merge pull request #14178 from RealRancor/fix_config_sample 
Removed anchor in config.sample.php
 2015-02-13 13:38:56 +01:00
Lukas Reschke
276bfe5f33 Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-always-a-string 
Ensure that passed argument is always a string
 2015-02-13 13:30:54 +01:00
Lukas Reschke
95860d8113 Merge pull request #14086 from hlop/master 
App install behind a Proxy
 2015-02-13 12:56:01 +01:00
Lukas Reschke
9904b30070 Ensure that passed argument is always a string 
Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour.

Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
 2015-02-13 12:49:34 +01:00
Joas Schilling
51f8d240c1 Merge pull request #14171 from owncloud/fix/11639 
Improve: Index for file_map
 2015-02-13 10:55:21 +01:00
Jenkins for ownCloud
6b1ed4d688 [tx-robot] updated from transifex 2015-02-13 01:55:06 -05:00
RealRancor
840ad708d6 Removed anchor in config.sample.php 2015-02-12 22:00:24 +01:00
Lukas Reschke
f6a452cabf Incorporate review changes 2015-02-12 19:14:54 +01:00
windaishi
c9b5608405 Improve: Index for file_map 
Added two indices for file_map, that improve syncing and uploading and deleting files
 2015-02-12 19:12:08 +01:00
Lukas Reschke
dfcd4acd5a Merge pull request #13771 from owncloud/fix-humanfileSize 
generate valid human readable text for 0
 2015-02-12 18:34:54 +01:00
Lukas Reschke
bd5440a8a3 Merge pull request #13780 from owncloud/cmreflector-inheritance 
Additional controllermethodreflector inheritance tests
 2015-02-12 18:34:07 +01:00
Lukas Reschke
8e8acad550 Merge pull request #14145 from owncloud/no-whitespace-from-themes-master 
catch any whitespaces which might get written to the output buffer while...
 2015-02-12 17:23:28 +01:00
Thomas Müller
738fcdafbe Merge pull request #14159 from owncloud/remove-internal 
Remove internal annotation
 2015-02-12 17:07:59 +01:00
Thomas Müller
fc7f279d90 catch any whitespaces which might get written to the output buffer while loading a theme 2015-02-12 16:42:17 +01:00
Lukas Reschke
2f80be45b0 Remove internal annotation 
PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API.
 2015-02-12 16:35:47 +01:00
Morris Jobke
c751ba0409 Merge pull request #14121 from Zillode/app-favicon 
Disable application-specific favicons for non-user pages
 2015-02-12 13:19:07 +01:00
Lukas Reschke
4142267a02 Merge pull request #9038 from owncloud/add_tag_file 
Add .tag file to make tar balls tracable
 2015-02-12 13:17:45 +01:00
Björn Schießle
780024e252 Merge pull request #14071 from owncloud/add_timeout_for_post_requests 
add timeout to curl request
 2015-02-12 11:38:35 +01:00
Lukas Reschke
b68c376e8e Merge pull request #13913 from rullzer/showusergroups 
Added overview of groups a user is member of
 2015-02-12 11:21:40 +01:00
Morris Jobke
0b38a48bb4 Merge pull request #14135 from cmeh/master 
Clean-up of messages (orthography, format)
 2015-02-12 11:03:49 +01:00
Morris Jobke
f4182d2dc9 Merge pull request #10993 from owncloud/scanner-reuse-fileid 
Reuse known fileids and cache data in the scanner
 2015-02-12 10:53:00 +01:00
Bjoern Schiessle
4155252379 add timeout to curl request 2015-02-12 10:51:39 +01:00
Roeland Jago Douma
7a8f95be2f Added overview of groups a user is a member of 2015-02-12 10:49:55 +01:00
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