summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cleanup some unused sharing methods from the old sharing codeMorris Jobke2018-11-023-22/+14
* Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cronMorris Jobke2018-11-015-76/+12
|\
| * Revert "Wait for cron to finish before running upgrade command"Morris Jobke2018-11-015-76/+12
* | Merge pull request #12196 from nextcloud/revert-12138-and-12138Morris Jobke2018-11-012-4/+3
|\ \
| * | Revert "Fix .hidden class specificity, should not be overridable, ref #12138"Julius Härtl2018-11-011-3/+3
| * | Revert "make .button inline-block"Julius Härtl2018-11-011-1/+0
|/ /
* | Merge pull request #12152 from brad2014/bugfix/12151/fix-emailtemplate-list-f...Morris Jobke2018-11-011-2/+3
|\ \
| * | Fix bug #12151: fix list formatting by correcting malformed htmlbrad20142018-10-301-2/+3
* | | Merge pull request #12150 from nextcloud/techdebt/noid/ldap-rm-iusertoolsMorris Jobke2018-11-017-179/+110
|\ \ \ | |_|/ |/| |
| * | remove app specific IUserTools and consolidate testArthur Schiwon2018-10-307-179/+110
| |/
* | Merge pull request #12180 from nextcloud/sidebar-fixesMorris Jobke2018-11-013-7/+37
|\ \
| * | Fix design of tabs in sidebarJan-Christoph Borchardt2018-11-011-5/+25
| * | Fix issues with clipboard button for local link in sidebarJan-Christoph Borchardt2018-11-011-2/+8
| * | Add icon to Versions sidebar tabJan-Christoph Borchardt2018-11-011-0/+4
* | | Merge pull request #12163 from nextcloud/bugfix/11730/file-share-edit-stateMorris Jobke2018-11-013-1/+40
|\ \ \
| * | | Add tests for edit permission state on file sharesJulius Härtl2018-10-311-0/+31
| * | | Do not set indeterminate state for file sharesJulius Härtl2018-10-312-1/+9
* | | | Merge pull request #12162 from nextcloud/file-menu-alignMorris Jobke2018-11-011-2/+13
|\ \ \ \
| * | | | Align file menu below '+' button, fix #5595Jan-Christoph Borchardt2018-10-311-2/+13
| | |_|/ | |/| |
* | | | Merge pull request #12129 from nextcloud/versions-modular-apiMorris Jobke2018-11-0121-120/+798
|\ \ \ \
| * | | | modular versions apiRobin Appelman2018-11-0121-120/+798
* | | | | Merge pull request #12181 from nextcloud/fix-header-clickabilityRoeland Jago Douma2018-11-011-0/+1
|\ \ \ \ \
| * | | | | Fix header app name clickability issue, fix #12165Jan-Christoph Borchardt2018-11-011-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #12072 from nextcloud/writestreamRoeland Jago Douma2018-11-0114-38/+305
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix writeStream for jail wrapperRobin Appelman2018-10-314-1/+36
| * | | | update dav testsRobin Appelman2018-10-311-3/+3
| * | | | allways fall back to fopen for encryption wrapperRobin Appelman2018-10-312-1/+25
| * | | | Update autoloaderRoeland Jago Douma2018-10-312-0/+4
| * | | | extend storage api to allow directly writing a stream to storageRobin Appelman2018-10-317-34/+238
* | | | | [tx-robot] updated from transifexNextcloud bot2018-11-0114-0/+34
|/ / / /
* | | | Merge pull request #12167 from nextcloud/hidden-classRoeland Jago Douma2018-10-311-3/+3
|\ \ \ \
| * | | | Fix .hidden class specificity, should not be overridable, ref #12138Jan-Christoph Borchardt2018-10-311-3/+3
* | | | | Merge pull request #12166 from nextcloud/feature/limit_preview_sizesRoeland Jago Douma2018-10-312-15/+25
|\ \ \ \ \
| * | | | | Only generate previews in powers of 4 and set minRoeland Jago Douma2018-10-312-15/+25
* | | | | | Merge pull request #12169 from nextcloud/interface-fulltextsearc-issue-00001Roeland Jago Douma2018-10-312-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | missing typeMaxence Lange2018-10-311-2/+2
| * | | | | wrong method calledMaxence Lange2018-10-311-1/+1
|/ / / / /
* | | | | Merge pull request #12170 from nextcloud/fix/noid/tests-from-12009blizzz2018-10-311-99/+41
|\ \ \ \ \
| * | | | | Revert "Populate the mention-notification with the actual message"Arthur Schiwon2018-10-311-99/+41
|/ / / / /
* | | | | Merge pull request #11647 from nextcloud/make-possible-for-tab-views-to-add-c...Julius Härtl2018-10-312-0/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make possible for tab views to add CSS classes to their containerDaniel Calviño Sánchez2018-10-042-0/+18
* | | | | Merge pull request #12146 from nextcloud/fix/noid/verifyuserdata-on-nullRoeland Jago Douma2018-10-311-0/+4
|\ \ \ \ \
| * | | | | fixes an Exception on the background job because the config was not setArthur Schiwon2018-10-301-0/+4
* | | | | | Merge pull request #12009 from nextcloud/feature/noid/populate-notification-m...blizzz2018-10-311-41/+99
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Populate the mention-notification with the actual messageJoas Schilling2018-10-301-41/+99
* | | | | | Merge pull request #12095 from MasterOfDeath/OCA-ShareByMail-Capabilities-tes...Roeland Jago Douma2018-10-311-0/+51
|\ \ \ \ \ \
| * | | | | | OCA\ShareByMail\Capabilities unit testMasterOfDeath2018-10-311-0/+51
* | | | | | | Merge pull request #12147 from MasterOfDeath/OCA-SystemTags-Activity-Setting-...Roeland Jago Douma2018-10-311-0/+72
|\ \ \ \ \ \ \
| * | | | | | | OCA\SystemTags\Activity\Setting unit testRinat Gumirov2018-10-311-0/+72
* | | | | | | | Merge pull request #12153 from nextcloud/appnamesJohn Molakvoæ2018-10-314-20/+87
|\ \ \ \ \ \ \ \