| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | | 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 |
| |/ / / / / / |
|
* | | | | | | | Merge pull request #17106 from owncloud/htaccess-update-only-once | Morris Jobke | 2015-06-24 | 1 | -4/+14 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Only update the htaccess ErrorDocument links when they are not set yet | Joas Schilling | 2015-06-23 | 1 | -4/+14 |
* | | | | | | | Merge pull request #17095 from owncloud/proper-error-handling | Morris Jobke | 2015-06-23 | 2 | -4/+9 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | [updater] keep maintenance active on failure and mark failure in red | Morris Jobke | 2015-06-23 | 1 | -1/+1 |
| * | | | | | | [updater] propagate error case properly | Morris Jobke | 2015-06-23 | 1 | -2/+7 |
| * | | | | | | Added error message on initMountpoints exception | Morris Jobke | 2015-06-23 | 1 | -1/+1 |
| | |_|_|/ /
| |/| | | | |
|
* | | | | | | Merge pull request #17045 from owncloud/enc_improvements | Björn Schießle | 2015-06-23 | 1 | -3/+5 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | make sure that we always read the header from the original file | Bjoern Schiessle | 2015-06-23 | 1 | -3/+5 |
* | | | | | | [upgrade] print update message before running the update code | Morris Jobke | 2015-06-23 | 1 | -0/+1 |
| |/ / / /
|/| | | | |
|
* | | | | | Merge pull request #12546 from oparoz/patch-1 | Björn Schießle | 2015-06-22 | 1 | -21/+31 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-19 | 1 | -16/+12 |
| * | | | | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-18 | 1 | -16/+6 |
| * | | | | Move media type icon preview creation to its own method | Olivier Paroz | 2015-06-18 | 1 | -4/+25 |
| * | | | | Send the mime icon if we can't generate a preview | Olivier Paroz | 2015-06-18 | 1 | -1/+4 |
* | | | | | Merge pull request #16657 from owncloud/view-emit-path | Thomas Müller | 2015-06-22 | 1 | -2/+4 |
|\ \ \ \ \ |
|
| * | | | | | fix check if hooks should be emited in runHooks | Robin Appelman | 2015-06-15 | 1 | -1/+2 |
| * | | | | | emit hooks from a view as long as the path is inside the default root | Robin Appelman | 2015-06-02 | 1 | -1/+2 |
* | | | | | | Merge pull request #17056 from owncloud/appframework-type-cast | Bernhard Posselt | 2015-06-22 | 1 | -1/+1 |
|\ \ \ \ \ \ |
|
| * | | | | | | Allow multiple whitespace in type hints in AppFramework | Robin McCorkell | 2015-06-20 | 1 | -1/+1 |
* | | | | | | | Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm | Robin McCorkell | 2015-06-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Use proper type | Lukas Reschke | 2015-06-19 | 2 | -2/+2 |
| | |_|_|_|/
| |/| | | | |
|
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-20 | 2 | -0/+6 |
|/ / / / / |
|
* | | | | | Merge pull request #17041 from owncloud/ocp-since-checker | Morris Jobke | 2015-06-19 | 9 | -1/+28 |
|\ \ \ \ \ |
|
| * | | | | | Fix missing @since tags in OCP | Morris Jobke | 2015-06-19 | 9 | -1/+28 |
| | |_|/ /
| |/| | | |
|
* / | | | | Fix naming of param in private/server.php | Morris Jobke | 2015-06-19 | 1 | -5/+5 |
|/ / / / |
|
* | | | | Merge pull request #16889 from owncloud/group-sorting-fixes | Joas Schilling | 2015-06-19 | 2 | -0/+27 |
|\ \ \ \ |
|
| * | | | | Do not return backends but add a method to check for one | Joas Schilling | 2015-06-16 | 2 | -5/+19 |
| * | | | | Only sort by group name when LDAP is involved | Joas Schilling | 2015-06-16 | 2 | -0/+13 |
* | | | | | Merge pull request #16963 from owncloud/fileinfo-lock | Vincent Petry | 2015-06-18 | 3 | -29/+57 |
|\ \ \ \ \ |
|
| * | | | | | remove unneeded normalize | Robin Appelman | 2015-06-18 | 1 | -2/+0 |
| * | | | | | unlock the file if the file doesnt exists | Robin Appelman | 2015-06-18 | 1 | -0/+2 |
| * | | | | | use old cache data when locked | Robin Appelman | 2015-06-17 | 1 | -28/+49 |
| * | | | | | handle locked exceptions when getting file/directory info in sabre | Robin Appelman | 2015-06-17 | 2 | -1/+8 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge pull request #17017 from owncloud/cache-update-write-lock | Vincent Petry | 2015-06-18 | 4 | -34/+47 |
|\ \ \ \ \ |
|
| * | | | | | dont update the cache on rename fail | Robin Appelman | 2015-06-18 | 1 | -1/+1 |
| * | | | | | update noopscanner | Robin Appelman | 2015-06-18 | 1 | -3/+3 |
| * | | | | | extends phpdoc | Robin Appelman | 2015-06-18 | 1 | -3/+4 |
| * | | | | | update the file cache within the write lock | Robin Appelman | 2015-06-18 | 3 | -31/+43 |
| |/ / / / |
|