summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-143-9/+11
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-132-8/+8
| * fail hard if 2fa provider can not be loaded (#25061)Christoph Wurst2016-06-131-1/+3
* | emit correct signal if a app get's disabledBjoern Schiessle2016-06-131-1/+1
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-1116-8/+358
|\|
| * Merge pull request #24863 from owncloud/propagator-batchingVincent Petry2016-06-103-1/+110
| |\
| | * fix mtime propagation on sqliteRobin Appelman2016-06-021-3/+3
| | * 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-102-0/+117
| |\ \
| | * | Empty string is null on oracleRoeland Jago Douma2016-06-101-1/+9
| | * | Repair job to fix permissions for avatarsRoeland Jago Douma2016-06-102-0/+109
| * | | 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
| * | | | 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-101-1/+2
| |\ \ \
| | * | | Implement classification migration as repair stepThomas Müller2016-06-091-1/+2
| * | | | Merge pull request #25025 from owncloud/clear_old_calendar_sharesVincent Petry2016-06-102-0/+105
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add repair step to clean old calendar/contact sharesRoeland Jago Douma2016-06-092-0/+105
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-104-4/+6
* | | | | Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-101-1/+4
|\ \ \ \ \
| * | | | | add hide file list optionBjoern Schiessle2016-06-091-1/+4
* | | | | | Downstream 2016-06-09Arthur Schiwon2016-06-0922-57/+289
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #25000 from owncloud/fix-email-login-davVincent Petry2016-06-092-5/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Allow login by email address via webdav as well - fixes #24791Thomas Müller2016-06-092-5/+16
| * | | | | Merge pull request #25014 from owncloud/admin-datadircheck-fixVincent Petry2016-06-091-13/+24
| |\ \ \ \ \
| | * | | | | Use temporary htaccesstest.txt for data dir security checkVincent Petry2016-06-071-13/+24
| * | | | | | Merge pull request #24973 from owncloud/token-password-session-tokenVincent Petry2016-06-091-2/+30
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | catch sessionnotavailable exception if memory session is usedChristoph Wurst2016-06-081-5/+10
| | * | | | | When creating a session token, make sure it's the login password and not a de...Christoph Wurst2016-06-081-5/+28
| * | | | | | Merge pull request #24826 from owncloud/cors-client-loginVincent Petry2016-06-091-6/+6
| |\ \ \ \ \ \
| | * | | | | | use client login method on CORS routesChristoph Wurst2016-06-081-6/+6
| | |/ / / / /
| * | | | | | Merge pull request #25028 from owncloud/scanner-user-not-setupVincent Petry2016-06-091-1/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | skip scanning for a user when the user is not setup yetRobin Appelman2016-06-081-1/+6
| | | |/ / / | | |/| | |
| * | | | | Do not log token or challenge with exception stacktrace (#25026)Joas Schilling2016-06-081-1/+27
| | |/ / / | |/| | |
| * | | | Merge pull request #24899 from owncloud/local-storage-symlinksVincent Petry2016-06-083-3/+38
| |\ \ \ \
| | * | | | Ignore forbidden files while scanningRobin Appelman2016-06-071-1/+6
| | * | | | dissalow symlinks in local storages that point outside the datadirRobin Appelman2016-06-072-2/+32
| | |/ / /
| * | | | Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user...Vincent Petry2016-06-084-5/+11
| |\ \ \ \
| | * | | | Do not allow to store boolean configs, they behave unexpected on postgresJoas Schilling2016-06-064-5/+11
| * | | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-081-0/+1
| |\ \ \ \ \
| | * | | | | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-071-0/+1
| * | | | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-onlyVincent Petry2016-06-081-2/+2
| |\ \ \ \ \ \
| | * | | | | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-071-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #25005 from owncloud/parent-storage-time-castVincent Petry2016-06-082-1/+7
| |\ \ \ \ \ \
| | * | | | | | make sure $data['mtime'] is always a timestampRobin Appelman2016-06-071-0/+3
| | * | | | | | don't update storage mtime if we can't get the modified dateRobin Appelman2016-06-071-1/+4
| | | |_|/ / / | | |/| | | |