summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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"
| * Revert "Wait for cron to finish before running upgrade command"Morris Jobke2018-11-015-76/+12
| | | | | | | | | | | | This reverts commit 18e9631810ad1d3d72c2b4bbee330169808108ad. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #12196 from nextcloud/revert-12138-and-12138Morris Jobke2018-11-012-4/+3
|\ \ | | | | | | Revert important rule for hidden class and inline button style
| * | Revert "Fix .hidden class specificity, should not be overridable, ref #12138"Julius Härtl2018-11-011-3/+3
| | | | | | | | | | | | This reverts commit 25e70e1eb798d9292b4d5864d89c6c424ff0218c.
| * | Revert "make .button inline-block"Julius Härtl2018-11-011-1/+0
|/ / | | | | | | This reverts commit 87c3f79399f4b3e71fa1d0ff6d774c9c9f6ddc18.
* | Merge pull request #12152 from ↵Morris Jobke2018-11-011-2/+3
|\ \ | | | | | | | | | | | | brad2014/bugfix/12151/fix-emailtemplate-list-formatting Fix issue #12151: fix list formatting by correcting malformed html
| * | Fix bug #12151: fix list formatting by correcting malformed htmlbrad20142018-10-301-2/+3
| | | | | | | | | | | | Signed-off-by: Brad Rubenstein <brad@wbr.tech>
* | | Merge pull request #12150 from nextcloud/techdebt/noid/ldap-rm-iusertoolsMorris Jobke2018-11-017-179/+110
|\ \ \ | |_|/ |/| | remove app specific IUserTools and consolidate test
| * | remove app specific IUserTools and consolidate testArthur Schiwon2018-10-307-179/+110
| |/ | | | | | | | | | | | | Just some house keeping. IUserTools with used in even older days for easier creation of Access instances… Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #12180 from nextcloud/sidebar-fixesMorris Jobke2018-11-013-7/+37
|\ \ | | | | | | Sidebar fixes, mostly fixing design of tabs
| * | Fix design of tabs in sidebarJan-Christoph Borchardt2018-11-011-5/+25
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Fix issues with clipboard button for local link in sidebarJan-Christoph Borchardt2018-11-011-2/+8
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Add icon to Versions sidebar tabJan-Christoph Borchardt2018-11-011-0/+4
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #12163 from nextcloud/bugfix/11730/file-share-edit-stateMorris Jobke2018-11-013-1/+40
|\ \ \ | | | | | | | | Do not set indeterminate state for file shares
| * | | Add tests for edit permission state on file sharesJulius Härtl2018-10-311-0/+31
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Do not set indeterminate state for file sharesJulius Härtl2018-10-312-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #12162 from nextcloud/file-menu-alignMorris Jobke2018-11-011-2/+13
|\ \ \ \ | | | | | | | | | | Align file menu below '+' button, fix #5595
| * | | | Align file menu below '+' button, fix #5595Jan-Christoph Borchardt2018-10-311-2/+13
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #12129 from nextcloud/versions-modular-apiMorris Jobke2018-11-0121-120/+798
|\ \ \ \ | | | | | | | | | | modular versions api
| * | | | modular versions apiRobin Appelman2018-11-0121-120/+798
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows apps to register version backends for storage types The existing versions backend is wrapped in a "legacy" backend. Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #12181 from nextcloud/fix-header-clickabilityRoeland Jago Douma2018-11-011-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix header app name clickability issue, fix #12165
| * | | | | Fix header app name clickability issue, fix #12165Jan-Christoph Borchardt2018-11-011-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #12072 from nextcloud/writestreamRoeland Jago Douma2018-11-0114-38/+305
|\ \ \ \ \ | |/ / / / |/| | | | extend storage api to allow directly writing a stream to storage
| * | | | fix writeStream for jail wrapperRobin Appelman2018-10-314-1/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | update dav testsRobin Appelman2018-10-311-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | allways fall back to fopen for encryption wrapperRobin Appelman2018-10-312-1/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Update autoloaderRoeland Jago Douma2018-10-312-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | extend storage api to allow directly writing a stream to storageRobin Appelman2018-10-317-34/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this removes the need for temporary storages with some external storage backends. The new method is added to a separate interface to maintain compatibility with storage backends implementing the storage interface directly (without inheriting common) Currently the interface is implemented for objectstorage based storages and local storage and used by webdav uploads Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [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 #12138
| * | | | Fix .hidden class specificity, should not be overridable, ref #12138Jan-Christoph Borchardt2018-10-311-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | 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 min
| * | | | | Only generate previews in powers of 4 and set minRoeland Jago Douma2018-10-312-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we'd round up all preview request to their nearest power of two. This resulted still in a lot of possible images. Generating a lot of server load and taking up a lot of space. This moves it to previews to be powers of 4: 64, 256, 1024 and 4096 Also the first two powers are always skipped (4, 16) as it doesn't make sense to generate previews for that. We cache preview pretty agressively and I feel this is a better tradeoff. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #12169 from nextcloud/interface-fulltextsearc-issue-00001Roeland Jago Douma2018-10-312-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | wrong method called
| * | | | | missing typeMaxence Lange2018-10-311-2/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | | wrong method calledMaxence Lange2018-10-311-1/+1
|/ / / / / | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | Merge pull request #12170 from nextcloud/fix/noid/tests-from-12009blizzz2018-10-311-99/+41
|\ \ \ \ \ | | | | | | | | | | | | Revert "Populate the mention-notification with the actual message"
| * | | | | Revert "Populate the mention-notification with the actual message"Arthur Schiwon2018-10-311-99/+41
|/ / / / / | | | | | | | | | | | | | | | This reverts commit d295ff53672d542f3b09ff0becd6a4a20ba1d494.
* | | | | Merge pull request #11647 from ↵Julius Härtl2018-10-312-0/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/make-possible-for-tab-views-to-add-css-classes-to-their-container Make possible for tab views to add CSS classes to their container
| * | | | Make possible for tab views to add CSS classes to their containerDaniel Calviño Sánchez2018-10-042-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general the style of the tabs container should not change depending on which tab is the currently selected one. However, this could be needed in some very specific cases, so now the tab views can specify the extra CSS classes to be used in their container when they are selected. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | 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 set
| * | | | | fixes an Exception on the background job because the config was not setArthur Schiwon2018-10-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #12009 from ↵blizzz2018-10-311-41/+99
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | nextcloud/feature/noid/populate-notification-message-with-the-comment Populate the mention-notification with the actual message
| * | | | | Populate the mention-notification with the actual messageJoas Schilling2018-10-301-41/+99
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #12095 from ↵Roeland Jago Douma2018-10-311-0/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | MasterOfDeath/OCA-ShareByMail-Capabilities-test-unit OCA\ShareByMail\Capabilities add unit test
| * | | | | | OCA\ShareByMail\Capabilities unit testMasterOfDeath2018-10-311-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OCA\ShareByMail\Capabilities unit test Signed-off-by: Rinat Gumirov <rinat.gumirov@mail.ru>
* | | | | | | Merge pull request #12147 from ↵Roeland Jago Douma2018-10-311-0/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MasterOfDeath/OCA-SystemTags-Activity-Setting-add-unit-test OCA\SystemTags\Activity\Setting unit test
| * | | | | | | OCA\SystemTags\Activity\Setting unit testRinat Gumirov2018-10-311-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rinat Gumirov <rinat.gumirov@mail.ru>
* | | | | | | | Merge pull request #12153 from nextcloud/appnamesJohn Molakvoæ2018-10-314-20/+87
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Show all app titles on hovering app menu area, fix #10952, fix #4619
| * | | | | | | | Show all app titles on hovering app menu area, fix #10952, fix #4619Jan-Christoph Borchardt2018-10-304-20/+87
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 23:59:57 +0000