summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18076 from owncloud/fix-thumbnail-api-masterThomas Müller2015-08-191-1/+1
|\ | | | | No need to url decode the file
| * No need to url decode the fileThomas Müller2015-08-051-1/+1
| |
* | Merge pull request #18339 from owncloud/update-jquery-visibilityThomas Müller2015-08-192-24/+81
|\ \ | | | | | | update jquery-visibility in files app
| * | update jquery-visibility in files appMorris Jobke2015-08-172-24/+81
| | | | | | | | | | | | * ref #12877
* | | Merge pull request #14401 from owncloud/ux-s2s-ldapThomas Müller2015-08-195-13/+106
|\ \ \ | | | | | | | | allow login names to be used for s2s with LDAP users
| * | | adjust to current masterArthur Schiwon2015-04-131-3/+2
| | | |
| * | | fix and more robustness thx to scrutinizerArthur Schiwon2015-04-131-1/+4
| | | |
| * | | allow login names to be used for s2s with LDAP usersArthur Schiwon2015-04-135-12/+103
| | | |
* | | | Merge pull request #18287 from owncloud/smb-1.0.3Thomas Müller2015-08-1822-1017/+136
|\ \ \ \ | | | | | | | | | | update icewind/smb to 1.0.4
| * | | | update icewind/smb to 1.0.4Robin Appelman2015-08-1711-43/+99
| | | | |
| * | | | remove travis filesRobin Appelman2015-08-143-66/+2
| | | | |
| * | | | update icewind/smb to 1.0.3Robin Appelman2015-08-1319-954/+81
| | | | |
* | | | | Merge pull request #18389 from owncloud/fix-17770Morris Jobke2015-08-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix extracting basename from path in sharing
| * | | | | Fix extracting basename from path in sharingRobin McCorkell2015-08-181-1/+1
| | | | | |
* | | | | | Merge pull request #18381 from owncloud/public-share-fixdepsloadingMorris Jobke2015-08-182-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix file actions menu in public page
| * | | | | | Only show delete action in menu when delete permission existsVincent Petry2015-08-181-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 pageVincent Petry2015-08-181-0/+1
| |/ / / / /
* | | | | | Merge pull request #18310 from hasso/selection-string-fixVincent Petry2015-08-182-10/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix the string counting a selected files/dirs
| * | | | | Move decaration to the beginning of the blockHasso Tepper2015-08-181-3/+5
| | | | | |
| * | | | | Update unit test to reflect the string changeHasso Tepper2015-08-171-1/+1
| | | | | |
| * | | | | Move selectionVars into if statementHasso Tepper2015-08-171-5/+4
| | | | | |
| * | | | | Fix the string counting a selected files/dirsHasso Tepper2015-08-141-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_sizeRobin McCorkell2015-08-172-1/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Update .user.ini when setting upload size limit
| * | | | | Update .user.ini when setting upload size limitRobin McCorkell2015-07-202-1/+4
| | | | | |
* | | | | | Merge pull request #18318 from owncloud/files-sidebar-fixtabsMorris Jobke2015-08-167-83/+199
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve right sidebar tabs behavior
| * | | | | | Improve right sidebar tabs behaviorVincent Petry2015-08-147-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_capabilityThomas Müller2015-08-142-0/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add public upload to capability
| * | | | | | | Add public upload to capabilityRoeland Jago Douma2015-08-142-0/+21
| | |_|/ / / / | |/| | | | |
* / | | | | | Integration in files app to load scripts and styles on requestThomas Müller2015-08-141-0/+3
|/ / / / / /
* | | | | | Merge pull request #18271 from ↵Thomas Müller2015-08-142-16/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | owncloud/issue-18261-sharing-capabilities-use-wrong-default Fix default values of sharing capabilities
| * | | | | Fix config map provider for testsJoas Schilling2015-08-131-11/+11
| | | | | |
| * | | | | Fix default values of sharing capabilitiesJoas Schilling2015-08-131-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-actionsJan-Christoph Borchardt2015-08-1314-265/+494
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Sidebar file actions
| * | | | | Make file actions work from sidebarVincent Petry2015-08-1212-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 FileInfoModelVincent Petry2015-08-122-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 extendingJoas Schilling2015-08-131-0/+82
| |/ / / / |/| | | |
* | | | | Merge pull request #16543 from rullzer/files_sharing_proper_function_argsVincent Petry2015-08-132-25/+70
|\ \ \ \ \ | | | | | | | | | | | | files_sharing private function to proper signature
| * | | | | Extend tests for files_sharing apiRoeland Jago Douma2015-08-111-0/+48
| | | | | |
| * | | | | Move private functions to proper list of argumentsRoeland Jago Douma2015-08-111-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-temporaryVincent Petry2015-08-131-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show storage full warning for shared storages temporary
| * | | | | | Show strage full warning for shared storages temporaryMorris Jobke2015-08-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed the setDefault call because then it will always be reshown * was added with ba475d486258c0b7ea86cd766814053df6c69170 * fixes #18208
* | | | | | | replace tipsys with tooltipsHendrik Leppelsack2015-08-123-7/+13
|/ / / / / /
* | | | | | Merge pull request #18065 from owncloud/new-trashbin-retentionThomas Müller2015-08-126-34/+400
|\ \ \ \ \ \ | | | | | | | | | | | | | | New trashbin retention
| * | | | | | Fix testsVictor Dubiniuk2015-08-101-7/+1
| | | | | | |
| * | | | | | Migrate settingsVictor Dubiniuk2015-08-103-20/+93
| | | | | | |
| * | | | | | Enhance trashbin expiration settingsVictor Dubiniuk2015-08-105-26/+325
| | | | | | |
* | | | | | | Merge pull request #17865 from rullzer/less_static_prov_apiThomas Müller2015-08-128-458/+1128
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move Provisioning API to OCP
| * | | | | | | Check for userSession->getUser() === nullRoeland Jago Douma2015-08-113-25/+69
| | | | | | | |
| * | | | | | | [provisioning api] Fix grouptestRoeland Jago Douma2015-08-111-1/+1
| | | | | | | |
| * | | | | | | [provisioning api] Test for correct displaynameRoeland Jago Douma2015-08-112-1/+4
| | | | | | | |