aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* enable input grouping also outside of log in screenJan-Christoph Borchardt2014-07-241-3/+6
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-2420-69/+94
|
* Merge pull request #9815 from owncloud/update-preventupdatethroughcronThomas Müller2014-07-231-0/+5
|\ | | | | Prevent cron.php to trigger apps updating
| * Prevent cron.php to trigger apps updatingVincent Petry2014-07-231-0/+5
| |
* | Merge pull request #9809 from ↵Thomas Müller2014-07-231-1/+3
|\ \ | | | | | | | | | | | | owncloud/check-transaction-before-commit-migration-master only commit in case a transaction is active
| * | only commit in case a transaction is activeThomas Müller2014-07-231-1/+3
|/ /
* | Merge pull request #9788 from owncloud/design-app-stylesVincent Petry2014-07-231-9/+2
|\ \ | | | | | | Simplify app navigation look
| * | fix settings entry widthJan-Christoph Borchardt2014-07-231-1/+1
| | |
| * | remove superfluous border from settings entryJan-Christoph Borchardt2014-07-231-1/+0
| | |
| * | simplify app navigation look, remove superfluous border as it is ↵Jan-Christoph Borchardt2014-07-231-7/+1
| |/ | | | | | | distinguished enough via background color
* | Merge pull request #9789 from owncloud/external-share-rooticewind19912014-07-231-2/+7
|\ \ | |/ |/| Fix remote share when remote server is installed at the root
| * Fix remote share when remote server is installed at the rootRobin Appelman2014-07-231-2/+7
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-2312-27/+27
|
* 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 #9683 from owncloud/fix_#8819_sortingVincent Petry2014-07-223-29/+58
|\ \ | | | | | | Fix #8819 sorting
| * | Sorting triangles pointing up for ascending, down for descendingRemco Brenninkmeijer2014-07-211-2/+2
| | |
| * | Before I get spanked ;)Remco Brenninkmeijer2014-07-171-1/+1
| | |
| * | Adjusted tests for new default sortingRemco Brenninkmeijer2014-07-171-19/+32
| | |
| * | While busy cleaning, also removed extra entersRemco Brenninkmeijer2014-07-172-3/+0
| | |
| * | Corrected (Netbeans?) inserted spacesRemco Brenninkmeijer2014-07-172-17/+17
| | |
| * | Fixed comments from PVince81Remco Brenninkmeijer2014-07-161-6/+5
| | |
| * | Cleanup of unnecesary additionRemco Brenninkmeijer2014-07-161-1/+1
| | |
| * | Show sorting icons when hovering overRemco Brenninkmeijer2014-07-162-12/+27
| | |
| * | Changed default sorting except for names.Remco Brenninkmeijer2014-07-081-1/+6
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2220-42/+48
| | |
* | | Merge pull request #9750 from owncloud/issue/9745Vincent Petry2014-07-211-7/+9
|\ \ \ | | | | | | | | Correctly use groups parameter only when its not empty
| * | | Correctly use groups parameter only when its not emptyJoas Schilling2014-07-211-7/+9
| | | | | | | | | | | | | | | | Fix #9745
* | | | 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
* | | | | use the minimum of configured session_livetime and session.gc_maxlifetime ↵Matthias Rieber2014-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | for session hearbeat interval calculation
* | | | | Merge pull request #9755 from owncloud/fix-webdav-attribute-permissions-masterMorris Jobke2014-07-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | perm -> permissions
| * | | | perm -> permissionsThomas Müller2014-07-211-1/+1
| | | | |
* | | | | Merge pull request #9751 from owncloud/issue/9748Vincent Petry2014-07-212-5/+6
|\ \ \ \ \ | |/ / / / |/| | | | Fix username for subadmins and only send subadmin groups
| * | | | Do not force isAdmin as true and so the list is filtered correctlyJoas Schilling2014-07-211-3/+1
| | | | |
| * | | | Fix username for subadmins and only send subadmin groupsJoas Schilling2014-07-211-2/+5
| |/ / / | | | | | | | | | | | | Fix #9748
* | | | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2126-65/+76
| | | |
* | | | 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-203-1/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
| * | | | | Added test of OCS privatedata to trigger key duplicationVincent Petry2014-07-171-0/+25
| | | | | |
| * | | | | Document why we have to check with defined() first.Andreas Fischer2014-07-161-0/+2
| | | | | |