summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-269-103/+248
|\
| * Merge pull request #25172 from owncloud/token-login-validationVincent Petry2016-06-226-96/+174
| |\
| | * fix unit test warning/errorsChristoph Wurst2016-06-201-11/+9
| | * fix nitpickChristoph Wurst2016-06-201-2/+3
| | * dont create a session token for clients, validate the app password insteadChristoph Wurst2016-06-171-8/+24
| | * store last check timestamp in token instead of sessionChristoph Wurst2016-06-176-76/+150
| | * use token last_activity instead of session valueChristoph Wurst2016-06-173-21/+10
| * | occ web executor (#24957)VicDeo2016-06-221-1/+2
| * | Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparentsVincent Petry2016-06-221-1/+22
| |\ \
| | * | Fire hooks for mkdir for folder uploadkarakayasemi2016-06-211-1/+22
| * | | redirect to new login route (#25099)Christoph Wurst2016-06-211-5/+6
| * | | update session token password on user password changeChristoph Wurst2016-06-213-0/+44
* | | | Merge pull request #185 from nextcloud/fix-permission-issueLukas Reschke2016-06-211-3/+3
|\ \ \ \
| * | | | Show error message if config file is not readableMorris Jobke2016-06-211-3/+3
* | | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2115-58/+388
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-203-19/+56
| |\ \ \
| | * | | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-173-19/+56
| | | |/ | | |/|
| * | | Update ExcludeFileByNameFilterIterator.php (#25184)Thomas Müller2016-06-201-0/+1
| * | | Merge pull request #25174 from owncloud/tokenmapper-close-cursorVincent Petry2016-06-201-0/+1
| |\ \ \
| | * | | close cursor after loading a tokenChristoph Wurst2016-06-171-0/+1
| | |/ /
| * | | Merge pull request #25168 from owncloud/capped-user-cacheVincent Petry2016-06-201-2/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Capped cache for user configJörn Friedrich Dreyer2016-06-171-2/+4
| | |/
| * / Use getLazyRootFolder from RemoveRootShares repair stepVincent Petry2016-06-171-1/+1
| |/
| * Merge pull request #25132 from owncloud/2fa-load-apps-before-queryVincent Petry2016-06-161-0/+13
| |\
| | * load 2FA provider apps before querying classesChristoph Wurst2016-06-161-0/+13
| * | emit correct signal when disabling an appJörn Friedrich Dreyer2016-06-161-1/+1
| |/
| * Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_userVincent Petry2016-06-161-11/+25
| |\
| | * Fix case with no userRoeland Jago Douma2016-06-141-0/+4
| | * Optimize isSharingDisabledForuserRoeland Jago Douma2016-06-141-11/+21
| * | Merge pull request #25075 from owncloud/fix_23265Vincent Petry2016-06-162-0/+159
| |\ \
| | * | Remove shares of the root folderRoeland Jago Douma2016-06-132-0/+159
| * | | Merge pull request #25056 from owncloud/fs-usermountcache-cappedVincent Petry2016-06-151-3/+14
| |\ \ \
| | * | | Capped cache for cache info in UserMountCacheVincent Petry2016-06-131-3/+14
| * | | | Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-u...Vincent Petry2016-06-152-2/+57
| |\ \ \ \
| | * | | | Clean up tags of deleted usersJoas Schilling2016-06-142-2/+57
| * | | | | Merge pull request #25102 from owncloud/preview-delete-performanceVincent Petry2016-06-152-12/+27
| |\ \ \ \ \
| | * | | | | optimized size propagation on deletesRobin Appelman2016-06-141-4/+14
| | * | | | | propagator batching when removing thumbnailsRobin Appelman2016-06-141-7/+13
| | * | | | | remvoe duplicate rmdirRobin Appelman2016-06-141-1/+0
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #25082 from owncloud/fix-sessionless-clientsVincent Petry2016-06-152-3/+17
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | create session token only for clients that support cookiesChristoph Wurst2016-06-131-2/+11
| | * | | | create session token on all APIsChristoph Wurst2016-06-132-3/+8
| | |/ / /
| * | | | Merge pull request #25076 from owncloud/mount-cache-invalidVincent Petry2016-06-142-8/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | handle invalid storages in LazyStorageMountInfoRobin Appelman2016-06-132-8/+16
| | | |/ | | |/|
* | | | fix more stringsMorris Jobke2016-06-204-12/+8
* | | | Remove obsolete contacts_cards_properties tableFlorian Preinstorfer2016-06-191-0/+1
* | | | Drop obsolete tables: gallery_albums and gallery_photosFlorian Preinstorfer2016-06-191-1/+3
* | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-141-1/+3
|\| | |
| * | | 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