Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #17231 from owncloud/add-missing-version-field | Morris Jobke | 2015-06-29 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Typehint $targetVersion | Lukas Reschke | 2015-06-29 | 1 | -4/+4 | |
* | | | | | | | | Merge pull request #17229 from owncloud/maintenance-plugin-test | Joas Schilling | 2015-06-29 | 1 | -3/+17 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixing ctor calls and ctor itself to not break usage in calendar and contacts... | Thomas Müller | 2015-06-29 | 1 | -1/+1 | |
| * | | | | | | | Unit tests added for MaintenancePlugin | Thomas Müller | 2015-06-29 | 1 | -3/+17 | |
* | | | | | | | | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store | Lukas Reschke | 2015-06-29 | 3 | -14/+27 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Send OC version to appstore so it can reply with the right links | Joas Schilling | 2015-06-29 | 3 | -14/+27 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #17030 from owncloud/lock-posthooks | Joas Schilling | 2015-06-29 | 2 | -21/+21 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove test-specific method to make Bjoern and Joas happy | Vincent Petry | 2015-06-26 | 1 | -9/+0 | |
| * | | | | | | | Keep shared locks in post hooks | Vincent Petry | 2015-06-25 | 3 | -21/+30 | |
* | | | | | | | | Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance | Morris Jobke | 2015-06-29 | 1 | -11/+13 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | In case of maintenance we should add a message to the exception | Thomas Müller | 2015-06-29 | 1 | -11/+13 | |
* | | | | | | | | Merge pull request #17050 from owncloud/request-status-from-ocs | Lukas Reschke | 2015-06-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Request approved state for disabled apps with ocsid | Lukas Reschke | 2015-06-19 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #17217 from owncloud/use-new-updater-url | Thomas Müller | 2015-06-29 | 1 | -13/+22 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use new updater URL + add unit tests | Lukas Reschke | 2015-06-28 | 1 | -13/+22 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-29 | 12 | -4/+22 | |
|/ / / / / / / | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-28 | 12 | -0/+26 | |
* | | | | | | | Fix indentation | Lukas Reschke | 2015-06-27 | 1 | -15/+15 | |
* | | | | | | | Add missing annotations for parameters | Lukas Reschke | 2015-06-27 | 4 | -26/+36 | |
* | | | | | | | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 145 | -97/+242 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | update license headers and authors | Morris Jobke | 2015-06-25 | 145 | -97/+242 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #17206 from oparoz/bpg-media-type | Roeland Douma | 2015-06-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Adding BPG media type | Olivier Paroz | 2015-06-26 | 1 | -0/+1 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-27 | 2 | -0/+12 | |
* | | | | | | | | Merge pull request #17071 from owncloud/share-get-users-non-existing | Vincent Petry | 2015-06-26 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix getUsersSharingFile with locking | Robin Appelman | 2015-06-26 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #17191 from owncloud/issue-17188-group-share-part-file | Thomas Müller | 2015-06-26 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Correctly check if the real file exists, otherwise try the part file | Joas Schilling | 2015-06-26 | 1 | -2/+6 | |
* | | | | | | | | | Merge pull request #17008 from owncloud/fix-17006 | Björn Schießle | 2015-06-26 | 3 | -23/+70 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use \OC\HintException and translate the hint | Joas Schilling | 2015-06-22 | 4 | -34/+10 | |
| * | | | | | | | | Merge spliteUserRemote with fixRemoteUrlInShareWith | Joas Schilling | 2015-06-22 | 2 | -25/+44 | |
| * | | | | | | | | make sure that we split username and server address at the first '@' from the... | Bjoern Schiessle | 2015-06-22 | 3 | -1/+53 | |
* | | | | | | | | | Merge pull request #17009 from owncloud/lock-downloadfile | Thomas Müller | 2015-06-26 | 1 | -6/+21 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Enable x-sendfile only if we do not lock the file system | Thomas Müller | 2015-06-22 | 1 | -4/+8 | |
| * | | | | | | | | Lock file before download | Vincent Petry | 2015-06-18 | 1 | -2/+13 | |
* | | | | | | | | | Merge pull request #17165 from owncloud/federated_cloud_sharing_search_addres... | Thomas Müller | 2015-06-26 | 1 | -3/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ne need to check twice if $row['share_with'] is set | Bjoern Schiessle | 2015-06-25 | 1 | -1/+1 | |
| * | | | | | | | | | show nice display name for remote shares if possible | Bjoern Schiessle | 2015-06-25 | 1 | -2/+11 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-26 | 2 | -0/+2 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-25 | 2 | -0/+2 | |
| |_|_|_|/ / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #17070 from owncloud/lock-movemountbug | Vincent Petry | 2015-06-24 | 2 | -23/+62 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Rollback folder scan if an entry was locked | Vincent Petry | 2015-06-24 | 1 | -0/+5 | |
| * | | | | | | | | Fix locked paths in the moveMount case | Vincent Petry | 2015-06-24 | 1 | -23/+57 | |
* | | | | | | | | | Merge pull request #17110 from owncloud/share-error-handling | Morris Jobke | 2015-06-24 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [sharing] handle shares of users that aren't available anymore | Morris Jobke | 2015-06-23 | 1 | -0/+1 | |
* | | | | | | | | | | Merge pull request #17136 from rullzer/fix_remove_link_OCS | Lukas Reschke | 2015-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | set NULL correctly in password update | Roeland Jago Douma | 2015-06-24 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #17130 from owncloud/update-mime-types | Thomas Müller | 2015-06-24 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107 | Thomas Müller | 2015-06-24 | 1 | -1/+3 | |
| |/ / / / / / / / |