Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix race condition when switching filter mode. Fixes #22278 | Arthur Schiwon | 2016-02-12 | 4 | -5/+32 |
* | Merge pull request #22354 from owncloud/only-register-when-available | Thomas Müller | 2016-02-12 | 1 | -2/+1 |
|\ | |||||
| * | Only register admin page when update is available | Lukas Reschke | 2016-02-12 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #21832 from owncloud/reduce-user-object-issues | Thomas Müller | 2016-02-12 | 1 | -15/+10 |
|\ | |||||
| * | Always set up a config object within the user object | Morris Jobke | 2016-02-12 | 1 | -15/+10 |
|/ | |||||
* | Merge pull request #22349 from owncloud/icon-updates | Thomas Müller | 2016-02-12 | 5 | -2/+13 |
|\ | |||||
| * | add proper comment icon and add it to icons.css | Jan-Christoph Borchardt | 2016-02-12 | 3 | -2/+6 |
| * | add white delete icon | Jan-Christoph Borchardt | 2016-02-12 | 3 | -0/+7 |
* | | Merge pull request #21837 from owncloud/recipients-error-message | Thomas Müller | 2016-02-12 | 1 | -2/+28 |
|\ \ | |||||
| * | | Clear error when removing text | Roeland Jago Douma | 2016-02-12 | 1 | -1/+16 |
| * | | Update tooltip on new search | Roeland Jago Douma | 2016-02-12 | 1 | -8/+12 |
| * | | First try for shareWithField error message | Julian Müller | 2016-02-12 | 1 | -0/+7 |
* | | | Merge pull request #22292 from owncloud/smb-handle-forbidden | Thomas Müller | 2016-02-12 | 1 | -1/+18 |
|\ \ \ | |||||
| * | | | handle forbidden exceptions in smb backend | Robin Appelman | 2016-02-10 | 1 | -1/+18 |
* | | | | Merge pull request #22294 from owncloud/carddav-report-list-groups-2 | Thomas Müller | 2016-02-12 | 5 | -2/+119 |
|\ \ \ \ | |||||
| * | | | | Adding a custom webdav property which holds the list of contacts groups | Thomas Müller | 2016-02-10 | 5 | -2/+119 |
* | | | | | Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298 | Thomas Müller | 2016-02-12 | 2 | -6/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Reload list of shares on directory change | Roeland Jago Douma | 2016-02-11 | 2 | -1/+11 |
| * | | | | | Calculate the share statuses in js from the OCS Response | Roeland Jago Douma | 2016-02-11 | 1 | -6/+12 |
* | | | | | | Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link | Thomas Müller | 2016-02-12 | 2 | -14/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix unit tests | Roeland Jago Douma | 2016-02-11 | 1 | -12/+2 |
| * | | | | | | Do not getShare in deleteShare, it's already there when deleting | Joas Schilling | 2016-02-11 | 1 | -2/+2 |
* | | | | | | | Merge pull request #22317 from owncloud/fix_invisible_linkshares | Thomas Müller | 2016-02-12 | 6 | -32/+214 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Fix migration step to avoind invisible shares | Roeland Jago Douma | 2016-02-11 | 2 | -32/+63 |
| * | | | | | | Add tests | Roeland Jago Douma | 2016-02-11 | 1 | -0/+120 |
| * | | | | | | Add parent for invisible link shares | Roeland Jago Douma | 2016-02-11 | 3 | -0/+31 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-12 | 210 | -360/+328 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #22334 from owncloud/files_videoplayer_it_is | Thomas Müller | 2016-02-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Mark files_videoplayer as shipped | Lukas Reschke | 2016-02-11 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #22314 from owncloud/fix-mariadb-autotest | Thomas Müller | 2016-02-11 | 2 | -4/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use official mariadb docker | Thomas Müller | 2016-02-11 | 2 | -1/+7 |
| * | | | | | | Wait until mariadb is up and running | Thomas Müller | 2016-02-11 | 1 | -3/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #22320 from owncloud/files_external-crypt | Thomas Müller | 2016-02-11 | 3 | -5/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | encrypt passwords for files_external | Robin Appelman | 2016-02-11 | 3 | -5/+35 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22315 from owncloud/update-info-checker-requirements | Thomas Müller | 2016-02-11 | 2 | -13/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update info checker requirements | Joas Schilling | 2016-02-11 | 2 | -13/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #22264 from owncloud/read-version-from-info.xml-only | Thomas Müller | 2016-02-11 | 6 | -19/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | No longer evaluate appinfo/version | Thomas Müller | 2016-02-10 | 6 | -19/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #22322 from owncloud/fix-typo | Thomas Müller | 2016-02-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo | Morris Jobke | 2016-02-11 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on... | Thomas Müller | 2016-02-11 | 3 | -4/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Delete the notification when the owner unshares the remote before the user di... | Joas Schilling | 2016-02-11 | 1 | -0/+7 |
| * | | | | | | Remove the notification if accepting/declining failed because of 404 | Joas Schilling | 2016-02-11 | 2 | -4/+10 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22308 from owncloud/shorter-ttl-find-path | Thomas Müller | 2016-02-11 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixes #13658 | Thomas Müller | 2016-02-11 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22290 from owncloud/dav-upload-scan-in-lock | Thomas Müller | 2016-02-11 | 1 | -5/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | also fix lock order for chunked dav uploads | Robin Appelman | 2016-02-10 | 1 | -2/+2 |
| * | | | | | scan the file in the write lock when uploading over dav | Robin Appelman | 2016-02-10 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22316 from owncloud/fix_22309 | Morris Jobke | 2016-02-11 | 2 | -3/+10 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Properly check for legacy methods | Roeland Jago Douma | 2016-02-11 | 2 | -3/+10 |
|/ / / / |