Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -0/+2 |
|\ \ | |||||
| * | | Adding link to ellipsis and fixing styling | Clark Tomlinson | 2014-09-16 | 1 | -0/+2 |
* | | | Merge pull request #11009 from owncloud/tobiasKaminsky-route | Lukas Reschke | 2014-09-16 | 3 | -2/+93 |
|\ \ \ | |||||
| * | | | Route for thumbnail generation | tobiasKaminsky | 2014-09-16 | 3 | -2/+93 |
* | | | | Merge pull request #7254 from owncloud/core-sortalgo | Lukas Reschke | 2014-09-16 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fixed file list sorting | Vincent Petry | 2014-08-11 | 2 | -2/+2 |
* | | | | | 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 #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 | 5 | -5/+68 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show original path information in trashbin and sharing views | Robin McCorkell | 2014-09-11 | 5 | -5/+68 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-16 | 6 | -0/+15 |
* | | | | | | | Merge pull request #11060 from owncloud/rmobslang | Lukas Reschke | 2014-09-15 | 6 | -39/+0 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | remove obsolete language files | Volkan Gezer | 2014-09-13 | 6 | -39/+0 |
* | | | | | | | Merge pull request #11021 from owncloud/do-not-double-decode | Andreas Fischer | 2014-09-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Do not double decode values | Lukas Reschke | 2014-09-11 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-15 | 1 | -0/+3 |
* | | | | | | | Merge pull request #11050 from owncloud/enc-flockfix | Lukas Reschke | 2014-09-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove passing by reference to allow for proper GC | Vincent Petry | 2014-09-12 | 1 | -1/+1 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-14 | 1 | -0/+1 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-13 | 1 | -0/+1 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-12 | 3 | -0/+8 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #9698 from owncloud/fix-9666 | Thomas Müller | 2014-09-11 | 1 | -3/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix mkdir error in mountconfig.php | Robin McCorkell | 2014-09-10 | 1 | -1/+1 |
| * | | | | | | Load apps in test situations | Robin McCorkell | 2014-09-10 | 1 | -2/+0 |
| |/ / / / / | |||||
* / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-11 | 10 | -47/+251 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-10 | 14 | -1/+34 |
* | | | | | Merge pull request #10922 from owncloud/explicit-scan-transactions | Lukas Reschke | 2014-09-09 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Use bigger transactions when doing explicit file system scans | Robin Appelman | 2014-09-08 | 2 | -2/+2 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-09 | 39 | -40/+115 |
* | | | | | | Merge pull request #10739 from owncloud/eventsource-public | Lukas Reschke | 2014-09-08 | 2 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Better phpdoc and method naming | Robin Appelman | 2014-09-04 | 2 | -2/+2 |
| * | | | | | | Use the public api to get event sources | Robin Appelman | 2014-09-03 | 2 | -4/+4 |
* | | | | | | | Merge pull request #10885 from owncloud/swift-hasupdated | Lukas Reschke | 2014-09-08 | 2 | -20/+52 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix hasUpdated for folders in swift backend | Robin Appelman | 2014-09-05 | 1 | -0/+22 |
| * | | | | | | | Fix configuration of rackspace | Robin Appelman | 2014-09-05 | 2 | -20/+30 |
* | | | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_links | Lukas Reschke | 2014-09-08 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use a route instead of s.php and convert tokens asap | kondou | 2014-09-04 | 1 | -0/+4 |
* | | | | | | | | | Merge pull request #10938 from owncloud/useSecureMimetype | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use secure mimetype for content delivery | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #10890 from owncloud/fix-10888 | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | if only one attribute is requested, the returned array has 0 as key instead o... | Arthur Schiwon | 2014-09-05 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #10891 from owncloud/files-moveoperationcatchexception | Vincent Petry | 2014-09-08 | 1 | -4/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Catch exceptions when moving files | Vincent Petry | 2014-09-05 | 1 | -4/+10 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-07 | 5 | -4/+38 |