Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-18 | 6 | -0/+6 |
| | |||||
* | Merge pull request #10407 from owncloud/rm-obsolete-japanese | Lukas Reschke | 2014-08-17 | 1 | -17/+0 |
|\ | | | | | remove obsolete japanese lang code | ||||
| * | remove obsolete japanese lang code | Volkan Gezer | 2014-08-13 | 1 | -17/+0 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-17 | 7 | -0/+18 |
| | | |||||
* | | Merge pull request #10449 from owncloud/share-clientsidesortnoservercall | Lukas Reschke | 2014-08-15 | 1 | -0/+2 |
|\ \ | | | | | | | Client side sort for sharing overview | ||||
| * | | Client side sort for sharing overview | Vincent Petry | 2014-08-15 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | Since the server doesn't support sorting, use client side sort directly instead of calling reload() first. | ||||
* | | | ssl capital | Volkan Gezer | 2014-08-15 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #10398 from owncloud/external-share-ssl-warn | Robin Appelman | 2014-08-14 | 1 | -11/+17 |
|\ \ | |/ |/| | Give a better error message for external shares with self-signed ssl certificates | ||||
| * | Give a better error message for external shares with self-signed ssl ↵ | Robin Appelman | 2014-08-13 | 1 | -11/+17 |
| | | | | | | | | certificates | ||||
* | | Cast file id's to int so we can compare them properly | Robin Appelman | 2014-08-13 | 1 | -2/+2 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-13 | 1 | -1/+19 |
| | |||||
* | Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name | Robin Appelman | 2014-08-11 | 1 | -1/+1 |
|\ | | | | | use OC_Util::basename | ||||
| * | use OC_Util::basename | Robin Appelman | 2014-01-15 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-11 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-09 | 1 | -1/+22 |
| | | |||||
* | | only show "share with others" and "share by link" navigation bar entries if ↵ | Bjoern Schiessle | 2014-08-08 | 1 | -18/+22 |
| | | | | | | | | user is allowed to share files | ||||
* | | Merge pull request #10238 from ↵ | Thomas Müller | 2014-08-07 | 1 | -1/+4 |
|\ \ | | | | | | | | | | | | | owncloud/fix-public-download-with-encryption-master we can only close the session if encryption is not used | ||||
| * | | we can only close the session if encryption is not used | Thomas Müller | 2014-08-07 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #10184 from owncloud/getbyid-node | Robin Appelman | 2014-08-07 | 1 | -19/+5 |
|\ \ \ | | | | | | | | | Fix Folder::getById | ||||
| * | | | trim leading slash | Robin Appelman | 2014-08-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix SharedCache::getPathById | Robin Appelman | 2014-08-06 | 1 | -20/+6 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding link tag to enable facebook timeline previews | ||||
| * | | | | | Update public.php | pzy | 2014-08-07 | 1 | -0/+5 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added tag to make facebook load a preview picture Update public.php add check ifMimeSupported and put the thumbsize in a variable generate preview for all supported mimes | ||||
* | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travis | Thomas Müller | 2014-08-07 | 1 | -2/+4 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Travis support for PRs and master, stable5 and stable6 | ||||
| * | | | | Minor fixes | Morris Jobke | 2014-08-05 | 1 | -2/+4 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | * instanceof \OC\Files\View * fix misplaced paranthesis * remove misplaced character in comment | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-07 | 2 | -4/+4 |
| |/ / |/| | | |||||
* | | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slash | Morris Jobke | 2014-08-05 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | [sharing] remove trailing slash | ||||
| * | | remove unused variable | Bjoern Schiessle | 2014-08-05 | 1 | -1/+0 |
| | | | |||||
* | | | close session right before the download starts - this enables parallel downloads | Thomas Müller | 2014-08-05 | 1 | -0/+1 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-02 | 1 | -1/+1 |
| | | |||||
* | | 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 | ||||
| * | | Quick fix for #9119. Increase preview to keep empty message more centered ↵ | Remco Brenninkmeijer | 2014-07-30 | 1 | -1/+1 |
| | | | | | | | | | | | | and push footer down. | ||||
* | | | [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 |
|\ \ \ | |/ / |/| | | traverse folders in php to search in shared files | ||||
| * | | 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 #10054 from owncloud/dont_preload_videos | Jan-Christoph Borchardt | 2014-07-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | don't preload videos on public sharing, fixes #10042 | ||||
| * | | | don't preload videos on public sharing, fixes #10042 | Georg Ehrke | 2014-07-30 | 1 | -1/+1 |
| |/ / | |||||
* / / | Also keep maxY into account when scaling a preview while preserving aspect ratio | Robin Appelman | 2014-07-30 | 1 | -4/+0 |
|/ / | |||||
* | | 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 view | ||||
| * | | update attributes for share with user list, file should always have delete ↵ | Bjoern Schiessle | 2014-07-28 | 1 | -0/+3 |
| | | | | | | | | | | | | permissions, this means unshare in this context, and the overview page is always a root view | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-29 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date | Björn Schießle | 2014-07-28 | 2 | -3/+100 |
|\ \ | | | | | | | [share api] add OCS api call to set expire date for link shares | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | move public page footer rules from sharing app to core so it is used by other apps too | ||||
| * | | | move public page footer rules from sharing app to core so it is used by ↵ | Jan-Christoph Borchardt | 2014-07-07 | 1 | -16/+0 |
| | | | | | | | | | | | | | | | | other apps too | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-28 | 2 | -1/+9 |
| | | | |