summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/...Andreas Jacobsen2017-07-24672-8160/+15570
|\
| * Merge branch 'master' into clean-settings-layoutAndreas Jacobsen2017-07-15672-8160/+15570
| |\
| | * [tx-robot] updated from transifexNextcloud bot2017-07-15158-4126/+4134
| | * Merge pull request #5724 from nextcloud/fix-droneMorris Jobke2017-07-144-19/+25
| | |\
| | | * Temporarily disable acceptance and object storage testsMorris Jobke2017-07-141-10/+10
| | | * Fix droneMorris Jobke2017-07-144-9/+15
| | * | Merge pull request #5699 from nextcloud/bruteforce_capabilityLukas Reschke2017-07-145-0/+125
| | |\ \
| | | * | Update autoloaderRoeland Jago Douma2017-07-132-0/+2
| | | * | Add bruteforce capabilitiesRoeland Jago Douma2017-07-133-0/+123
| | * | | Merge pull request #5725 from nextcloud/remove-legacy-filesBjörn Schießle2017-07-141-409/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | this template file is no longer neededBjoern Schiessle2017-07-141-409/+0
| | |/ /
| | * | [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 masksRobin Appelman2017-07-132-1/+16
| | * | | Merge pull request #5715 from nextcloud/master-5655Morris Jobke2017-07-132-25/+104
| | |\ \ \
| | | * | | chunk getting invalid paths and reuse queriesRobin Appelman2017-07-132-27/+99
| | | * | | use a generator instead of fetching all rows at onceRobin Appelman2017-07-131-2/+9
| | | | |/ | | | |/|
| | * | | Merge pull request #5070 from nextcloud/theming-vs-themesJoas Schilling2017-07-135-42/+77
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Prefer custom theme over theming appJulius Härtl2017-07-125-42/+77
| | * | | 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 existJoas Schilling2017-07-121-0/+3
| | * | | Merge pull request #5703 from nextcloud/autoloader_fixMorris Jobke2017-07-132-0/+2
| | |\ \ \
| | | * | | Fix autoloaderRoeland Jago Douma2017-07-132-0/+2
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-07-1356-270/+376
| | |/ / /
| | * | | Merge pull request #4984 from nextcloud/tmpcertfileRoeland Jago Douma2017-07-123-7/+45
| | |\ \ \
| | | * | | Write cert bundle to tmp file firstRoeland Jago Douma2017-07-123-7/+45
| | * | | | 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 repositoryMorris Jobke2017-07-122-0/+112
| | * | | | Merge pull request #5567 from nextcloud/public-capabilitiesRoeland Jago Douma2017-07-128-6/+112
| | |\ \ \ \
| | | * | | | Update autoloaderMorris Jobke2017-07-042-0/+2
| | | * | | | Simplify if condition for public capabilitiesJulius Härtl2017-06-301-1/+1
| | | * | | | Add tests for public capabiltiesJulius Härtl2017-06-302-0/+63
| | | * | | | Expose theming capabilities to publicJulius Härtl2017-06-301-2/+2
| | | * | | | Add public capabilities APIJulius Härtl2017-06-303-4/+45
| | * | | | | Merge pull request #5685 from nextcloud/jail-propagatorRoeland Jago Douma2017-07-123-26/+27
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Fix propagating changes within jail wrapperRobin Appelman2017-07-113-26/+27
| | | | |/ / | | | |/| |
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-07-12154-1636/+1896
| | * | | | Merge pull request #5657 from nextcloud/select-error-textLukas Reschke2017-07-111-0/+4
| | |\ \ \ \
| | | * | | | warning is now selecteableMaxence Lange2017-07-081-0/+4
| | * | | | | Merge pull request #5681 from nextcloud/upstream-fix-circlesMorris Jobke2017-07-114-9/+15
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | upstreamMaxence Lange2017-07-114-9/+15
| | * | | | | Merge pull request #5672 from nextcloud/upload-hidden-filelistMorris Jobke2017-07-112-9/+13
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | fix testRobin Appelman2017-07-111-9/+11
| | | * | | | properly block file upload to non-active filelistRobin Appelman2017-07-101-0/+2
| | * | | | | Merge pull request #5662 from nextcloud/comradekingu-patch-1Morris Jobke2017-07-111-5/+5
| | |\ \ \ \ \
| | | * | | | | Spelling: No shouting at user, and FacebookAllan Nordhøy2017-07-091-5/+5
| | * | | | | | Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select...Morris Jobke2017-07-109-41/+394
| | |\ \ \ \ \ \
| | | * | | | | | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-103-0/+3
| | | * | | | | | Add select2-toggleselect to the JavaScript files to loadDaniel Calviño Sánchez2017-07-101-0/+1
| | | * | | | | | Add acceptance tests for unselecting items in dropdown for tagsDaniel Calviño Sánchez2017-07-104-0/+318
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 23:59:41 +0000