| Commit message (Expand) | Author | Age | Files | Lines |
* | [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 |
| |/ / / / / |
|
* | | | | | | 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 |