aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #2432 from nextcloud/activity-mail-languageMorris Jobke2016-12-0113-51/+132
|\ \ \ \ \ | | | | | | | | | | | | Make sure the activity emails can be sent in the users language
| * | | | | Adjust all implementations in the server repoJoas Schilling2016-12-0112-47/+125
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Add language to the parse method for emailsJoas Schilling2016-12-011-4/+7
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #2444 from nextcloud/detect-also-a-400-statusChristoph Wurst2016-12-012-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Catch status code 400
| * | | | | Catch status code 400Lukas Reschke2016-12-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the server returns a statuscode 400 we should also gracefully return to the home directory. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2435 from nextcloud/sidebar-preview-non-previewRoeland Jago Douma2016-12-011-3/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | allow registering sidebar preview handlers for mimetypes that dont co…
| * | | | | allow registering sidebar preview handlers for mimetypes that dont come with ↵Robin Appelman2016-12-011-3/+12
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | server side previews Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #2441 from nextcloud/optimize-createParentDirectoriesRoeland Jago Douma2016-12-012-5/+81
|\ \ \ \ \ | |_|/ / / |/| | | | Prevent endless loop in \OC\Files\View::createParentDirectories
| * | | | Add testsLukas Reschke2016-12-011-0/+71
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Prevent endless loop in \OC\Files\View::createParentDirectoriesLukas Reschke2016-12-011-5/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | \OC\Files\View::createParentDirectories was previously prone to an endless loop. If a path such as /foo/existingfile.txt/bar/foo was passed and existingfile.txt existed in foo the loop was never left and running until the PHP process timed out. This commit changes the logic to a foreach loop over an array and additionally additional error handling using is_file. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2436 from nextcloud/fix_inline_action_goneBjörn Schießle2016-12-012-8/+8
|\ \ \ \ | | | | | | | | | | We should always show permanent actions
| * | | | fix mouse pointerBjoern Schiessle2016-12-011-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | We should always show permanent actionsRoeland Jago Douma2016-12-011-7/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #2416 from nextcloud/cache_all_avatar_responsesLukas Reschke2016-12-011-16/+10
|\ \ \ \ | | | | | | | | | | Cache all avatar responses
| * | | | Cache all avatar responsesRoeland Jago Douma2016-11-301-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Cache for 30 minutes * Also cache when avatar can't be found Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #2423 from nextcloud/fix-language-namesLukas Reschke2016-12-013-135/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix naming of languages
| * | | | | LanguageMorris Jobke2016-11-303-135/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #2430 from nextcloud/avatar_changelogRoeland Jago Douma2016-12-011-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add avatar info to changelog
| * | | | | | Add avatar info to changelogRoeland Jago Douma2016-12-011-0/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #2371 from ↵Lukas Reschke2016-12-014-3/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-2369-add-share-indicator-for-mail-shares Add share indicator for mail shares
| * | | | | | Display link share icon when toggling shareRoeland Jago Douma2016-11-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Add an icon when the file is shared by mailJoas Schilling2016-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Also return the ShareByMail provider when getting allJoas Schilling2016-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Also get infos about email sharesJoas Schilling2016-11-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Make sure the app is loaded in davJoas Schilling2016-11-301-1/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #2425 from nextcloud/show-real-apps-ratingRoeland Jago Douma2016-12-012-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Show app store rating only for 5+ votes
| * | | | | Show app store rating only for 5+ votesMorris Jobke2016-11-302-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * shows the rating of an app only if a given amount of ratings are given * fixes #2001 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / | | | [tx-robot] updated from transifexNextcloud bot2016-12-0122-212/+298
|/ / / /
* | | | Merge pull request #2422 from nextcloud/text-preview-debugRobin Appelman2016-11-301-5/+1
|\ \ \ \ | |_|/ / |/| | | remove js debug statements in sidebar text preview generator
| * | | remove js debug statements in sidebar text preview generatorRobin Appelman2016-11-301-5/+1
| | |/ | |/| | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-30523-27352/+490
| | |
* | | 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