summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix l10nMorris Jobke2016-06-2044-44/+44
* fix l10nMorris Jobke2016-06-2064-64/+64
* fix l10nMorris Jobke2016-06-2044-44/+44
* fix stringsMorris Jobke2016-06-204-4/+4
* Fix failing JS unit testsMorris Jobke2016-06-161-4/+2
* Merge pull request #83 from nextcloud/file-drop-highlightMarius Blüm2016-06-155-89/+277
|\
| * store icons in classVincent Chan2016-06-152-6/+5
| * fixes responsive/mobile viewVincent Chan2016-06-152-5/+9
| * dragging over folder will highlight folder onlyVincent Chan2016-06-152-0/+11
| * restrict dropZone to app-content divVincent Chan2016-06-151-1/+1
| * change folder icon when dragging over a directoryVincent Chan2016-06-153-4/+17
| * properly fix folder upload to use delegatedEventVincent Chan2016-06-142-4/+12
| * fixes direct upload to folderVincent Chan2016-06-141-5/+1
| * adds visual indication for file drag and dropVincent Chan2016-06-132-2/+15
| * update jQuery File Upload Plugin (9.12.5) to support dragleaveVincent Chan2016-06-131-84/+228
* | Merge pull request #113 from nextcloud/fix-more-buttonMarius Blüm2016-06-151-7/+7
|\ \
| * | fix padding of 3-dot button on mobileJan-Christoph Borchardt2016-06-151-7/+7
| |/
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-1423-13/+136
|\ \ | |/ |/|
| * Use proper namespaces - fixes #25078 (#25079)Thomas Müller2016-06-131-1/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-1322-12/+134
* | Merge pull request #57 from nextcloud/fdrop-templateLukas Reschke2016-06-132-3/+38
|\ \
| * | smaller files drop fixesArthur Schiwon2016-06-112-3/+38
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-1165-196/+1122
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #25003 from owncloud/fix_ocs_path_responseVincent Petry2016-06-103-21/+65
| |\
| | * Extend unit testsRoeland Jago Douma2016-06-071-1/+33
| | * Fix unit testsRoeland Jago Douma2016-06-072-9/+21
| | * Show the path relative to the requesting userRoeland Jago Douma2016-06-071-12/+12
| * | Merge pull request #24990 from owncloud/fix_24868Vincent Petry2016-06-101-6/+3
| |\ \
| | * | Wrap publicwebdav in sharePermission maskRoeland Jago Douma2016-06-061-6/+3
| * | | Merge pull request #24080 from owncloud/support-calendar-class-propertyVincent Petry2016-06-1011-153/+751
| |\ \ \
| | * | | Filter confidential calendar objects in shared calendarsThomas Müller2016-06-094-3/+322
| | * | | Added unit testing for the migration stepThomas Müller2016-06-095-126/+254
| | * | | Implement classification migration as repair stepThomas Müller2016-06-095-58/+106
| | * | | Bump dav app version and fix variable renameThomas Müller2016-06-092-3/+3
| | * | | Add migration stepThomas Müller2016-06-094-1/+61
| | * | | Extract CLASS property from calendar object and store it in the databaseThomas Müller2016-06-093-26/+69
| * | | | Merge pull request #25024 from owncloud/ldap-cachedgroupsbymemberVincent Petry2016-06-102-1/+54
| |\ \ \ \
| | * | | | Add unit test for LDAP multi group cachingVincent Petry2016-06-091-0/+53
| | * | | | Use array_merge when reading cached groups membersVincent Petry2016-06-081-1/+1
| * | | | | Merge pull request #25046 from owncloud/fix-the-realmVincent Petry2016-06-104-4/+16
| |\ \ \ \ \
| | * | | | | Use the correct realm for basic authentication - fixes #23427Thomas Müller2016-06-094-4/+16
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #25043 from owncloud/webdav-download-mimetypeVincent Petry2016-06-105-3/+91
| |\ \ \ \ \
| | * | | | | DAV now returns file name with Content-Disposition headerVincent Petry2016-06-095-3/+91
| | |/ / / /
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1040-8/+142
* | | | | | Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-1011-22/+277
|\ \ \ \ \ \
| * | | | | | Add text about uploaded filesLukas Reschke2016-06-103-3/+16
| * | | | | | Add some error handlingLukas Reschke2016-06-092-4/+27
| * | | | | | Add PHP unit testLukas Reschke2016-06-091-1/+25
| * | | | | | Fix public upload for normal sharesLukas Reschke2016-06-093-5/+7
| * | | | | | Make uploading possible via select and cleanup CSSLukas Reschke2016-06-095-33/+90