Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18076 from owncloud/fix-thumbnail-api-master | Thomas Müller | 2015-08-19 | 1 | -1/+1 |
|\ | | | | | No need to url decode the file | ||||
| * | No need to url decode the file | Thomas Müller | 2015-08-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #18339 from owncloud/update-jquery-visibility | Thomas Müller | 2015-08-19 | 2 | -24/+81 |
|\ \ | | | | | | | update jquery-visibility in files app | ||||
| * | | update jquery-visibility in files app | Morris Jobke | 2015-08-17 | 2 | -24/+81 |
| | | | | | | | | | | | | * ref #12877 | ||||
* | | | Merge pull request #14401 from owncloud/ux-s2s-ldap | Thomas Müller | 2015-08-19 | 5 | -13/+106 |
|\ \ \ | | | | | | | | | allow login names to be used for s2s with LDAP users | ||||
| * | | | adjust to current master | Arthur Schiwon | 2015-04-13 | 1 | -3/+2 |
| | | | | |||||
| * | | | fix and more robustness thx to scrutinizer | Arthur Schiwon | 2015-04-13 | 1 | -1/+4 |
| | | | | |||||
| * | | | allow login names to be used for s2s with LDAP users | Arthur Schiwon | 2015-04-13 | 5 | -12/+103 |
| | | | | |||||
* | | | | Merge pull request #18287 from owncloud/smb-1.0.3 | Thomas Müller | 2015-08-18 | 22 | -1017/+136 |
|\ \ \ \ | | | | | | | | | | | update icewind/smb to 1.0.4 | ||||
| * | | | | update icewind/smb to 1.0.4 | Robin Appelman | 2015-08-17 | 11 | -43/+99 |
| | | | | | |||||
| * | | | | remove travis files | Robin Appelman | 2015-08-14 | 3 | -66/+2 |
| | | | | | |||||
| * | | | | update icewind/smb to 1.0.3 | Robin Appelman | 2015-08-13 | 19 | -954/+81 |
| | | | | | |||||
* | | | | | Merge pull request #18389 from owncloud/fix-17770 | Morris Jobke | 2015-08-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix extracting basename from path in sharing | ||||
| * | | | | | Fix extracting basename from path in sharing | Robin McCorkell | 2015-08-18 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #18381 from owncloud/public-share-fixdepsloading | Morris Jobke | 2015-08-18 | 2 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix file actions menu in public page | ||||
| * | | | | | | Only show delete action in menu when delete permission exists | Vincent Petry | 2015-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts an older decision where we said the delete action must always appear but be grayed out when the permission is missing. The actions menu obsoletes that. | ||||
| * | | | | | | Load missing JS dep in public link page | Vincent Petry | 2015-08-18 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #18310 from hasso/selection-string-fix | Vincent Petry | 2015-08-18 | 2 | -10/+18 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix the string counting a selected files/dirs | ||||
| * | | | | | Move decaration to the beginning of the block | Hasso Tepper | 2015-08-18 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Update unit test to reflect the string change | Hasso Tepper | 2015-08-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Move selectionVars into if statement | Hasso Tepper | 2015-08-17 | 1 | -5/+4 |
| | | | | | | |||||
| * | | | | | Fix the string counting a selected files/dirs | Hasso Tepper | 2015-08-14 | 1 | -9/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old one contains untranslatable ' & ' if both files and dirs are selected. The new code is especially designed to reuse strings from file listing summary view (apps/files/js/filesummary.js), so no translation is broken. | ||||
* | | | | | | Merge pull request #17182 from owncloud/user_ini_upload_size | Robin McCorkell | 2015-08-17 | 2 | -1/+4 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Update .user.ini when setting upload size limit | ||||
| * | | | | | Update .user.ini when setting upload size limit | Robin McCorkell | 2015-07-20 | 2 | -1/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #18318 from owncloud/files-sidebar-fixtabs | Morris Jobke | 2015-08-16 | 7 | -83/+199 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve right sidebar tabs behavior | ||||
| * | | | | | | Improve right sidebar tabs behavior | Vincent Petry | 2015-08-14 | 7 | -83/+199 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tab heads are not rendered if only one tab. The tab contents is updated on-demand. This means that if a tab is not visible it is not rendered at first. If the tab was already rendered through switching, its model will not get updated until the next time it becomes visible. This will prevent needless rerendering of invisible tab contents, especially considering that some tabs might need extra ajax requests. | ||||
* | | | | | | | Merge pull request #18320 from owncloud/public_upload_capability | Thomas Müller | 2015-08-14 | 2 | -0/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add public upload to capability | ||||
| * | | | | | | | Add public upload to capability | Roeland Jago Douma | 2015-08-14 | 2 | -0/+21 |
| | |_|/ / / / | |/| | | | | | |||||
* / | | | | | | Integration in files app to load scripts and styles on request | Thomas Müller | 2015-08-14 | 1 | -0/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #18271 from ↵ | Thomas Müller | 2015-08-14 | 2 | -16/+16 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | owncloud/issue-18261-sharing-capabilities-use-wrong-default Fix default values of sharing capabilities | ||||
| * | | | | | Fix config map provider for tests | Joas Schilling | 2015-08-13 | 1 | -11/+11 |
| | | | | | | |||||
| * | | | | | Fix default values of sharing capabilities | Joas Schilling | 2015-08-13 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is the UI used a different default than the capabilities. So when you never touched the config, the setting in admins said "disabled" while the capabilities said "enabled". | ||||
* | | | | | | Merge pull request #18178 from owncloud/files-sidebar-actions | Jan-Christoph Borchardt | 2015-08-13 | 14 | -265/+494 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Sidebar file actions | ||||
| * | | | | | Make file actions work from sidebar | Vincent Petry | 2015-08-12 | 12 | -265/+422 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The favorite icon in the sidebar now triggers the file action and also updates itself according to the model's state when triggered from the file row. The thumbnail triggers the default action. Currently only one FileInfoModel is used for the selection and state synchronization between views. FileList reload now auto-closes the sidebar. | ||||
| * | | | | | Introduce FileInfoModel | Vincent Petry | 2015-08-12 | 2 | -0/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileInfoModel is a backbone model that will make it possible to track changes and update views accordingly | ||||
* | | | | | | Add a basic unit test which notifies us about incompatible extending | Joas Schilling | 2015-08-13 | 1 | -0/+82 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #16543 from rullzer/files_sharing_proper_function_args | Vincent Petry | 2015-08-13 | 2 | -25/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | files_sharing private function to proper signature | ||||
| * | | | | | Extend tests for files_sharing api | Roeland Jago Douma | 2015-08-11 | 1 | -0/+48 |
| | | | | | | |||||
| * | | | | | Move private functions to proper list of arguments | Roeland Jago Douma | 2015-08-11 | 1 | -25/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some private static functions in the OCS Share API (files_sharing/api/local.php) take a params array with all the info inside. This is bad for the limited type checking and is not clear. | ||||
* | | | | | | Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporary | Vincent Petry | 2015-08-13 | 1 | -3/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Show storage full warning for shared storages temporary | ||||
| * | | | | | | Show strage full warning for shared storages temporary | Morris Jobke | 2015-08-12 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed the setDefault call because then it will always be reshown * was added with ba475d486258c0b7ea86cd766814053df6c69170 * fixes #18208 | ||||
* | | | | | | | replace tipsys with tooltips | Hendrik Leppelsack | 2015-08-12 | 3 | -7/+13 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #18065 from owncloud/new-trashbin-retention | Thomas Müller | 2015-08-12 | 6 | -34/+400 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | New trashbin retention | ||||
| * | | | | | | Fix tests | Victor Dubiniuk | 2015-08-10 | 1 | -7/+1 |
| | | | | | | | |||||
| * | | | | | | Migrate settings | Victor Dubiniuk | 2015-08-10 | 3 | -20/+93 |
| | | | | | | | |||||
| * | | | | | | Enhance trashbin expiration settings | Victor Dubiniuk | 2015-08-10 | 5 | -26/+325 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17865 from rullzer/less_static_prov_api | Thomas Müller | 2015-08-12 | 8 | -458/+1128 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move Provisioning API to OCP | ||||
| * | | | | | | | Check for userSession->getUser() === null | Roeland Jago Douma | 2015-08-11 | 3 | -25/+69 |
| | | | | | | | | |||||
| * | | | | | | | [provisioning api] Fix grouptest | Roeland Jago Douma | 2015-08-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | [provisioning api] Test for correct displayname | Roeland Jago Douma | 2015-08-11 | 2 | -1/+4 |
| | | | | | | | |