Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #10223 from dannosaur/patch-1 | Jan-Christoph Borchardt | 2014-08-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix tiny thumbnails in public preview/share mode | Dan Jones | 2014-08-06 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #10218 from owncloud/pzy-master | Thomas Müller | 2014-08-07 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Update public.php | pzy | 2014-08-07 | 1 | -0/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travis | Thomas Müller | 2014-08-07 | 4 | -3/+62 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Disable encryption migration tests | Morris Jobke | 2014-08-05 | 1 | -0/+8 | |
| * | | | | | | mark tests as skipped - TODO travis | Morris Jobke | 2014-08-05 | 1 | -0/+49 | |
| * | | | | | | Minor fixes | Morris Jobke | 2014-08-05 | 2 | -3/+5 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-07 | 3 | -5/+5 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #10186 from owncloud/versioning_fix_path | Thomas Müller | 2014-08-06 | 2 | -2/+36 | |
|\ \ \ \ \ | ||||||
| * | | | | | add unit test to make sure getVersions returns the correct result | Bjoern Schiessle | 2014-08-05 | 1 | -0/+34 | |
| * | | | | | make sure that the versions array contains the correct path | Bjoern Schiessle | 2014-08-05 | 1 | -2/+2 | |
* | | | | | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slash | Morris Jobke | 2014-08-05 | 1 | -1/+0 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | remove unused variable | Bjoern Schiessle | 2014-08-05 | 1 | -1/+0 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #10168 from owncloud/parallel-download-on-public-shared-fo... | Morris Jobke | 2014-08-05 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | close session right before the download starts - this enables parallel downloads | Thomas Müller | 2014-08-05 | 1 | -0/+1 | |
| |/ / / / | ||||||
* / / / / | Hack to avoid Agent DN + Password being overwritten by some ugly browsers wit... | Arthur Schiwon | 2014-08-05 | 2 | -0/+12 | |
|/ / / / | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-05 | 1 | -2/+2 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-04 | 1 | -0/+1 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-02 | 5 | -3/+6 | |
* | | | | Merge pull request #9529 from helmutschneider/fix-8326 | Robin Appelman | 2014-08-01 | 1 | -17/+12 | |
|\ \ \ \ | ||||||
| * | | | | Converted an array to PHP5.3 compatible version | Johan Björk | 2014-07-09 | 1 | -2/+2 | |
| * | | | | Fixes #8326: deletion of directories on S3 | Johan Björk | 2014-07-08 | 1 | -17/+12 | |
* | | | | | Merge pull request #10067 from owncloud/fix-#9119 | Morris Jobke | 2014-08-01 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Quick fix for #9119. Increase preview to keep empty message more centered and... | Remco Brenninkmeijer | 2014-07-30 | 1 | -1/+1 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-01 | 1 | -3/+3 | |
* | | | | | | Merge pull request #10048 from owncloud/fix_search_in_shared_files | Jörn Friedrich Dreyer | 2014-07-31 | 2 | -62/+101 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add test for search() in shared cache | Jörn Friedrich Dreyer | 2014-07-31 | 1 | -3/+75 | |
| * | | | | | | traverse folders in php to search in shared files | Jörn Friedrich Dreyer | 2014-07-31 | 1 | -59/+26 | |
* | | | | | | | Merge pull request #10051 from owncloud/preview-empty-text | Thomas Müller | 2014-07-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use svg mimeicons for empty text files | Robin Appelman | 2014-07-30 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
* | / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-31 | 41 | -1/+48 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #10054 from owncloud/dont_preload_videos | Jan-Christoph Borchardt | 2014-07-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | don't preload videos on public sharing, fixes #10042 | Georg Ehrke | 2014-07-30 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #10024 from owncloud/preview-restrict-height | Morris Jobke | 2014-07-30 | 1 | -4/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Also keep maxY into account when scaling a preview while preserving aspect ratio | Robin Appelman | 2014-07-30 | 1 | -4/+0 | |
| |/ / / / / | ||||||
* | | | | | | add unit test for rename and copy operation | Bjoern Schiessle | 2014-07-30 | 4 | -7/+171 | |
* | | | | | | make sure that we always find all versions | Bjoern Schiessle | 2014-07-30 | 1 | -22/+37 | |
* | | | | | | make the versions and encryption app aware of the copy operation | Bjoern Schiessle | 2014-07-30 | 5 | -14/+65 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook | Björn Schießle | 2014-07-29 | 1 | -4/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | define type in pre hook | Bjoern Schiessle | 2014-07-18 | 1 | -4/+7 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #9951 from owncloud/enc_inproved_error_messages | Björn Schießle | 2014-07-29 | 3 | -3/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | show a warning in the personal settings and admin settins if the encyption ke... | Bjoern Schiessle | 2014-07-28 | 3 | -3/+13 | |
* | | | | | | Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview | Björn Schießle | 2014-07-29 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | update attributes for share with user list, file should always have delete pe... | Bjoern Schiessle | 2014-07-28 | 1 | -0/+3 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-29 | 4 | -3/+17 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date | Björn Schießle | 2014-07-28 | 2 | -3/+100 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | adjust error code | Bjoern Schiessle | 2014-07-28 | 1 | -2/+2 | |
| * | | | | | | add OCS api call to set expire date for link shares | Bjoern Schiessle | 2014-07-25 | 2 | -2/+99 | |
* | | | | | | | Merge pull request #9585 from owncloud/design-fix-public-footer | Jan-Christoph Borchardt | 2014-07-28 | 1 | -16/+0 | |
|\ \ \ \ \ \ \ |