summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2419 from nextcloud/issue-template-locationMorris Jobke2016-11-301-1/+1
|\
| * fix issue template locationRobin Appelman2016-11-301-1/+1
* | Merge pull request #2415 from nextcloud/fix_encrypted_trash_previewsLukas Reschke2016-11-301-0/+1
|\ \
| * | Ignore AppData in encryption wrapperRoeland Jago Douma2016-11-291-0/+1
* | | Merge pull request #2417 from nextcloud/fix-password-change-in-user-mgtLukas Reschke2016-11-301-0/+1
|\ \ \ | |_|/ |/| |
| * | Fix password change in user managementMorris Jobke2016-11-301-0/+1
* | | Merge pull request #2406 from nextcloud/move-dav-activities-to-new-apiRoeland Jago Douma2016-11-3021-438/+1704
|\ \ \ | |/ / |/| |
| * | Add tests for the base providerJoas Schilling2016-11-302-1/+190
| * | Move generic tests into namespaceJoas Schilling2016-11-302-4/+4
| * | Deduplicate the provider codeJoas Schilling2016-11-304-171/+133
| * | Add unit tests for ISetting instancesJoas Schilling2016-11-301-0/+121
| * | Add tests for the filtersJoas Schilling2016-11-303-0/+278
| * | Move event and todo parsing to new APIJoas Schilling2016-11-297-319/+387
| * | Deduplicate icon assignmentJoas Schilling2016-11-291-18/+3
| * | Add viewbox to the iconsJoas Schilling2016-11-292-2/+2
| * | Move calendar activity parsing to new APIJoas Schilling2016-11-293-73/+288
| * | Move CalDAV activity settings to new APIJoas Schilling2016-11-295-23/+303
| * | Move CalDAV activity filters to new APIJoas Schilling2016-11-294-25/+193
* | | Merge pull request #2405 from nextcloud/add-avatar-job-onceRoeland Jago Douma2016-11-302-9/+17
|\ \ \
| * | | Execute MoveAvatars repair step only onceMorris Jobke2016-11-292-9/+17
| |/ /
* | | Merge pull request #1446 from nextcloud/fix-mail-designMorris Jobke2016-11-309-66/+10
|\ \ \
| * | | Fix minor mail issuesRoeland Jago Douma2016-11-302-2/+2
| * | | Remove leftovers from #1929Morris Jobke2016-11-302-51/+0
| * | | Update sharedbymail templateMorris Jobke2016-11-301-3/+2
| * | | Fix mail header logo [fixes #1326]Felix Epp2016-11-306-12/+8
| |/ /
* | | Merge pull request #2152 from nextcloud/preview_cleanupjobMorris Jobke2016-11-306-0/+583
|\ \ \
| * | | Add test if repair step is already doneRoeland Jago Douma2016-11-193-6/+59
| * | | Adds background job to cleanup all previews.Roeland Jago Douma2016-11-196-0/+530
* | | | Merge pull request #2414 from nextcloud/version_previewsLukas Reschke2016-11-304-11/+56
|\ \ \ \
| * | | | Fix js testsRoeland Jago Douma2016-11-292-11/+11
| * | | | Show mimeicon when versions don't have a previewRoeland Jago Douma2016-11-293-3/+48
| | |_|/ | |/| |
* | | | Merge pull request #2409 from nextcloud/fix-1470Roeland Jago Douma2016-11-301-8/+11
|\ \ \ \
| * | | | log exception about user not present on LDAP on login only if loglevel is set...Arthur Schiwon2016-11-291-8/+11
* | | | | Merge pull request #2105 from nextcloud/focus-tags-input-on-toggleRoeland Jago Douma2016-11-301-2/+3
|\ \ \ \ \
| * | | | | Focus the input after clicking the "Tags" labelJoas Schilling2016-11-141-2/+3
* | | | | | [tx-robot] updated from transifexNextcloud bot2016-11-3026-4/+162
* | | | | | Merge pull request #2412 from nextcloud/filepicker-bottom-padding-fixChristoph Wurst2016-11-291-1/+1
|\ \ \ \ \ \
| * | | | | | Fix #2408John Molakvoæ2016-11-291-1/+1
* | | | | | | [tx-robot] updated from transifexNextcloud bot2016-11-2950-46/+62
* | | | | | | Merge pull request #2410 from nextcloud/fix-mobile-textLukas Reschke2016-11-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix missing text for downloads on mobileMorris Jobke2016-11-291-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2016-11-29110-3930/+3476
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #2066 from nextcloud/fix-redirect-double-encodingMorris Jobke2016-11-293-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | do not double encode the redirect urlChristoph Wurst2016-11-093-8/+8
* | | | | | Merge pull request #2388 from nextcloud/share-table-ellipsisMorris Jobke2016-11-293-10/+8
|\ \ \ \ \ \
| * | | | | | Fix mobile viewJohn Molakvoæ (skjnldsv)2016-11-291-5/+0
| * | | | | | Fix username widthJohn Molakvoæ (skjnldsv)2016-11-291-1/+2
| * | | | | | Fix #2384John Molakvoæ (skjnldsv)2016-11-292-5/+7
* | | | | | | Merge pull request #2404 from nextcloud/streamresponse-warningJoas Schilling2016-11-291-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | prevent warning in StreamResponseRobin Appelman2016-11-291-1/+1
| | |_|_|/ / | |/| | | |