summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-masterThomas Müller2014-07-281-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reorder if statements to remove negation, indentation correctionJörn Friedrich Dreyer2014-07-251-9/+9
| * | | | | | | | | | | | | don't silently exit in cli-mode in case ownCloud in not yet installedThomas Müller2014-07-241-0/+2
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2842-152/+213
* | | | | | | | | | | | | Merge pull request #9922 from visit1985/app_icon_sizeJan-Christoph Borchardt2014-07-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | max icon size for app menuMichael Göhler2014-07-261-0/+2
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2750-364/+454
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2653-351/+446
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #9669 from owncloud/group-publicRobin Appelman2014-07-257-48/+235
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add group management to the public apiRobin Appelman2014-07-167-48/+235
* | | | | | | | | | | | Merge pull request #9867 from owncloud/fix_sharing_updateBjörn Schießle2014-07-252-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix sharing update, add proper escapingBjoern Schiessle2014-07-242-2/+5
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2520-122/+147
* | | | | | | | | | | Merge pull request #9861 from owncloud/console-dontloadappsonupdateVincent Petry2014-07-241-6/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not load apps when an upgrade is dueVincent Petry2014-07-241-6/+12
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #9841 from owncloud/fix-password-reset-masterThomas Müller2014-07-243-5/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | - adding default value for $recoveryPasswordThomas Müller2014-07-243-5/+28
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #9837 from owncloud/ignore-non-oc-tables-masterThomas Müller2014-07-242-0/+43
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | register type mappings for unknown/unsupported mysql typesThomas Müller2014-07-241-0/+4
| * | | | | | | | | Adding test which breaks because bit and/or enum datatypes are usedThomas Müller2014-07-241-0/+39
| |/ / / / / / / /
* | | | | | | | | Merge pull request #9703 from owncloud/files-preview-animateMorris Jobke2014-07-242-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix preview animation on uploadingVincent Petry2014-07-172-3/+4
* | | | | | | | | [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 updatingVincent Petry2014-07-231-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #9809 from owncloud/check-transaction-before-commit-migrat...Thomas Müller2014-07-231-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 distinguishe...Jan-Christoph Borchardt2014-07-231-7/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #9789 from owncloud/external-share-rooticewind19912014-07-231-2/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | Merge pull request #9772 from owncloud/fix-chunked-upload-master-2Thomas Müller2014-07-221-0/+31
|\ \ \ \ \ \ \
| * | | | | | | 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`Lukas Reschke2014-07-191-2/+2
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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