| Commit message (Expand) | Author | Age | Files | Lines |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-18 | 30 | -28/+80 |
* | Merge pull request #11136 from owncloud/fix_body_id | Morris Jobke | 2014-09-17 | 1 | -0/+1 |
|\ |
|
| * | Error needs to push body-id for new guest layout | Remco Brenninkmeijer | 2014-09-17 | 1 | -0/+1 |
* | | Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix | Lukas Reschke | 2014-09-17 | 2 | -0/+14 |
|\ \
| |/
|/| |
|
| * | Tentative fix for legacy file actions unit test side effect | Vincent Petry | 2014-09-16 | 2 | -0/+14 |
* | | Merge pull request #9554 from owncloud/fix_preview_orientation | Lukas Reschke | 2014-09-17 | 2 | -2/+1 |
|\ \ |
|
| * | | fix orientation in image-backend, not in preview system itself | Georg Ehrke | 2014-07-09 | 2 | -2/+1 |
* | | | Merge pull request #10622 from owncloud/recursive-delete-forbidden | Lukas Reschke | 2014-09-17 | 7 | -17/+46 |
|\ \ \ |
|
| * | | | Fix mapping of relative paths | Lukas Reschke | 2014-09-17 | 2 | -15/+31 |
| * | | | Also check if the file itself is updatable | Robin Appelman | 2014-09-17 | 3 | -4/+4 |
| * | | | Check if a folder is deletable before we try to recursively delete it | Robin Appelman | 2014-09-17 | 5 | -2/+11 |
| * | | | Check if the parent is writable to check if a file is deletable | Robin Appelman | 2014-09-17 | 1 | -1/+5 |
* | | | | Merge pull request #10932 from owncloud/issue/10926 | Morris Jobke | 2014-09-17 | 3 | -1/+41 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Add unit test | Lukas Reschke | 2014-09-08 | 1 | -0/+19 |
| * | | | Add a method to get the absolute url for a route | Joas Schilling | 2014-09-08 | 2 | -1/+22 |
* | | | | Merge pull request #11092 from owncloud/conceal_sabredav_version | Lukas Reschke | 2014-09-17 | 1 | -0/+8 |
|\ \ \ \ |
|
| * | | | | Conceal or display SabreDAV version number in browser and http response headers. | scolebrook | 2014-09-16 | 1 | -0/+8 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-17 | 61 | -202/+170 |
* | | | | | Merge pull request #10745 from owncloud/fix-10708-doctrine | Lukas Reschke | 2014-09-16 | 2 | -9/+35 |
|\ \ \ \ \ |
|
| * | | | | | adding unit test to truncate the table | Thomas Müller | 2014-09-16 | 2 | -1/+32 |
| * | | | | | Use Doctrine Platform to generate SQL query for table truncation. | Andreas Fischer | 2014-08-29 | 1 | -8/+3 |
* | | | | | | Merge pull request #10902 from owncloud/fix-ellepsis | Lukas Reschke | 2014-09-16 | 2 | -0/+7 |
|\ \ \ \ \ \ |
|
| * | | | | | | Adding link to ellipsis and fixing styling | Clark Tomlinson | 2014-09-16 | 2 | -0/+7 |
* | | | | | | | Merge pull request #11009 from owncloud/tobiasKaminsky-route | Lukas Reschke | 2014-09-16 | 4 | -2/+99 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Route for thumbnail generation | tobiasKaminsky | 2014-09-16 | 4 | -2/+99 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | Merge pull request #11102 from owncloud/visit1985-issue_108 | Lukas Reschke | 2014-09-16 | 1 | -24/+38 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | simplify mysql user creation flow | Michael Göhler | 2014-09-16 | 1 | -24/+38 |
* | | | | | | | | Merge pull request #10896 from owncloud/undo-nav-entry | Morris Jobke | 2014-09-16 | 1 | -0/+35 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | add delete undo styles | Bernhard Posselt | 2014-09-16 | 1 | -0/+35 |
* | | | | | | | | | Merge pull request #7254 from owncloud/core-sortalgo | Lukas Reschke | 2014-09-16 | 9 | -4/+527 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Fixed sort algo for additional cases | Vincent Petry | 2014-08-11 | 4 | -3/+14 |
| * | | | | | | | | | Fixed file list sorting | Vincent Petry | 2014-08-11 | 9 | -4/+516 |
* | | | | | | | | | | Merge pull request #10680 from helmutschneider/aws-2.6.15 | Lukas Reschke | 2014-09-16 | 264 | -9790/+5917 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Fix failing AmazonS3::touch on updated aws sdk | Johan Björk | 2014-09-03 | 1 | -1/+2 |
| * | | | | | | | | | | Update AWS sdk to 2.6.15 | Johan Björk | 2014-09-03 | 263 | -9789/+5915 |
* | | | | | | | | | | | Merge pull request #11082 from owncloud/deduplicateDependencyCheck | Thomas Müller | 2014-09-16 | 1 | -70/+42 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Deduplicate dependency checks | Lukas Reschke | 2014-09-16 | 1 | -70/+42 |
* | | | | | | | | | | | | Merge pull request #11108 from owncloud/add-proper-descr | Lukas Reschke | 2014-09-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Reword the description | Lukas Reschke | 2014-09-16 | 1 | -1/+1 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #10754 from cetra3/master | Lukas Reschke | 2014-09-16 | 1 | -7/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|/ / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/owncloud/core | cetra3 | 2014-09-08 | 1738 | -512781/+6129 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Refactor internal session to write directly to $_SESSION | cetra3 | 2014-08-30 | 1 | -7/+37 |
* | | | | | | | | | | | | | Merge pull request #11055 from owncloud/replaceprodname | Thomas Müller | 2014-09-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | replace ownCloud with placeholder | Volkan Gezer | 2014-09-13 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge pull request #11084 from owncloud/no-migration-for-mssql-master | Lukas Reschke | 2014-09-16 | 2 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Disable database migrations for MSSQL - scripts have to be applied manually | Thomas Müller | 2014-09-15 | 2 | -0/+26 |
* | | | | | | | | | | | | | | | Merge pull request #11081 from owncloud/trash_fix_expire | Lukas Reschke | 2014-09-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | also expire file if timestamp = limit, happens if trashbin_retention_obligati... | Bjoern Schiessle | 2014-09-15 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge pull request #10663 from owncloud/files_trashbin_original_path | Morris Jobke | 2014-09-16 | 7 | -5/+79 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|/ / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | patch tipsy in style.css - don't patch 3rdparty libraries | Morris Jobke | 2014-09-16 | 2 | -1/+6 |