Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | backup the encryption key after the encryption was disabled so that the user | Bjoern Schiessle | 2014-05-13 | 9 | -22/+176 |
* | Merge pull request #8488 from owncloud/sabre-notfoundloglevel | Lukas Reschke | 2014-05-07 | 2 | -6/+20 |
|\ | |||||
| * | Some expected Sabre exceptions are now logged with DEBUG level | Vincent Petry | 2014-05-07 | 2 | -6/+20 |
* | | Merge pull request #8223 from owncloud/fix_linkToPublic | Vincent Petry | 2014-05-07 | 3 | -5/+231 |
|\ \ | |||||
| * | | Remove unused var | Thomas Tanghus | 2014-04-16 | 1 | -5/+0 |
| * | | Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBase | Thomas Tanghus | 2014-04-16 | 2 | -0/+223 |
| * | | Also fix linkToAbsolute | Thomas Tanghus | 2014-04-16 | 1 | -3/+7 |
| * | | Fix linkToPublic. Refs #8218 | Thomas Tanghus | 2014-04-15 | 1 | -2/+6 |
* | | | Merge pull request #8489 from owncloud/share_updater_ignore_part_files | Vincent Petry | 2014-05-07 | 2 | -1/+11 |
|\ \ \ | |||||
| * | | | check if we have a fileinfo | Bjoern Schiessle | 2014-05-07 | 1 | -1/+5 |
| * | | | ignore part files | Bjoern Schiessle | 2014-05-07 | 1 | -0/+6 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-07 | 55 | -225/+341 |
* | | | Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri | Vincent Petry | 2014-05-06 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | Send URI instead of filepath to NGINX for X-Accel | josh4trunks | 2014-04-03 | 1 | -1/+4 |
* | | | | Merge pull request #8466 from owncloud/fix-installation-caret | Morris Jobke | 2014-05-06 | 1 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | fix enlarged caret on installation page | Jan-Christoph Borchardt | 2014-05-06 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | Merge pull request #8459 from owncloud/fix-getUserFolder | Morris Jobke | 2014-05-05 | 1 | -2/+10 |
|\ \ \ \ | |||||
| * | | | | fix getUserFolder() of server container | Morris Jobke | 2014-05-05 | 1 | -2/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #8456 from owncloud/extstorage-unittestssuite | Thomas Müller | 2014-05-05 | 4 | -6/+2 |
|\ \ \ \ | |||||
| * | | | | Added ext storage app in autotest unit test run | Vincent Petry | 2014-05-05 | 4 | -6/+2 |
| |/ / / | |||||
* | | | | Merge pull request #8458 from snai/master | Vincent Petry | 2014-05-05 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Updated Owncloud Mailinglist URL | Martin Grohmann | 2014-05-05 | 1 | -1/+1 |
* | | | | | Merge pull request #8455 from owncloud/preview-scaleup | icewind1991 | 2014-05-05 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Dont create borders around previews when scaling up is disabled | Robin Appelman | 2014-05-05 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #8386 from owncloud/fix_6946_master | Vincent Petry | 2014-05-05 | 11 | -127/+95 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | the group manager calls exists check less often, adjust test accordingly | Arthur Schiwon | 2014-04-28 | 1 | -1/+1 |
| * | | | Group Database backend must not gather user details itself but ask user | Arthur Schiwon | 2014-04-28 | 11 | -127/+95 |
* | | | | Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master | Thomas Müller | 2014-05-05 | 14 | -76/+135 |
|\ \ \ \ | |||||
| * | | | | load image via javascript and use $(document).width() to determine the proper... | Thomas Müller | 2014-05-02 | 2 | -48/+62 |
| * | | | | Images on public sharing get downscaled to increase use experience - this wil... | Thomas Müller | 2014-05-02 | 13 | -32/+77 |
* | | | | | Merge pull request #8442 from owncloud/fix-typo | Thomas Müller | 2014-05-05 | 2 | -9/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Fix PHP Doc and use readable variable name | Lukas Reschke | 2014-05-04 | 1 | -6/+6 |
| * | | | | | Does also take int or string | Lukas Reschke | 2014-05-04 | 1 | -1/+1 |
| * | | | | | Fix typo | Lukas Reschke | 2014-05-04 | 1 | -2/+2 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-05 | 29 | -130/+209 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-04 | 243 | -1045/+1206 |
* | | | | | Merge pull request #8440 from wakeup/master | Andreas Fischer | 2014-05-03 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Update config.sample.php | Volkan Gezer | 2014-05-03 | 1 | -1/+1 |
| * | | | | | Minor changes in config.sample | Volkan Gezer | 2014-05-03 | 1 | -2/+2 |
* | | | | | | Merge pull request #8023 from flyser/master | Morris Jobke | 2014-05-03 | 3 | -3/+49 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add unit tests for OC_Helper::phpFileSize function | Fabian Henze | 2014-04-07 | 1 | -0/+22 |
| * | | | | | | Fix setting the max-upload-size for really large values. | Fabian Henze | 2014-04-03 | 2 | -3/+27 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-03 | 156 | -912/+818 |
* | | | | | | | Merge pull request #8171 from owncloud/fix-import | Bernhard Posselt | 2014-05-02 | 2 | -3/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add class Pimple to autloader | Thomas Müller | 2014-04-28 | 2 | -3/+1 |
| * | | | | | | | be nice and use a relative import so people can use the class without firing ... | Bernhard Posselt | 2014-04-12 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #8377 from youngguns-nl/issue_8376 | Vincent Petry | 2014-05-02 | 3 | -3/+29 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | refs #8376; spaces=>tabs | Sjors van der Pluijm | 2014-04-29 | 1 | -1/+1 |
| * | | | | | | | refs #8376; spaces=>tabs | Sjors van der Pluijm | 2014-04-28 | 1 | -1/+1 |
| * | | | | | | | refs #8376; added comment and applied patch on other files | Sjors van der Pluijm | 2014-04-28 | 3 | -2/+24 |