summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18287 from owncloud/smb-1.0.3Thomas Müller2015-08-1822-1017/+136
|\
| * 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 sharingRobin McCorkell2015-08-181-1/+1
* | | Merge pull request #18381 from owncloud/public-share-fixdepsloadingMorris Jobke2015-08-182-1/+2
|\ \ \
| * | | Only show delete action in menu when delete permission existsVincent Petry2015-08-181-1/+1
| * | | 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
|\ \ \ | |/ / |/| |
| * | 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
* | | Merge pull request #17182 from owncloud/user_ini_upload_sizeRobin McCorkell2015-08-172-1/+4
|\ \ \
| * | | 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 behaviorVincent Petry2015-08-147-83/+199
* | | | | Merge pull request #18320 from owncloud/public_upload_capabilityThomas Müller2015-08-142-0/+21
|\ \ \ \ \
| * | | | | 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 owncloud/issue-18261-sharing-capabilities-use-...Thomas Müller2015-08-142-16/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Fix config map provider for testsJoas Schilling2015-08-131-11/+11
| * | | Fix default values of sharing capabilitiesJoas Schilling2015-08-131-5/+5
* | | | Merge pull request #18178 from owncloud/files-sidebar-actionsJan-Christoph Borchardt2015-08-1314-265/+494
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make file actions work from sidebarVincent Petry2015-08-1212-265/+422
| * | | Introduce FileInfoModelVincent Petry2015-08-122-0/+72
* | | | 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
|\ \ \
| * | | 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
* | | | Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporaryVincent Petry2015-08-131-3/+2
|\ \ \ \
| * | | | Show strage full warning for shared storages temporaryMorris Jobke2015-08-121-3/+2
* | | | | replace tipsys with tooltipsHendrik Leppelsack2015-08-123-7/+13
|/ / / /
* | | | Merge pull request #18065 from owncloud/new-trashbin-retentionThomas Müller2015-08-126-34/+400
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
| * | | | | Declare fieldsRoeland Jago Douma2015-08-111-0/+9
| * | | | | [provisioning api] Improve apps test coverageRoeland Jago Douma2015-08-111-0/+6
| * | | | | Fix groupsRoeland Jago Douma2015-08-111-2/+2
| * | | | | [provisioning api] improve coverage for groupsRoeland Jago Douma2015-08-111-0/+131
| * | | | | [provisioning api] Improve test coverage userRoeland Jago Douma2015-08-111-0/+358
| * | | | | [provisioning api] Move away from OC\Util to OCP\UtilRoeland Jago Douma2015-08-021-2/+2
| * | | | | [provisioning_api] Move tests to OCPRoeland Jago Douma2015-08-024-199/+202
| * | | | | [provisioning_api] Move part of apps to OCPRoeland Jago Douma2015-08-023-13/+29