Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | check if session is initialized | Bjoern Schiessle | 2016-11-23 | 5 | -3/+59 |
* | init Session/privateKeys on Master Key | Maxence Lange | 2016-11-22 | 1 | -0/+3 |
* | Merge pull request #2234 from nextcloud/add-subadmin-middleware-back | Joas Schilling | 2016-11-22 | 1 | -0/+2 |
|\ | |||||
| * | Add SubAdminMiddleware back | Lukas Reschke | 2016-11-22 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #1972 from nextcloud/invalid-files-from-scanner | Roeland Jago Douma | 2016-11-22 | 7 | -27/+138 |
|\ | |||||
| * | Move the validation into one place only | Joas Schilling | 2016-11-21 | 6 | -42/+106 |
| * | Make sure we don't scan files that can not be accessed | Joas Schilling | 2016-11-21 | 2 | -0/+47 |
* | | Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api | Joas Schilling | 2016-11-22 | 6 | -363/+425 |
|\ \ | |||||
| * | | Update systemtags activity to new API | Joas Schilling | 2016-11-17 | 6 | -363/+425 |
* | | | Merge pull request #2165 from nextcloud/sharing-activities-update | Roeland Jago Douma | 2016-11-22 | 16 | -609/+1645 |
|\ \ \ | |||||
| * | | | Move file sharing activities to the new API | Joas Schilling | 2016-11-16 | 16 | -609/+1645 |
* | | | | Merge pull request #2228 from nextcloud/use-appid-instead-of-app-element | Roeland Jago Douma | 2016-11-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use app ID instead of object | Lukas Reschke | 2016-11-22 | 1 | -1/+1 |
* | | | | | Merge pull request #2154 from nextcloud/comments-activities-update | Morris Jobke | 2016-11-22 | 14 | -380/+468 |
|\ \ \ \ \ | |||||
| * | | | | | Update test | Joas Schilling | 2016-11-18 | 1 | -1/+3 |
| * | | | | | Fix wrong copyright headers | Joas Schilling | 2016-11-16 | 5 | -22/+21 |
| * | | | | | Use the display name for users | Joas Schilling | 2016-11-16 | 1 | -4/+41 |
| * | | | | | Move comments activities to the new API | Joas Schilling | 2016-11-16 | 8 | -357/+407 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-22 | 66 | -638/+666 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #2215 from nextcloud/add-setup-page-integration-test | Lukas Reschke | 2016-11-21 | 5 | -14/+85 |
|\ \ \ \ | |||||
| * | | | | Add integration test for web based installer | Morris Jobke | 2016-11-21 | 5 | -14/+85 |
* | | | | | Merge pull request #2221 from nextcloud/from-is-featured-to-featured | Lukas Reschke | 2016-11-21 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Cast "isFeatured" to "featured" | Lukas Reschke | 2016-11-21 | 1 | -0/+3 |
* | | | | | | Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests | Lukas Reschke | 2016-11-21 | 2 | -8/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix PropPatch requests on calendars | Georg Ehrke | 2016-11-21 | 2 | -8/+19 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #2220 from nextcloud/app-password-default-device-name | Lukas Reschke | 2016-11-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | use date as device name if no name was given | Bjoern Schiessle | 2016-11-21 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2216 from nextcloud/proper-return-value | Lukas Reschke | 2016-11-21 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Use proper return function | Lukas Reschke | 2016-11-21 | 1 | -2/+1 |
* | | | | | | Merge pull request #2214 from nextcloud/remove-logging | Robin Appelman | 2016-11-21 | 7 | -418/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | update tests | Robin Appelman | 2016-11-21 | 3 | -181/+0 |
| * | | | | | remove old logging section | Robin Appelman | 2016-11-21 | 4 | -237/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2211 from nextcloud/maintenance-wsod | Robin Appelman | 2016-11-21 | 1 | -0/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | fix white screen of death in maintenance mode when theming is disabled | Robin Appelman | 2016-11-21 | 1 | -0/+3 |
| |/ / / | |||||
* | | | | Merge pull request #2212 from nextcloud/fix_web_installer | Morris Jobke | 2016-11-21 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | Do not trigger appconfig queries when we are not yet installed | Roeland Jago Douma | 2016-11-21 | 1 | -2/+3 |
| |/ / / | |||||
* | | | | Merge pull request #1946 from nextcloud/federated-sharing-persona-settings | Lukas Reschke | 2016-11-21 | 51 | -424/+2524 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | center checkmark to indicate that the setting was stored | Bjoern Schiessle | 2016-11-21 | 1 | -1/+1 |
| * | | | don't try to verify email address if no email address is set | Bjoern Schiessle | 2016-11-21 | 1 | -1/+1 |
| * | | | small fixes | Bjoern Schiessle | 2016-11-21 | 3 | -8/+7 |
| * | | | Adjust unit tests | Lukas Reschke | 2016-11-21 | 2 | -8/+18 |
| * | | | Adjust integration test | Lukas Reschke | 2016-11-21 | 1 | -0/+1 |
| * | | | Ask for password when scope is changed | Lukas Reschke | 2016-11-21 | 1 | -0/+8 |
| * | | | Fix mail scope | Lukas Reschke | 2016-11-21 | 1 | -1/+1 |
| * | | | Highlight current entry | Lukas Reschke | 2016-11-21 | 2 | -4/+26 |
| * | | | Make JS aware of password verification | Lukas Reschke | 2016-11-21 | 2 | -0/+9 |
| * | | | Remove debug code | Lukas Reschke | 2016-11-21 | 1 | -4/+0 |
| * | | | Add config switch | Lukas Reschke | 2016-11-21 | 6 | -18/+71 |
| * | | | Remove unused variable | Lukas Reschke | 2016-11-21 | 1 | -1/+1 |
| * | | | Add retry job | Lukas Reschke | 2016-11-21 | 3 | -24/+76 |