Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | only create a new share entry, if the user needs a different target name than... | Bjoern Schiessle | 2014-09-26 | 1 | -1/+1 |
* | for group shares we don't need a extra db entry of groupTarget equals itemTarget | Bjoern Schiessle | 2014-09-26 | 1 | -3/+3 |
* | for group shares only the parent has the up-to-date permission. Make sure tha... | Bjoern Schiessle | 2014-09-26 | 1 | -1/+12 |
* | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all c... | Bjoern Schiessle | 2014-09-25 | 3 | -35/+66 |
* | always select permissions, used in getItems() | Bjoern Schiessle | 2014-09-25 | 1 | -2/+3 |
* | some small fixes | Bjoern Schiessle | 2014-09-25 | 4 | -11/+6 |
* | clear share table after each test run | Bjoern Schiessle | 2014-09-24 | 1 | -0/+3 |
* | only add a new row if it isn't a unique share, otherwise update the existing row | Bjoern Schiessle | 2014-09-24 | 1 | -1/+1 |
* | mark exclude list as deprecated. It neither used by the files app nor by the | Bjoern Schiessle | 2014-09-24 | 1 | -1/+1 |
* | fix unit tests | Bjoern Schiessle | 2014-09-24 | 2 | -5/+22 |
* | fix add user to group to work with grouped shares | Bjoern Schiessle | 2014-09-24 | 1 | -10/+18 |
* | generateTarget() will always find a unique target | Bjoern Schiessle | 2014-09-24 | 2 | -96/+80 |
* | unit tests for grouping of shares pointing to the same source | Bjoern Schiessle | 2014-09-22 | 4 | -48/+155 |
* | group shares and combine permissions | Bjoern Schiessle | 2014-09-22 | 4 | -240/+278 |
* | 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 |
| * | | | | | | | | | | | Better tooltip handling of very long strings | Robin McCorkell | 2014-09-11 | 1 | -1/+1 |