summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4522 from nextcloud/downstream-27596Morris Jobke2017-04-272-20/+46
|\
| * Use the new method in the old one to remove duplicate codeJoas Schilling2017-04-272-31/+30
| * Allow to create a user for a specific backendJoas Schilling2017-04-262-0/+27
* | Merge pull request #4501 from nextcloud/downstream-27144Morris Jobke2017-04-263-7/+38
|\ \
| * | Add duration of last job execution to the tableNoveen Sachdeva2017-04-253-7/+38
* | | Merge pull request #4515 from nextcloud/downstream-27643Morris Jobke2017-04-2613-141/+122
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-04-262-4/+0
| * | | Fix missing conflict resolutionsJoas Schilling2017-04-263-12/+0
| * | | Adjust query/event logging code in favour of more complex owncloud/diagnostic...Piotr Mrówczyński2017-04-2611-137/+134
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2017-04-272-0/+2
* | | Merge pull request #4526 from nextcloud/downstream-27269Morris Jobke2017-04-261-0/+6
|\ \ \
| * | | Use regex to detect part filesVincent Petry2017-04-261-2/+2
| * | | #7496 Don`t allow upload of files with extension .partIlja Neumann2017-04-261-0/+6
| |/ /
* | | Update autoload mapLukas Reschke2017-04-262-0/+2
* | | Add SocialSharingBundleLukas Reschke2017-04-262-0/+47
* | | Add tests for repairstepLukas Reschke2017-04-261-1/+1
* | | Add spreed to Groupware bundleLukas Reschke2017-04-261-0/+1
* | | Remove unrequired getDescription() methodLukas Reschke2017-04-264-29/+1
* | | Make the emergency disable also accept arraysLukas Reschke2017-04-261-5/+6
* | | Add app bundlesLukas Reschke2017-04-2614-9/+460
* | | Merge pull request #4374 from nextcloud/contactsmenu_popoverLukas Reschke2017-04-262-1/+60
|\ \ \
| * | | add contactsmenu popoverGeorg Ehrke2017-04-262-1/+60
* | | | Fix scanner after reviewVincent Petry2017-04-261-2/+3
* | | | OCC scanner commit in batchesVincent Petry2017-04-261-6/+38
| |/ / |/| |
* | | Merge pull request #4430 from nextcloud/refactor-authRoeland Jago Douma2017-04-262-14/+10
|\ \ \ | |/ / |/| |
| * | Refactor auth methodsJörn Friedrich Dreyer2017-04-262-14/+10
* | | Merge pull request #4467 from nextcloud/lists-for-html-mailsRoeland Jago Douma2017-04-262-22/+138
|\ \ \
| * | | Allow meta info and iconsJoas Schilling2017-04-252-8/+32
| * | | Add lists to HTML emailsJoas Schilling2017-04-242-22/+114
* | | | Merge pull request #4061 from nextcloud/downstream-26407Roeland Jago Douma2017-04-262-37/+59
|\ \ \ \
| * | | | no ternaryJörn Friedrich Dreyer2017-03-251-2/+10
| * | | | fix constantJörn Friedrich Dreyer2017-03-251-1/+1
| * | | | Add Redis Cluster supportRobin McCorkell2017-03-252-37/+51
* | | | | Merge pull request #4449 from stweil/mimetypesMorris Jobke2017-04-261-0/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add repair steps for new image mime typesStefan Weil2017-04-251-0/+13
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-264-18/+20
* | | | Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-265-3/+14
|\ \ \ \
| * \ \ \ Merge pull request #4499 from nextcloud/downstream-26984Morris Jobke2017-04-251-1/+5
| |\ \ \ \
| | * | | | Trigger change when a user is enabled/disabledJoas Schilling2017-04-251-1/+5
| | |/ / /
| * | | | Merge pull request #4479 from nextcloud/auth-flowMorris Jobke2017-04-252-0/+2
| |\ \ \ \
| | * | | | Add new auth flowLukas Reschke2017-04-252-0/+2
| * | | | | Merge pull request #4495 from nextcloud/downstream-27638Roeland Jago Douma2017-04-252-2/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Catch session already closed exception in destructorVictor Dubiniuk2017-04-252-2/+7
| | |/ / /
* | | | | Update composer autoloaderChristoph Wurst2017-04-254-6/+8
* | | | | Use absolute URI for action iconsChristoph Wurst2017-04-251-3/+9
* | | | | Don't show contacts an entry for themselvesChristoph Wurst2017-04-253-4/+10
* | | | | Let apps register contact menu provider via info.xmlChristoph Wurst2017-04-252-14/+45
* | | | | Show mail address in popover menuChristoph Wurst2017-04-251-3/+1
* | | | | Contacts menuChristoph Wurst2017-04-2518-8/+963
|/ / / /
* / / / Responsive app menuJulius Härtl2017-04-252-70/+0
|/ / /