summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10227 from nextcloud/bugfix/10160/ldap-bind-loopMorris Jobke2018-07-132-3/+3
|\
| * Fix tests for backup ldap server connectionJulius Härtl2018-07-131-2/+2
| * Only bind if configuration for the first server is availableJulius Härtl2018-07-131-1/+1
* | Merge pull request #10224 from nextcloud/fix-formatting-of-email-and-circle-s...Morris Jobke2018-07-132-8/+62
|\ \
| * | Fix formatting of email and circle sharesDaniel Calviño Sánchez2018-07-122-8/+62
| |/
* | Merge pull request #10225 from danielkesselberg/bugfix/8529/fix-url-generatio...John Molakvoæ2018-07-131-2/+2
|\ \
| * | Fix call to OC.generateUrl for caldav birthday calendar on/offDaniel Kesselberg2018-07-121-2/+2
* | | Merge pull request #10223 from nextcloud/fix-sharingBjörn Schießle2018-07-131-1/+1
|\ \ \
| * | | fix selection of share providerBjoern Schiessle2018-07-121-1/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2018-07-1326-0/+162
* | | Merge pull request #10176 from nextcloud/newhinton/masterJohn Molakvoæ2018-07-1211-119/+781
|\ \ \ | |/ / |/| |
| * | No draggable list anymoreRoeland Jago Douma2018-07-121-1/+0
| * | Fix testsRoeland Jago Douma2018-07-122-22/+29
| * | Inject helperRoeland Jago Douma2018-07-121-1/+3
| * | Fixed testsJohn Molakvoæ (skjnldsv)2018-07-126-90/+21
| * | Fixed favorite folder view displayJohn Molakvoæ (skjnldsv)2018-07-125-14/+23
| * | Fixed invalid uidJohn Molakvoæ (skjnldsv)2018-07-122-2/+2
| * | Default state to collapsed and fixed code stylingJohn Molakvoæ (skjnldsv)2018-07-123-11/+6
| * | Fix app nav menu highlightJohn Molakvoæ (skjnldsv)2018-07-121-10/+3
| * | Added drop-animation to sortable-listfnuesse2018-07-126-41/+108
| * | Fix collapsible-Button when list was emptied (or got first element)fnuesse2018-07-124-21/+34
| * | Set Quickaccess-ordering to custom orderfnuesse2018-07-121-1/+1
| * | Removed old codefnuesse2018-07-127-373/+497
| * | Added copyright noticefnuesse2018-07-121-0/+1
| * | Changed togglefnuesse2018-07-123-51/+42
| * | Fixed css-flashingfnuesse2018-07-124-7/+33
| * | Added responsive folderaddingfnuesse2018-07-124-11/+91
| * | Fixed complete app-breakdown if no favorites are setfnuesse2018-07-122-8/+23
| * | Added toggleable QuickAccessfnuesse2018-07-127-113/+360
| * | Added FavoritesQuickaccess-Sidebarfnuesse2018-07-126-19/+181
|/ /
* | Merge pull request #10213 from nextcloud/bugfix/noid/shorten-resource-table-n...Morris Jobke2018-07-1213-37/+34
|\ \
| * | Also shorten the name of the invitation tokensJoas Schilling2018-07-127-14/+14
| * | Shorten resource table names to allow install on oracle againJoas Schilling2018-07-126-23/+20
* | | Merge pull request #10211 from nextcloud/bugfix/10203/correctly-init-empty-ar...Morris Jobke2018-07-122-2/+2
|\ \ \ | |/ / |/| |
| * | Correctly init empty arraysJoas Schilling2018-07-122-2/+2
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-07-1216-12/+54
* | Merge pull request #10206 from nextcloud/bugfix/noid/fix-unit-testsMorris Jobke2018-07-111-32/+15
|\ \
| * | Fix unit tests - follow up to #10197Morris Jobke2018-07-111-32/+15
* | | Merge pull request #10204 from nextcloud/fix/noid/strict_csp_evalMorris Jobke2018-07-111-1/+1
|\ \ \ | |/ / |/| |
| * | Disallow eval on the StrictEvalCSPRoeland Jago Douma2018-07-111-1/+1
* | | Merge pull request #9895 from nextcloud/fed-group-sharesMorris Jobke2018-07-1136-228/+935
|\ \ \
| * | | fix unit testsBjoern Schiessle2018-07-112-1/+4
| * | | add some integration testsBjoern Schiessle2018-07-112-0/+121
| * | | fix js testsBjoern Schiessle2018-07-111-24/+82
| * | | update unit testsBjoern Schiessle2018-07-117-40/+120
| * | | update autoloaderBjoern Schiessle2018-07-112-0/+2
| * | | start to get fed group shares into the share dialogBjoern Schiessle2018-07-116-5/+120
| * | | handle unshare request from ownerBjoern Schiessle2018-07-111-18/+25
| * | | unshare from selfBjoern Schiessle2018-07-111-10/+15
| * | | accept/decline group sharesBjoern Schiessle2018-07-114-15/+98