summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2469 from nextcloud/fix-loading-icon-backgroundMorris Jobke2016-12-022-2/+8
|\
| * Remove white background from loading iconMorris Jobke2016-12-022-2/+8
* | Merge pull request #2470 from nextcloud/fix-new-folderMorris Jobke2016-12-021-2/+4
|\ \
| * | Increase width of new menuMorris Jobke2016-12-021-1/+1
| * | fix vertical sizing change of popover in new folder flowJan-Christoph Borchardt2016-12-021-0/+1
| * | Fix input field for new folder - fixes #2245Morris Jobke2016-12-021-1/+2
| |/
* | Merge pull request #2448 from nextcloud/errorreload-loginRobin Appelman2016-12-022-1/+5
|\ \ | |/ |/|
| * adjust js testsRobin Appelman2016-12-021-0/+4
| * only reload on errors when logged inRobin Appelman2016-12-011-1/+1
* | [tx-robot] updated from transifexNextcloud bot2016-12-028-140/+146
|/
* Merge pull request #2432 from nextcloud/activity-mail-languageMorris Jobke2016-12-0113-51/+132
|\
| * Adjust all implementations in the server repoJoas Schilling2016-12-0112-47/+125
| * Add language to the parse method for emailsJoas Schilling2016-12-011-4/+7
* | Merge pull request #2444 from nextcloud/detect-also-a-400-statusChristoph Wurst2016-12-012-1/+6
|\ \
| * | Catch status code 400Lukas Reschke2016-12-012-1/+6
* | | 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 come with ...Robin Appelman2016-12-011-3/+12
* | | | Merge pull request #2441 from nextcloud/optimize-createParentDirectoriesRoeland Jago Douma2016-12-012-5/+81
|\ \ \ \ | |_|/ / |/| | |
| * | | Add testsLukas Reschke2016-12-011-0/+71
| * | | Prevent endless loop in \OC\Files\View::createParentDirectoriesLukas Reschke2016-12-011-5/+10
|/ / /
* | | Merge pull request #2436 from nextcloud/fix_inline_action_goneBjörn Schießle2016-12-012-8/+8
|\ \ \
| * | | fix mouse pointerBjoern Schiessle2016-12-011-1/+5
| * | | We should always show permanent actionsRoeland Jago Douma2016-12-011-7/+3
|/ / /
* | | Merge pull request #2416 from nextcloud/cache_all_avatar_responsesLukas Reschke2016-12-011-16/+10
|\ \ \
| * | | Cache all avatar responsesRoeland Jago Douma2016-11-301-16/+10
* | | | Merge pull request #2423 from nextcloud/fix-language-namesLukas Reschke2016-12-013-135/+3
|\ \ \ \
| * | | | LanguageMorris Jobke2016-11-303-135/+3
* | | | | Merge pull request #2430 from nextcloud/avatar_changelogRoeland Jago Douma2016-12-011-0/+5
|\ \ \ \ \
| * | | | | Add avatar info to changelogRoeland Jago Douma2016-12-011-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-ma...Lukas Reschke2016-12-014-3/+23
|\ \ \ \ \
| * | | | | Display link share icon when toggling shareRoeland Jago Douma2016-11-301-1/+10
| * | | | | Add an icon when the file is shared by mailJoas Schilling2016-11-301-0/+2
| * | | | | Also return the ShareByMail provider when getting allJoas Schilling2016-11-301-0/+4
| * | | | | Also get infos about email sharesJoas Schilling2016-11-301-1/+2
| * | | | | Make sure the app is loaded in davJoas Schilling2016-11-301-1/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #2425 from nextcloud/show-real-apps-ratingRoeland Jago Douma2016-12-012-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Show app store rating only for 5+ votesMorris Jobke2016-11-302-1/+3
* | | | | [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 generatorRobin Appelman2016-11-301-5/+1
| | |/ | |/|
* | | [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 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