Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-26 | 3 | -2/+34 |
| | |||||
* | Merge pull request #9669 from owncloud/group-public | Robin Appelman | 2014-07-25 | 7 | -48/+235 |
|\ | | | | | Add group management to the public api | ||||
| * | Add group management to the public api | Robin Appelman | 2014-07-16 | 7 | -48/+235 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-25 | 1 | -0/+15 |
| | | |||||
* | | Merge pull request #9841 from owncloud/fix-password-reset-master | Thomas Müller | 2014-07-24 | 2 | -4/+4 |
|\ \ | | | | | | | Fix password reset in console command and lost password controller | ||||
| * | | - adding default value for $recoveryPassword | Thomas Müller | 2014-07-24 | 2 | -4/+4 |
| | | | | | | | | | | | | - set password correctly in lost password | ||||
* | | | register type mappings for unknown/unsupported mysql types | Thomas Müller | 2014-07-24 | 1 | -0/+4 |
|/ / | |||||
* | | only commit in case a transaction is active | Thomas Müller | 2014-07-23 | 1 | -1/+3 |
| | | |||||
* | | Revert change | Sander | 2014-07-22 | 1 | -2/+2 |
| | | |||||
* | | Allow getAppFolder to get another apps path | Sander | 2014-07-22 | 1 | -3/+2 |
| | | | | | | cc @Raydiation | ||||
* | | Merge pull request #9772 from owncloud/fix-chunked-upload-master-2 | Thomas Müller | 2014-07-22 | 1 | -0/+31 |
|\ \ | | | | | | | adding special handling of checkPrecondition() for chunked upload | ||||
| * | | adding special handling of checkPrecondition() for chunked upload | Thomas Müller | 2014-07-22 | 1 | -0/+31 |
| | | | |||||
* | | | Merge pull request #9738 from owncloud/remove-uneeded-strip | Thomas Müller | 2014-07-22 | 1 | -22/+22 |
|\ \ \ | |/ / |/| | | Remove uneeded strip_tags | ||||
| * | | Remove uneeded `strip_tags` | Lukas Reschke | 2014-07-19 | 1 | -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 Fischer | 2014-07-19 | 1 | -20/+22 |
| | | | |||||
| * | | Deduplicate user/password extraction from alternative HTTP headers. | Andreas Fischer | 2014-07-19 | 1 | -16/+14 |
| | | | |||||
* | | | Merge pull request #9757 from owncloud/issue/9756 | Joas Schilling | 2014-07-21 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | Add language parameter to public API for getL10N() | ||||
| * | | | Add language parameter to public API for getL10N() | Joas Schilling | 2014-07-21 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | Fix #9756 | ||||
* | | | | perm -> permissions | Thomas Müller | 2014-07-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #9406 from philfry/master | Vincent Petry | 2014-07-21 | 1 | -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 Kueck | 2014-07-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | other dav servers which return an html body | ||||
* | | | | Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master | Morris Jobke | 2014-07-20 | 1 | -3/+5 |
|\ \ \ \ | | | | | | | | | | | check if $tables is an array | ||||
| * | | | | check if $tables is an array | Thomas Müller | 2014-07-19 | 1 | -3/+5 |
| | | | | | |||||
* | | | | | Merge pull request #9672 from owncloud/mysql-affectedrows | Andreas Fischer | 2014-07-20 | 1 | -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 Fischer | 2014-07-16 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Make MySQL return "number of found rows" instead of number of "affected rows". | Andreas Fischer | 2014-07-16 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-19 | 3 | -2/+37 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-18 | 2 | -25/+115 |
| | | | | |||||
* | | | | update appstore api url | Frank Karlitschek | 2014-07-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #9682 from owncloud/mappedlocal-rename | Vincent Petry | 2014-07-17 | 1 | -2/+17 |
|\ \ \ \ | | | | | | | | | | | Fix renaming files in the root folder of a MappedLocal storage | ||||
| * | | | | Fix renaming files in the root folder of a MappedLocal storage | Robin Appelman | 2014-07-16 | 1 | -2/+17 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-17 | 3 | -13/+22 |
|/ / / / | |||||
* | | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstream | icewind1991 | 2014-07-16 | 2 | -4/+22 |
|\ \ \ \ | |_|_|/ |/| | | | storage: do not check file mode on rename | ||||
| * | | | files: storage: rename should check parent directories of old and new files | Tigran Mkrtchyan | 2014-07-10 | 2 | -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 #9584 | Stephan Peijnik | 2014-07-16 | 1 | -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_9627 | Björn Schießle | 2014-07-16 | 1 | -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 exists | Bjoern Schiessle | 2014-07-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-16 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge pull request #9644 from owncloud/fix_user_api | Thomas Müller | 2014-07-15 | 2 | -3/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix user api | ||||
| * | | | | use UserSession service to resolve user id | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | use correct IUser in interface | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_results | blizzz | 2014-07-15 | 1 | -33/+22 |
|\ \ \ \ \ | |/ / / / |/| | | | | use fileinfo object in search results | ||||
| * | | | | mkae getRelativePath of file search results overwriteable in subclasses | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | return relative path | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -27/+15 |
| | | | | | |||||
| * | | | | use fileinfo object in search results | Jörn Friedrich Dreyer | 2014-07-09 | 1 | -9/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #8987 from owncloud/lastindexid-debug | Vincent Petry | 2014-07-15 | 2 | -2/+14 |
|\ \ \ \ | | | | | | | | | | | [DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL | ||||
| * | | | | - Added test to trigger index id error | Vincent Petry | 2014-07-14 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - re-enable encryption migration tests - sqlite requires reconnect after schema changes | ||||
* | | | | | Merge pull request #9561 from libasys/patch-3 | icewind1991 | 2014-07-15 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Error undefined index: file_target | ||||
| * | | | | | Update share.php | libasys | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | change isset with empty on line 1911 | ||||
| * | | | | | Update share.php | libasys | 2014-07-10 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Added isset for error: ``` Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911 ``` |