aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* check if session is initializedBjoern Schiessle2016-11-235-3/+59
* init Session/privateKeys on Master KeyMaxence Lange2016-11-221-0/+3
* Merge pull request #2234 from nextcloud/add-subadmin-middleware-backJoas Schilling2016-11-221-0/+2
|\
| * Add SubAdminMiddleware backLukas Reschke2016-11-221-0/+2
|/
* Merge pull request #1972 from nextcloud/invalid-files-from-scannerRoeland Jago Douma2016-11-227-27/+138
|\
| * Move the validation into one place onlyJoas Schilling2016-11-216-42/+106
| * Make sure we don't scan files that can not be accessedJoas Schilling2016-11-212-0/+47
* | Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-apiJoas Schilling2016-11-226-363/+425
|\ \
| * | Update systemtags activity to new APIJoas Schilling2016-11-176-363/+425
* | | Merge pull request #2165 from nextcloud/sharing-activities-updateRoeland Jago Douma2016-11-2216-609/+1645
|\ \ \
| * | | Move file sharing activities to the new APIJoas Schilling2016-11-1616-609/+1645
* | | | Merge pull request #2228 from nextcloud/use-appid-instead-of-app-elementRoeland Jago Douma2016-11-221-1/+1
|\ \ \ \
| * | | | Use app ID instead of objectLukas Reschke2016-11-221-1/+1
* | | | | Merge pull request #2154 from nextcloud/comments-activities-updateMorris Jobke2016-11-2214-380/+468
|\ \ \ \ \
| * | | | | Update testJoas Schilling2016-11-181-1/+3
| * | | | | Fix wrong copyright headersJoas Schilling2016-11-165-22/+21
| * | | | | Use the display name for usersJoas Schilling2016-11-161-4/+41
| * | | | | Move comments activities to the new APIJoas Schilling2016-11-168-357/+407
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2016-11-2266-638/+666
| |/ / / |/| | |
* | | | Merge pull request #2215 from nextcloud/add-setup-page-integration-testLukas Reschke2016-11-215-14/+85
|\ \ \ \
| * | | | Add integration test for web based installerMorris Jobke2016-11-215-14/+85
* | | | | Merge pull request #2221 from nextcloud/from-is-featured-to-featuredLukas Reschke2016-11-211-0/+3
|\ \ \ \ \
| * | | | | Cast "isFeatured" to "featured"Lukas Reschke2016-11-211-0/+3
* | | | | | Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requestsLukas Reschke2016-11-212-8/+19
|\ \ \ \ \ \
| * | | | | | fix PropPatch requests on calendarsGeorg Ehrke2016-11-212-8/+19
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2220 from nextcloud/app-password-default-device-nameLukas Reschke2016-11-211-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | use date as device name if no name was givenBjoern Schiessle2016-11-211-1/+1
|/ / / / /
* | | | | Merge pull request #2216 from nextcloud/proper-return-valueLukas Reschke2016-11-211-2/+1
|\ \ \ \ \
| * | | | | Use proper return functionLukas Reschke2016-11-211-2/+1
* | | | | | Merge pull request #2214 from nextcloud/remove-loggingRobin Appelman2016-11-217-418/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | update testsRobin Appelman2016-11-213-181/+0
| * | | | | remove old logging sectionRobin Appelman2016-11-214-237/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2211 from nextcloud/maintenance-wsodRobin Appelman2016-11-211-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix white screen of death in maintenance mode when theming is disabledRobin Appelman2016-11-211-0/+3
| |/ / /
* | | | Merge pull request #2212 from nextcloud/fix_web_installerMorris Jobke2016-11-211-2/+3
|\ \ \ \
| * | | | Do not trigger appconfig queries when we are not yet installedRoeland Jago Douma2016-11-211-2/+3
| |/ / /
* | | | Merge pull request #1946 from nextcloud/federated-sharing-persona-settingsLukas Reschke2016-11-2151-424/+2524
|\ \ \ \ | |/ / / |/| | |
| * | | center checkmark to indicate that the setting was storedBjoern Schiessle2016-11-211-1/+1
| * | | don't try to verify email address if no email address is setBjoern Schiessle2016-11-211-1/+1
| * | | small fixesBjoern Schiessle2016-11-213-8/+7
| * | | Adjust unit testsLukas Reschke2016-11-212-8/+18
| * | | Adjust integration testLukas Reschke2016-11-211-0/+1
| * | | Ask for password when scope is changedLukas Reschke2016-11-211-0/+8
| * | | Fix mail scopeLukas Reschke2016-11-211-1/+1
| * | | Highlight current entryLukas Reschke2016-11-212-4/+26
| * | | Make JS aware of password verificationLukas Reschke2016-11-212-0/+9
| * | | Remove debug codeLukas Reschke2016-11-211-4/+0
| * | | Add config switchLukas Reschke2016-11-216-18/+71
| * | | Remove unused variableLukas Reschke2016-11-211-1/+1
| * | | Add retry jobLukas Reschke2016-11-213-24/+76