summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6903 from nextcloud/feature/679/remove_valarms_from_read_...Joas Schilling2017-10-312-11/+221
|\
| * remove reminders from read-only shared calendarsGeorg Ehrke2017-10-222-11/+221
* | [tx-robot] updated from transifexNextcloud bot2017-10-3122-34/+348
* | Merge pull request #7016 from nextcloud/fix_6820Roeland Jago Douma2017-10-301-0/+4
|\ \
| * | Do not error when downloading from a numeric public subfolderRoeland Jago Douma2017-10-301-0/+4
|/ /
* | Merge pull request #7004 from Fiech/masterRoeland Jago Douma2017-10-301-0/+8
|\ \
| * | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-291-0/+8
* | | Merge pull request #7012 from nextcloud/show-favourite-action-as-the-first-oneJan-Christoph Borchardt2017-10-302-3/+7
|\ \ \
| * | | Reverse favorite icon coloring in files action menuJan-Christoph Borchardt2017-10-302-2/+6
| * | | Show favourite action as the first one in the file actions menuDaniel Calviño Sánchez2017-10-301-1/+1
* | | | Merge pull request #6867 from nextcloud/imessage-attachmentsGeorg Ehrke2017-10-308-1/+195
|\ \ \ \
| * | | | Move attachment creators to mailer classJoas Schilling2017-10-254-38/+39
| * | | | Fix docsJoas Schilling2017-10-192-8/+8
| * | | | Extend the API with teh parameters from SwiftJoas Schilling2017-10-192-3/+27
| * | | | Add attachment support to emailsJoas Schilling2017-10-186-1/+170
* | | | | Merge pull request #6932 from nextcloud/constants-for-talk-useragentsRoeland Jago Douma2017-10-301-0/+10
|\ \ \ \ \
| * | | | | Define constants for the talk user agentsJoas Schilling2017-10-241-0/+10
* | | | | | Merge pull request #6981 from nextcloud/unit-tests-for-6977Roeland Jago Douma2017-10-301-0/+26
|\ \ \ \ \ \
| * | | | | | Unit tests for #6977Joas Schilling2017-10-271-0/+26
* | | | | | | Merge pull request #6992 from nextcloud/2-lines-for-better-codeMorris Jobke2017-10-301-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Use ::class and fix missing docJoas Schilling2017-10-281-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #6976 from nextcloud/fix-checkbox-in-popoverMorris Jobke2017-10-302-16/+6
|\ \ \ \ \ \ \
| * | | | | | | Share views fixJohn Molakvoæ (skjnldsv)2017-10-261-11/+0
| * | | | | | | Fix checkboxes on popoverJohn Molakvoæ (skjnldsv)2017-10-262-5/+6
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-306-8/+10
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-298-20/+38
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-2814-86/+122
* | | | | | Merge pull request #6869 from burned42/6307-fix_page_title_not_changedDaniel Calviño Sánchez2017-10-273-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | bugfix: set/change page title when switching to file tagsBernd Stellwag2017-10-271-0/+3
| * | | | | bugfix: set/change page title when switching to filelistBernd Stellwag2017-10-272-1/+4
* | | | | | Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
|\ \ \ \ \ \
| * | | | | | Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-2728-32/+128
* | | | | | | Merge pull request #6973 from nextcloud/menu-highlightMorris Jobke2017-10-262-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Add blue highlight to active menu entryJan-Christoph Borchardt2017-10-242-0/+3
* | | | | | | | Merge pull request #6970 from nextcloud/class-usage-in-mocks-encryption-appMorris Jobke2017-10-2627-115/+176
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Use ::class in test mocks of encryption appMorris Jobke2017-10-2627-115/+176
|/ / / / / / /
* | | | | | | Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-appMorris Jobke2017-10-2642-113/+159
|\ \ \ \ \ \ \
| * | | | | | | Fix another warningMorris Jobke2017-10-261-4/+5
| * | | | | | | Use ::class in test mocks of dav appMorris Jobke2017-10-2641-109/+154
| |/ / / / / /
* | | | | | | Merge pull request #6949 from nextcloud/cachingrouter_localRoeland Jago Douma2017-10-261-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-26102-150/+226
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'mastix-master'Morris Jobke2017-10-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Updated OpenGraph title to display folder name instead of a nextcloud standar...Sascha Sambale2017-10-251-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #6947 from nextcloud/fix_6821Morris Jobke2017-10-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use new-password as autocomplete on share auth pageRoeland Jago Douma2017-10-251-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #6940 from nextcloud/master-6935-ellipsisJoas Schilling2017-10-252-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add space between ellipsis and wordMorris Jobke2017-10-252-3/+3
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-25100-80/+396