summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4501 from nextcloud/downstream-27144Morris Jobke2017-04-262-3/+25
|\
| * Add duration of last job execution to the tableNoveen Sachdeva2017-04-252-3/+25
* | Merge pull request #4515 from nextcloud/downstream-27643Morris Jobke2017-04-268-135/+73
|\ \
| * | Fix missing conflict resolutionsJoas Schilling2017-04-261-4/+0
| * | Adjust query/event logging code in favour of more complex owncloud/diagnostic...Piotr Mrówczyński2017-04-268-135/+77
* | | 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
| |/ /
* | | 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
* | | Add app bundlesLukas Reschke2017-04-2612-9/+448
* | | 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-261-22/+124
|\ \ \
| * | | Allow meta info and iconsJoas Schilling2017-04-251-6/+26
| * | | Add lists to HTML emailsJoas Schilling2017-04-241-22/+104
* | | | 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
| | |_|/ | |/| |
* | | | Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-263-3/+12
|\ \ \ \
| * \ \ \ 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 #4495 from nextcloud/downstream-27638Roeland Jago Douma2017-04-252-2/+7
| |\ \ \ \
| | * | | | Catch session already closed exception in destructorVictor Dubiniuk2017-04-252-2/+7
| | |/ / /
* | | | | Use absolute URI for action iconsChristoph Wurst2017-04-251-3/+9
* | | | | Don't show contacts an entry for themselvesChristoph Wurst2017-04-252-4/+9
* | | | | 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-259-0/+666
|/ / / /
* / / / Responsive app menuJulius Härtl2017-04-252-70/+0
|/ / /
* | | Merge pull request #3531 from nextcloud/theming-scssMorris Jobke2017-04-254-17/+99
|\ \ \
| * | | Use theming cachebuster for server resourcesJulius Härtl2017-04-251-1/+3
| * | | Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-254-16/+96
| | |/ | |/|
* | | Merge pull request #4462 from danxuliu/fix-sharing-password-protected-linkRoeland Jago Douma2017-04-251-24/+31
|\ \ \ | |/ / |/| |
| * | Extract updateSharePasswordIfNeeded functionDaniel Calviño Sánchez2017-04-241-22/+30
| * | Join if block to preceding if chainDaniel Calviño Sánchez2017-04-241-3/+2
| * | Fix double hashing of shared link passwordsDaniel Calviño Sánchez2017-04-241-1/+1
* | | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-2437-70/+0
|\ \ \ | |/ / |/| |
| * | Remove unused use statementsMorris Jobke2017-04-2237-70/+0
* | | Remove unused variablesMorris Jobke2017-04-221-1/+0
|/ /
* | Merge pull request #4396 from nextcloud/scan-non-existingRoeland Jago Douma2017-04-211-0/+5
|\ \