summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 6.0.9v6.0.9C Montero-Luque2015-07-031-2/+2
|
* 6.0.9RC1v6.0.9RC1C Montero-Luque2015-06-301-2/+2
|
* Merge pull request #17237 from owncloud/oc-version-to-app-store-stable6Morris Jobke2015-06-294-19/+33
|\ | | | | Add oc version to app store requests in stable6
| * Add oc version to app store requests in stable6Joas Schilling2015-06-294-19/+33
|/
* Version 6.0.9 betav6.0.9betaC Montero-Luque2015-06-231-2/+2
|
* Merge pull request #17023 from owncloud/stable6-verify-pathThomas Müller2015-06-191-0/+4
|\ | | | | [stable6] Verify if path exists
| * Verify if path existsLukas Reschke2015-06-181-0/+4
|/ | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously.
* Merge pull request #16990 from owncloud/stable6-fix-verify-if-path-existsMorris Jobke2015-06-171-0/+7
|\ | | | | [stable6] Verify if path exists
| * Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| |
| * Verify if path existsLukas Reschke2015-06-171-0/+5
|/ | | | We need to verify if the specified path exists to gracefully prevent errors.
* Merge pull request #16865 from owncloud/backport-concatenation-6Thomas Müller2015-06-111-3/+3
|\ | | | | [stable6] Don't use command concatenation
| * Don't use command concatenationLukas Reschke2015-06-101-3/+3
|/ | | | Possibly fixes https://github.com/owncloud/core/issues/16853
* Merge pull request #16683 from owncloud/stable6-check-arrayMorris Jobke2015-06-101-5/+7
|\ | | | | Check if array
| * Check if arrayLukas Reschke2015-06-021-5/+7
| | | | | | | | | | | | The great library that we use apparently uses mixed types for everything because :see_no_evil: Fixes https://github.com/owncloud/core/issues/16679
* | 6.0.8v6.0.8Frank Karlitschek2015-06-031-2/+2
|/
* 6.0.8RC2v6.0.8RC2Frank Karlitschek2015-06-011-2/+2
|
* Merge pull request #16674 from owncloud/update-phpunitThomas Müller2015-06-014-9/+22
|\ | | | | Upgrade to use latest phpunit - fixes #16669
| * Upgrade to use latest phpunit - fixes #16669Thomas Müller2015-06-014-9/+22
|/
* Disallow semicolons in passed commandsLukas Reschke2015-06-011-0/+5
|
* Ensure that passed argument is always a stringLukas Reschke2015-06-012-1/+9
| | | | | | 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.
* Revert custom patch that can cause problemsLukas Reschke2015-06-011-2/+8
|
* 6.0.8 RC1v6.0.8RC1Frank Karlitschek2015-05-291-2/+2
|
* Merge pull request #14499 from owncloud/kill-substr-mssql-stable6Lukas Reschke2015-03-261-99/+0
|\ | | | | [stable6] Remove hacky Substring support for MSSQL
| * Remove hacky Substring support for MSSQLLukas Reschke2015-02-251-99/+0
| | | | | | | | Substring() is not required for the core functionality and this allows us to get rid of a huge hack...
* | Merge pull request #14729 from owncloud/stable6-versioning_fix_pathMorris Jobke2015-03-241-2/+2
|\ \ | |/ |/| [stable6] make sure that the versions array contains the correct path
| * make sure that the versions array contains the correct pathBjoern Schiessle2015-03-061-2/+2
|/
* 6.0.7v6.0.7Frank Karlitschek2015-02-161-2/+2
|
* Merge pull request #14150 from owncloud/no-whitespace-from-themes-stable6Thomas Müller2015-02-191-5/+5
|\ | | | | catch any whitespaces which might get written to the output buffer while...
| * catch any whitespaces which might get written to the output buffer while ↵Thomas Müller2015-02-121-5/+5
| | | | | | | | loading a theme
* | Merge pull request #14255 from owncloud/console-execution-time-stable6Morris Jobke2015-02-161-0/+3
|\ \ | |/ |/| [backport-14243-stable6] console commands shall not be limited with respect to execution time
| * console commands shall not be limited with respect to execution timeThomas Müller2015-02-161-0/+3
|/
* Normalize before processingLukas Reschke2015-02-064-6/+39
|
* 6.0.7 RC1Frank Karlitschek2015-02-061-2/+2
|
* Merge pull request #12736 from owncloud/temp-handling-stable6Morris Jobke2015-01-098-90/+352
|\ | | | | [stable6] Cleanup handling of temporary files
| * Use the TempManager to handle temporary filesRobin Appelman2015-01-083-90/+7
| |
| * Add \OC\TempManager to handle creating and cleaning temporary filesRobin Appelman2015-01-085-0/+345
| |
* | Merge pull request #13177 from ↵Morris Jobke2015-01-091-1/+3
|\ \ | |/ |/| | | | | owncloud/stable6-extstorage-fixsharedmountpointrootleadingslash [stable6] Fix source path when share is a mount point
| * Fix source path when share is a mount pointVincent Petry2015-01-081-1/+3
|/ | | | | | | Whenever an external storage mount point is shared directly, its path is empty which causes a leading slash to appear in the source path. This fix removes the bogus leading slash in such situation.
* Added error check to lib/private/image.phpByron Marohn2015-01-021-0/+6
| | | | | | | This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE. Without this check, subsequent loop might create billions of ERROR-level log messages. Signed-off-by: Byron Marohn <combustible@live.com>
* Skip headers that can not be splitVictor Dubiniuk2014-12-101-0/+3
|
* 6.0.6v6.0.6Frank Karlitschek2014-11-071-2/+2
|
* logging changesCraig Morrissey2014-11-071-0/+3
|
* Merge pull request #11706 from owncloud/fix_trash_stable6Björn Schießle2014-10-231-0/+3
|\ | | | | [oc6] make sure that trash bin is initialized correctly
| * make sure that trash bin is initialized for both the current user and the ↵Bjoern Schiessle2014-10-221-0/+3
|/ | | | file owner
* no error if we try to delete a file which no longer existsBjoern Schiessle2014-10-211-1/+3
|
* backport of #11494Arthur Schiwon2014-10-204-34/+65
| | | | | | | | | | | | | | | | | | | fix retrievel of group members and cache group members fix changed variable name with several backends, more than limit can be returned make performance less bad. Still far from good, but at least it works add one simple cache test adjust group manager tests Conflicts: apps/user_ldap/group_ldap.php apps/user_ldap/lib/access.php apps/user_ldap/tests/group_ldap.php
* Merge pull request #11217 from owncloud/backport-9225-stable6blizzz2014-10-206-44/+465
|\ | | | | Backport of #9225 to stable6
| * Merge branch 'voxsim-backport-9225-stable6' into backport-9225-stable6Arthur Schiwon2014-10-166-22/+137
| |\
| | * Fix in stable6 after backport of #9225Simon Vocella2014-09-241-1/+3
| | |
| | * ask implementsAction instead of checking method_exists for easier testingArthur Schiwon2014-09-241-1/+1
| | |