summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-263-2/+34
|
* Merge pull request #9669 from owncloud/group-publicRobin Appelman2014-07-257-48/+235
|\ | | | | Add group management to the public api
| * Add group management to the public apiRobin Appelman2014-07-167-48/+235
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-251-0/+15
| |
* | Merge pull request #9841 from owncloud/fix-password-reset-masterThomas Müller2014-07-242-4/+4
|\ \ | | | | | | Fix password reset in console command and lost password controller
| * | - adding default value for $recoveryPasswordThomas Müller2014-07-242-4/+4
| | | | | | | | | | | | - set password correctly in lost password
* | | register type mappings for unknown/unsupported mysql typesThomas Müller2014-07-241-0/+4
|/ /
* | only commit in case a transaction is activeThomas Müller2014-07-231-1/+3
| |
* | Revert changeSander2014-07-221-2/+2
| |
* | Allow getAppFolder to get another apps pathSander2014-07-221-3/+2
| | | | | | cc @Raydiation
* | Merge pull request #9772 from owncloud/fix-chunked-upload-master-2Thomas Müller2014-07-221-0/+31
|\ \ | | | | | | adding special handling of checkPrecondition() for chunked upload
| * | adding special handling of checkPrecondition() for chunked uploadThomas Müller2014-07-221-0/+31
| | |
* | | Merge pull request #9738 from owncloud/remove-uneeded-stripThomas Müller2014-07-221-22/+22
|\ \ \ | |/ / |/| | Remove uneeded strip_tags
| * | Remove uneeded `strip_tags`Lukas Reschke2014-07-191-2/+2
| | | | | | | | | | | | | | | This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`) Needs https://github.com/owncloud/core/pull/9735 to be merged first.
| * | Extract Auth Header logic into new function handleAuthHeaders().Andreas Fischer2014-07-191-20/+22
| | |
| * | Deduplicate user/password extraction from alternative HTTP headers.Andreas Fischer2014-07-191-16/+14
| | |
* | | Merge pull request #9757 from owncloud/issue/9756Joas Schilling2014-07-211-2/+3
|\ \ \ | | | | | | | | Add language parameter to public API for getL10N()
| * | | Add language parameter to public API for getL10N()Joas Schilling2014-07-211-2/+3
| | | | | | | | | | | | | | | | Fix #9756
* | | | perm -> permissionsThomas Müller2014-07-211-1/+1
|/ / /
* | | Merge pull request #9406 from philfry/masterVincent Petry2014-07-211-0/+1
|\ \ \ | | | | | | | | silently discard the response body, needed for apache/mod_dav and maybe ...
| * | | silently discard the response body, needed for apache/mod_dav and maybe ↵Philippe Kueck2014-07-031-0/+1
| | | | | | | | | | | | | | | | other dav servers which return an html body
* | | | Merge pull request #9741 from owncloud/fix-repair-innodb-9737-masterMorris Jobke2014-07-201-3/+5
|\ \ \ \ | | | | | | | | | | check if $tables is an array
| * | | | check if $tables is an arrayThomas Müller2014-07-191-3/+5
| | | | |
* | | | | Merge pull request #9672 from owncloud/mysql-affectedrowsAndreas Fischer2014-07-201-1/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make MySQL affected row count consistent with other DBMSes * owncloud/mysql-affectedrows: Added test of OCS privatedata to trigger key duplication Document why we have to check with defined() first. Make MySQL return "number of found rows" instead of number of "affected rows".
| * | | | Document why we have to check with defined() first.Andreas Fischer2014-07-161-0/+2
| | | | |
| * | | | Make MySQL return "number of found rows" instead of number of "affected rows".Andreas Fischer2014-07-161-1/+7
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-193-2/+37
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-182-25/+115
| | | |
* | | | update appstore api urlFrank Karlitschek2014-07-171-1/+1
| | | |
* | | | Merge pull request #9682 from owncloud/mappedlocal-renameVincent Petry2014-07-171-2/+17
|\ \ \ \ | | | | | | | | | | Fix renaming files in the root folder of a MappedLocal storage
| * | | | Fix renaming files in the root folder of a MappedLocal storageRobin Appelman2014-07-161-2/+17
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-173-13/+22
|/ / / /
* | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstreamicewind19912014-07-162-4/+22
|\ \ \ \ | |_|_|/ |/| | | storage: do not check file mode on rename
| * | | files: storage: rename should check parent directories of old and new filesTigran Mkrtchyan2014-07-102-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | as described by POSIX.1-2008 (see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html) Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* | | | Port of #9584Stephan Peijnik2014-07-161-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9583 lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs. settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Fix indentation. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Renamed $grp to $group in foreach loop. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Use is_null() instead of empty() when checking the return value of GroupManager::get(). Additionally, $grp was renamed to $group inside \OC\Group\MetaData::fetchGroups(). Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Updated code to reflect changes introduced to \OC\Group\MetaData. Now that fetchGroups() does not exist anymore and getGroups() is called directory, the 'groups' property does not exist anymore. Instead, we now generate that array on the fly and return it from getGroups. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
* | | | Merge pull request #9640 from owncloud/fix_9627Björn Schießle2014-07-161-1/+1
|\ \ \ \ | | | | | | | | | | make sure that 'OC_Theme' exists before checking if the method exists
| * | | | make sure that 'OC_Theme' exists before checking if the method existsBjoern Schiessle2014-07-151-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-161-0/+7
| | | | |
* | | | | Merge pull request #9644 from owncloud/fix_user_apiThomas Müller2014-07-152-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix user api
| * | | | use UserSession service to resolve user idJörn Friedrich Dreyer2014-07-151-1/+1
| | | | |
| * | | | use correct IUser in interfaceJörn Friedrich Dreyer2014-07-151-2/+2
| | | | |
* | | | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_resultsblizzz2014-07-151-33/+22
|\ \ \ \ \ | |/ / / / |/| | | | use fileinfo object in search results
| * | | | mkae getRelativePath of file search results overwriteable in subclassesJörn Friedrich Dreyer2014-07-141-2/+1
| | | | |
| * | | | return relative pathJörn Friedrich Dreyer2014-07-141-27/+15
| | | | |
| * | | | use fileinfo object in search resultsJörn Friedrich Dreyer2014-07-091-9/+11
| | |/ / | |/| |
* | | | Merge pull request #8987 from owncloud/lastindexid-debugVincent Petry2014-07-152-2/+14
|\ \ \ \ | | | | | | | | | | [DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
| * | | | - Added test to trigger index id errorVincent Petry2014-07-142-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | - re-enable encryption migration tests - sqlite requires reconnect after schema changes
* | | | | Merge pull request #9561 from libasys/patch-3icewind19912014-07-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix Error undefined index: file_target
| * | | | | Update share.phplibasys2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | change isset with empty on line 1911
| * | | | | Update share.phplibasys2014-07-101-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Added isset for error: ``` Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911 ```