Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9819 from owncloud/updater-setversionafterupdate | Thomas Müller | 2014-07-28 | 1 | -2/+3 |
|\ | |||||
| * | Set version AFTER a successful update | Vincent Petry | 2014-07-23 | 1 | -2/+3 |
* | | Merge pull request #9859 from tiezdne/master | Thomas Müller | 2014-07-28 | 1 | -0/+2 |
|\ \ | |||||
| * | | Update mimetypes.list.php | tiezdne | 2014-07-24 | 1 | -0/+2 |
* | | | Merge pull request #9905 from owncloud/joblist-non-existing-class | Thomas Müller | 2014-07-28 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | Dont try to execute jobs that no longer exist | Robin Appelman | 2014-07-25 | 1 | -1/+4 |
* | | | | Merge pull request #9935 from owncloud/harden-get-urlco | Thomas Müller | 2014-07-28 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Verify whether the URL is valid | Lukas Reschke | 2014-07-27 | 1 | -0/+5 |
* | | | | | Merge pull request #9904 from owncloud/loggedout-getuserfolder | Thomas Müller | 2014-07-28 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Dont throw an error when calling $server->getUserFolder when logged out | Robin Appelman | 2014-07-25 | 1 | -1/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master | Thomas Müller | 2014-07-28 | 1 | -7/+9 |
|\ \ \ \ \ | |||||
| * | | | | | reorder if statements to remove negation, indentation correction | Jörn Friedrich Dreyer | 2014-07-25 | 1 | -9/+9 |
| * | | | | | don't silently exit in cli-mode in case ownCloud in not yet installed | Thomas Müller | 2014-07-24 | 1 | -0/+2 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-28 | 42 | -152/+213 |
* | | | | | | Merge pull request #9922 from visit1985/app_icon_size | Jan-Christoph Borchardt | 2014-07-28 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | max icon size for app menu | Michael Göhler | 2014-07-26 | 1 | -0/+2 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-27 | 50 | -364/+454 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-26 | 53 | -351/+446 |
|/ / / / / | |||||
* | | | | | Merge pull request #9669 from owncloud/group-public | Robin Appelman | 2014-07-25 | 7 | -48/+235 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add group management to the public api | Robin Appelman | 2014-07-16 | 7 | -48/+235 |
* | | | | | Merge pull request #9867 from owncloud/fix_sharing_update | Björn Schießle | 2014-07-25 | 2 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | fix sharing update, add proper escaping | Bjoern Schiessle | 2014-07-24 | 2 | -2/+5 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-25 | 20 | -122/+147 |
* | | | | | | Merge pull request #9861 from owncloud/console-dontloadappsonupdate | Vincent Petry | 2014-07-24 | 1 | -6/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not load apps when an upgrade is due | Vincent Petry | 2014-07-24 | 1 | -6/+12 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #9841 from owncloud/fix-password-reset-master | Thomas Müller | 2014-07-24 | 3 | -5/+28 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | - adding default value for $recoveryPassword | Thomas Müller | 2014-07-24 | 3 | -5/+28 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #9837 from owncloud/ignore-non-oc-tables-master | Thomas Müller | 2014-07-24 | 2 | -0/+43 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | register type mappings for unknown/unsupported mysql types | Thomas Müller | 2014-07-24 | 1 | -0/+4 |
| * | | | | Adding test which breaks because bit and/or enum datatypes are used | Thomas Müller | 2014-07-24 | 1 | -0/+39 |
| |/ / / | |||||
* | | | | Merge pull request #9703 from owncloud/files-preview-animate | Morris Jobke | 2014-07-24 | 2 | -3/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix preview animation on uploading | Vincent Petry | 2014-07-17 | 2 | -3/+4 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-24 | 20 | -69/+94 |
* | | | | Merge pull request #9815 from owncloud/update-preventupdatethroughcron | Thomas Müller | 2014-07-23 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Prevent cron.php to trigger apps updating | Vincent Petry | 2014-07-23 | 1 | -0/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #9809 from owncloud/check-transaction-before-commit-migrat... | Thomas Müller | 2014-07-23 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | only commit in case a transaction is active | Thomas Müller | 2014-07-23 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #9788 from owncloud/design-app-styles | Vincent Petry | 2014-07-23 | 1 | -9/+2 |
|\ \ \ \ | |||||
| * | | | | fix settings entry width | Jan-Christoph Borchardt | 2014-07-23 | 1 | -1/+1 |
| * | | | | remove superfluous border from settings entry | Jan-Christoph Borchardt | 2014-07-23 | 1 | -1/+0 |
| * | | | | simplify app navigation look, remove superfluous border as it is distinguishe... | Jan-Christoph Borchardt | 2014-07-23 | 1 | -7/+1 |
| |/ / / | |||||
* | | | | Merge pull request #9789 from owncloud/external-share-root | icewind1991 | 2014-07-23 | 1 | -2/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix remote share when remote server is installed at the root | Robin Appelman | 2014-07-23 | 1 | -2/+7 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-23 | 12 | -27/+27 |
* | | | Revert change | Sander | 2014-07-22 | 1 | -2/+2 |
* | | | Allow getAppFolder to get another apps path | Sander | 2014-07-22 | 1 | -3/+2 |
* | | | 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 | 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` | Lukas Reschke | 2014-07-19 | 1 | -2/+2 |