summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #57 from nextcloud/fdrop-templateLukas Reschke2016-06-133-5/+40
|\
| * smaller files drop fixesArthur Schiwon2016-06-113-5/+40
* | Merge pull request #58 from nextcloud/downstream-160611Morris Jobke2016-06-12109-219/+2151
|\ \
| * \ Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-11109-219/+2151
| |\ \
| | * \ Merge pull request #24863 from owncloud/propagator-batchingVincent Petry2016-06-104-1/+235
| | |\ \
| | | * | fix mtime propagation on sqliteRobin Appelman2016-06-021-3/+3
| | | * | add tests for propagator batchingRobin Appelman2016-06-021-0/+125
| | | * | use propagator batching in the scannerRobin Appelman2016-06-021-0/+4
| | | * | add propagator batchingRobin Appelman2016-06-022-0/+105
| | * | | Merge pull request #24898 from owncloud/avatar_repairVincent Petry2016-06-103-0/+306
| | |\ \ \
| | | * | | Empty string is null on oracleRoeland Jago Douma2016-06-101-1/+9
| | | * | | Add not-null columns for oracleJoas Schilling2016-06-101-0/+9
| | | * | | Repair job to fix permissions for avatarsRoeland Jago Douma2016-06-103-0/+289
| | * | | | 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 #25055 from owncloud/enc-cappedcache-getaccesslistVincent Petry2016-06-101-0/+3
| | |\ \ \ \ \
| | | * | | | | Use capped cache for encryption's user access listVincent Petry2016-06-101-0/+3
| | * | | | | | fetchall appconfig entries (#23835)Jörn Friedrich Dreyer2016-06-101-1/+3
| | * | | | | | Add developer documentation, website and bug to the applist (#25041)Joas Schilling2016-06-101-0/+14
| | * | | | | | Merge pull request #24990 from owncloud/fix_24868Vincent Petry2016-06-101-6/+3
| | |\ \ \ \ \ \
| | | * | | | | | Wrap publicwebdav in sharePermission maskRoeland Jago Douma2016-06-061-6/+3
| | * | | | | | | map oracle driver options to params (#23938)Jörn Friedrich Dreyer2016-06-101-0/+4
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge pull request #25051 from owncloud/2fa-raw-php-filesVincent Petry2016-06-102-1/+8
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Check 2FA state for raw php files tooChristoph Wurst2016-06-102-1/+8
| | * | | | | | Merge pull request #24080 from owncloud/support-calendar-class-propertyVincent Petry2016-06-1012-154/+753
| | |\ \ \ \ \ \
| | | * | | | | | Filter confidential calendar objects in shared calendarsThomas Müller2016-06-095-7/+322
| | | * | | | | | Added unit testing for the migration stepThomas Müller2016-06-096-126/+258
| | | * | | | | | Implement classification migration as repair stepThomas Müller2016-06-096-59/+108
| | | * | | | | | 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
| | * | | | | | | Allow empty host when installing on oracle via CLI (#25034)Jörn Friedrich Dreyer2016-06-101-1/+6
| | * | | | | | | 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 #25025 from owncloud/clear_old_calendar_sharesVincent Petry2016-06-103-0/+265
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add repair step to clean old calendar/contact sharesRoeland Jago Douma2016-06-093-0/+265
| | * | | | | | | | | 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 #25048 from owncloud/email-login-leakVincent Petry2016-06-102-10/+43
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Do not leak the login name - fixes #25047Thomas Müller2016-06-092-10/+43