summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2419 from nextcloud/issue-template-locationMorris Jobke2016-11-301-1/+1
|\ | | | | fix issue template location
| * fix issue template locationRobin Appelman2016-11-301-1/+1
| | | | | | | | | | | | Fixes #2418 Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2415 from nextcloud/fix_encrypted_trash_previewsLukas Reschke2016-11-301-0/+1
|\ \ | | | | | | Ignore AppData in encryption wrapper
| * | Ignore AppData in encryption wrapperRoeland Jago Douma2016-11-291-0/+1
| | | | | | | | | | | | | | | | | | Fixes part of #2407 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2417 from nextcloud/fix-password-change-in-user-mgtLukas Reschke2016-11-301-0/+1
|\ \ \ | |_|/ |/| | Fix password change in user management
| * | Fix password change in user managementMorris Jobke2016-11-301-0/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2406 from nextcloud/move-dav-activities-to-new-apiRoeland Jago Douma2016-11-3021-438/+1704
|\ \ \ | |/ / |/| | Move dav activities to new api
| * | Add tests for the base providerJoas Schilling2016-11-302-1/+190
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move generic tests into namespaceJoas Schilling2016-11-302-4/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Deduplicate the provider codeJoas Schilling2016-11-304-171/+133
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add unit tests for ISetting instancesJoas Schilling2016-11-301-0/+121
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add tests for the filtersJoas Schilling2016-11-303-0/+278
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move event and todo parsing to new APIJoas Schilling2016-11-297-319/+387
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Deduplicate icon assignmentJoas Schilling2016-11-291-18/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add viewbox to the iconsJoas Schilling2016-11-292-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move calendar activity parsing to new APIJoas Schilling2016-11-293-73/+288
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move CalDAV activity settings to new APIJoas Schilling2016-11-295-23/+303
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move CalDAV activity filters to new APIJoas Schilling2016-11-294-25/+193
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2405 from nextcloud/add-avatar-job-onceRoeland Jago Douma2016-11-302-9/+17
|\ \ \ | | | | | | | | Execute MoveAvatars repair step only once
| * | | Execute MoveAvatars repair step only onceMorris Jobke2016-11-292-9/+17
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #1446 from nextcloud/fix-mail-designMorris Jobke2016-11-309-66/+10
|\ \ \ | | | | | | | | Fix mail design
| * | | Fix minor mail issuesRoeland Jago Douma2016-11-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * a nextcloud * Strong username & url Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Remove leftovers from #1929Morris Jobke2016-11-302-51/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Update sharedbymail templateMorris Jobke2016-11-301-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix mail header logo [fixes #1326]Felix Epp2016-11-306-12/+8
| |/ / | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | | Merge pull request #2152 from nextcloud/preview_cleanupjobMorris Jobke2016-11-306-0/+583
|\ \ \ | | | | | | | | Adds background job to cleanup all previews.
| * | | Add test if repair step is already doneRoeland Jago Douma2016-11-193-6/+59
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Adds background job to cleanup all previews.Roeland Jago Douma2016-11-196-0/+530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A repair step that inserts a background job for each user * Each background job will delete for 15 seconds if it takes longer we reschedule. This is done so instances that don't use the system cron won't time out. * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #2414 from nextcloud/version_previewsLukas Reschke2016-11-304-11/+56
|\ \ \ \ | | | | | | | | | | Fix empty version previews
| * | | | Fix js testsRoeland Jago Douma2016-11-292-11/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Show mimeicon when versions don't have a previewRoeland Jago Douma2016-11-293-3/+48
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Fixes #2413 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | 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 logleve…
| * | | | log exception about user not present on LDAP on login only if loglevel is ↵Arthur Schiwon2016-11-291-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to debug Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #2105 from nextcloud/focus-tags-input-on-toggleRoeland Jago Douma2016-11-301-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Focus the input after clicking the "Tags" label
| * | | | | Focus the input after clicking the "Tags" labelJoas Schilling2016-11-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [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 #2408
| * | | | | | Fix #2408John Molakvoæ2016-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | [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 mobile
| * | | | | | | Fix missing text for downloads on mobileMorris Jobke2016-11-291-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #2362 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | [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 url
| * | | | | do not double encode the redirect urlChristoph Wurst2016-11-093-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #2388 from nextcloud/share-table-ellipsisMorris Jobke2016-11-293-10/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix whitespace between sharee name and icons #2384
| * | | | | | Fix mobile viewJohn Molakvoæ (skjnldsv)2016-11-291-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix username widthJohn Molakvoæ (skjnldsv)2016-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix #2384John Molakvoæ (skjnldsv)2016-11-292-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #2404 from nextcloud/streamresponse-warningJoas Schilling2016-11-291-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | prevent warning in StreamResponse
| * | | | | | prevent warning in StreamResponseRobin Appelman2016-11-291-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>