summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix droneMorris Jobke2017-07-144-9/+15
| | | | | | | | | Fix service container host name check current folder fix redis for integration test Fix more hostnames Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-07-1430-258/+406
|
* Merge pull request #5708 from nextcloud/nested-permissions-maskMorris Jobke2017-07-132-1/+16
|\ | | | | Fix scan permissions with nested permissions masks
| * Fix scan permissions with nested permissions masksRobin Appelman2017-07-132-1/+16
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #5715 from nextcloud/master-5655Morris Jobke2017-07-132-25/+104
|\ \ | | | | | | Fixed repair step
| * | chunk getting invalid paths and reuse queriesRobin Appelman2017-07-132-27/+99
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | use a generator instead of fetching all rows at onceRobin Appelman2017-07-131-2/+9
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #5070 from nextcloud/theming-vs-themesJoas Schilling2017-07-135-42/+77
|\ \ \ | |_|/ |/| | Prefer custom theme over the theming app
| * | Prefer custom theme over theming appJulius Härtl2017-07-125-42/+77
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #5695 from nextcloud/dont-error-when-the-table-doesnt-existRoeland Jago Douma2017-07-131-0/+3
|\ \ \ | |_|/ |/| | Don't throw an error when the table doesn't exist
| * | Don't throw an error when the table doesn't existJoas Schilling2017-07-121-0/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5703 from nextcloud/autoloader_fixMorris Jobke2017-07-132-0/+2
|\ \ \ | | | | | | | | Fix autoloader
| * | | Fix autoloaderRoeland Jago Douma2017-07-132-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-1356-270/+376
|/ / /
* | | Merge pull request #4984 from nextcloud/tmpcertfileRoeland Jago Douma2017-07-123-7/+45
|\ \ \ | | | | | | | | Create a temp certfile
| * | | Write cert bundle to tmp file firstRoeland Jago Douma2017-07-123-7/+45
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5690 from nextcloud/files-checkerLukas Reschke2017-07-122-0/+112
|\ \ \ \ | |/ / / |/| | | Add test to check if new files are added to the root of the repository
| * | | Add test to check if new files are added to the root of the repositoryMorris Jobke2017-07-122-0/+112
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5567 from nextcloud/public-capabilitiesRoeland Jago Douma2017-07-128-6/+112
|\ \ \ \ | | | | | | | | | | Public capabilities API
| * | | | Update autoloaderMorris Jobke2017-07-042-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Simplify if condition for public capabilitiesJulius Härtl2017-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add tests for public capabiltiesJulius Härtl2017-06-302-0/+63
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Expose theming capabilities to publicJulius Härtl2017-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add public capabilities APIJulius Härtl2017-06-303-4/+45
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #5685 from nextcloud/jail-propagatorRoeland Jago Douma2017-07-123-26/+27
|\ \ \ \ \ | |_|/ / / |/| | | | Fix propagating changes within jail wrapper
| * | | | Fix propagating changes within jail wrapperRobin Appelman2017-07-113-26/+27
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-12154-1636/+1896
| | | |
* | | | Merge pull request #5657 from nextcloud/select-error-textLukas Reschke2017-07-111-0/+4
|\ \ \ \ | | | | | | | | | | [Small] warning is now selecteable
| * | | | warning is now selecteableMaxence Lange2017-07-081-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | | Merge pull request #5681 from nextcloud/upstream-fix-circlesMorris Jobke2017-07-114-9/+15
|\ \ \ \ \ | |_|/ / / |/| | | | upstream fix circles
| * | | | upstreamMaxence Lange2017-07-114-9/+15
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | | Merge pull request #5672 from nextcloud/upload-hidden-filelistMorris Jobke2017-07-112-9/+13
|\ \ \ \ \ | |/ / / / |/| | | | properly block file upload to non-active filelist
| * | | | fix testRobin Appelman2017-07-111-9/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | properly block file upload to non-active filelistRobin Appelman2017-07-101-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #5662 from nextcloud/comradekingu-patch-1Morris Jobke2017-07-111-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Spelling: No shouting at user, and Facebook
| * | | | | Spelling: No shouting at user, and FacebookAllan Nordhøy2017-07-091-5/+5
| | | | | |
* | | | | | Merge pull request #5656 from ↵Morris Jobke2017-07-109-41/+394
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-unselecting-items-on-multi-select-dropdowns Fix unselecting items on multi select dropdowns
| * | | | | | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-103-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toggleSelect extension for Select2 makes possible to unselect items in a multi-select dropdown by clicking on them; this behaviour should be enabled in all the multi-select dropdowns used in the server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | Add select2-toggleselect to the JavaScript files to loadDaniel Calviño Sánchez2017-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "select2-toggleselect.js" provides an extension to Select2 that makes possible to unselect items in a multi-select dropdown by clicking on them. It seems that its load slipped through when moving things around in commit 6a470e59356b8c52115fe2790666027f38977604; this commit adds it to the JavaScript files to be loaded in the same position that it should have had in that commit (based on how the other declarations were moved). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | Add acceptance tests for unselecting items in dropdown for tagsDaniel Calviño Sánchez2017-07-104-0/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | Extract app navigation elements to its own contextDaniel Calviño Sánchez2017-07-083-39/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The app navigation is not exclusive to the Files app but a generic component used by other apps too, so its locators and steps should be in its own context. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | Fix typoDaniel Calviño Sánchez2017-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | Merge pull request #5666 from nextcloud/comradekingu-patch-2Morris Jobke2017-07-101-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Spelling: No "we" for recommendations.
| * | | | | | | Spelling: No "we" for recommendations.Allan Nordhøy2017-07-101-11/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5669 from nextcloud/fix-remote-share-activity-emailsMorris Jobke2017-07-102-8/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix remote share activity emails
| * | | | | | | Fix owner cloud id in unshare activityJoas Schilling2017-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Fix activity emails for accept/decline of remote sharesJoas Schilling2017-07-102-7/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #5671 from GitHubUser4234/ldap_password_renew_nc12fixMorris Jobke2017-07-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Rectify variable in RenewpasswordController
| * | | | | | Rectify variable $uid->$userRoger Szabo2017-07-101-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | | | Merge pull request #5649 from nextcloud/fix-5611Morris Jobke2017-07-102-9/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix alignment of radio button and its label in encryption settings
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 23:54:18 +0000