summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20192 from owncloud/fix-20090Thomas Müller2015-11-022-0/+12
|\ | | | | if a user that is flag as deleted shows up again, remove that flag. F…
| * if a user that is flag as deleted shows up again, remove that flag. Fixes #20090Arthur Schiwon2015-10-302-0/+12
| |
* | Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibnThomas Müller2015-11-021-1/+3
|\ \ | | | | | | Fix scrollto= parameter in trashbin view
| * | Fix scrollto= parameter in trashbin viewJoas Schilling2015-11-021-1/+3
| | |
* | | Merge pull request #20181 from owncloud/files-fixdownloadspinnerThomas Müller2015-11-024-3/+101
|\ \ \ | |/ / |/| | Fix file action download spinner
| * | Fix file action download spinnerVincent Petry2015-10-304-3/+101
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-028-8/+18
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0110-0/+38
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3112-0/+14
| | |
* | | Merge pull request #19940 from owncloud/ldap-server-wizard-tooltipThomas Müller2015-10-311-0/+1
|\ \ \ | |_|/ |/| | Add tooltip to ldap server wizard
| * | add tooltip to ldap server wizardHendrik Leppelsack2015-10-291-0/+1
| | |
* | | Merge pull request #20175 from owncloud/login-arrowThomas Müller2015-10-302-5/+0
|\ \ \ | | | | | | | | remove unneeded icons from input fields to not distract from submit button, fix #18940
| * | | remove unneeded icons from input fields to not distract from submit button, ↵Jan-Christoph Borchardt2015-10-302-5/+0
| | | | | | | | | | | | | | | | fix #18940
* | | | Merge pull request #20160 from owncloud/share-allowdeleteinshareoverviewThomas Müller2015-10-302-27/+11
|\ \ \ \ | | | | | | | | | | Bring back delete permission in share overview
| * | | | Bring back delete permission in share overviewVincent Petry2015-10-292-27/+11
| | |_|/ | |/| |
* | | | Merge pull request #20167 from owncloud/fix-docker-ip-retrievalThomas Müller2015-10-304-4/+4
|\ \ \ \ | | | | | | | | | | Use proper statement to retrieve the IP of an docker instance
| * | | | Use proper statement to retrieve the IP of an docker instanceMorris Jobke2015-10-304-4/+4
| | | | |
* | | | | Merge pull request #20156 from owncloud/files-filter-triger-onceRobin Appelman2015-10-301-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | dont trigger the scroll event of every single item we filter in the file list
| * | | | dont trigger the scroll event of every single item we filter in the file listRobin Appelman2015-10-291-2/+3
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3016-8/+138
| | | | |
* | | | | Merge pull request #20051 from otetard/feature/newfilemenu_extendThomas Müller2015-10-291-31/+46
|\ \ \ \ \ | |_|/ / / |/| | | | Allow Owncloud apps to add new items to the “new” file menu.
| * | | | Allow apps to add new items in the “New” filemenu.Olivier Tétard2015-10-261-31/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Owncloud apps can now add new items to the “new” file menu. A new `addMenuEntry()` was added to `NewFileMenu`. To add a new item, you have to attach a plugin to `OCA.Files.NewFileMenu` that will call `addMenuEntry()`.
* | | | | Merge pull request #20135 from owncloud/check-if-null-subadminThomas Müller2015-10-295-1294/+1995
|\ \ \ \ \ | | | | | | | | | | | | Drop OC_SubAdmin and replace usages
| * | | | | Drop OC_SubAdmin and replace usagesLukas Reschke2015-10-295-1294/+1995
| | |_|/ / | |/| | |
* | | | | Merge pull request #20122 from owncloud/files-consolidateiconupdateThomas Müller2015-10-295-8/+86
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix icon update to be more consistent
| * | | | Fix icon update to be more consistentVincent Petry2015-10-295-8/+86
| | | | | | | | | | | | | | | | | | | | Makes the details bar show the same icon as in the list.
* | | | | Merge pull request #19000 from ↵Thomas Müller2015-10-291-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | UoM-ResPlat-DevOps/swift-squelch-expected-404-errors Don't log expected Swift 404 responses in files_external
| * | | | | Don't log expected Swift 404 responsesTim Dettrick2015-09-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File existence checks are expected in some cases to be false, so passing 404 Not Found errors through to the logs just causes noise.
* | | | | | Merge pull request #19100 from owncloud/ext-tooltip-unavailableThomas Müller2015-10-294-14/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | Display external storage status as tooltip
| * | | | | | Display storage status as tooltipRobin McCorkell2015-10-234-7/+47
| | | | | | |
| * | | | | | Remove status indicator on modificationRobin McCorkell2015-10-231-8/+21
| | | | | | |
* | | | | | | Merge pull request #20140 from owncloud/provisioning_killappphpThomas Müller2015-10-291-20/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Kill empty app.php in provisioning_api
| * | | | | | Kill empty app.php in provisioning_apiJoas Schilling2015-10-291-20/+0
| | | | | | |
* | | | | | | Merge pull request #20079 from owncloud/filelist-invalidpathThomas Müller2015-10-293-10/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix file list reload callback result
| * | | | | | Fix file list reload callback resultVincent Petry2015-10-273-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All reloadCallback must return either true for success or false in case of failure / non-existing folder. Some file lists only have a root folder (favorite, shares), so restrict the path to that to avoid having a wrong path in the breadcrumbs.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2930-4/+254
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #19758 from owncloud/ext-fallback-getmimetypeThomas Müller2015-10-283-45/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fallback to default mimetype detection mechanism
| * | | | | | Fallback to default mimetype detection mechanismVincent Petry2015-10-133-45/+0
| | | | | | |
* | | | | | | Merge pull request #20089 from owncloud/litmus-test-webdavThomas Müller2015-10-282-0/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Enable DAV app testing on travis
| * | | | | | | run litmus scripts only if code in the dav app did change changedThomas Müller2015-10-282-2/+0
| | | | | | | |
| * | | | | | | Enable DAV app testing on travisThomas Müller2015-10-272-0/+48
| | | | | | | |
* | | | | | | | Merge pull request #20093 from owncloud/ldap-fix-quota-and-caseThomas Müller2015-10-284-7/+57
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | LDAP fix quota and case, fixes #20043
| * | | | | | | | fix attribute casing to ensure array keys workArthur Schiwon2015-10-272-4/+15
| | | | | | | | |
| * | | | | | | | fix update quota with known valueArthur Schiwon2015-10-272-3/+42
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-286-4/+26
|/ / / / / / / /
* | | | | | | | Merge pull request #17104 from owncloud/chunked-upload-lockingRobin Appelman2015-10-274-13/+104
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | locking for chunked dav upload
| * | | | | | | adjust tests for new dav classesRobin Appelman2015-10-201-6/+6
| | | | | | | |
| * | | | | | | remove locking for chunksRobin Appelman2015-10-201-4/+0
| | | | | | | |
| * | | | | | | fix locking in testsRobin Appelman2015-10-201-2/+8
| | | | | | | |
| * | | | | | | Adjust for wide lockingRobin Appelman2015-10-202-6/+12
| | | | | | | |