summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4518 from nextcloud/downstream-25838Roeland Jago Douma2017-04-262-0/+75
|\
| * Fix share indicator handlingVincent Petry2017-04-262-0/+75
* | handle 404 separatelyGeorg Ehrke2017-04-262-2/+24
* | unit test jquery.contactsmenuGeorg Ehrke2017-04-261-0/+198
* | better detection whether or not contactsmenu target was clickedGeorg Ehrke2017-04-261-2/+2
* | add contactsmenu popover to resharer infoboxGeorg Ehrke2017-04-262-0/+9
* | Contactsmenu popover: show proper message when server throws errorGeorg Ehrke2017-04-261-2/+8
* | don't toggle sharing popover together with contactsmenu popoverGeorg Ehrke2017-04-261-2/+2
* | close menu again when clicking on avatarGeorg Ehrke2017-04-261-29/+26
* | add contactsmenu popoverGeorg Ehrke2017-04-267-2/+153
|/
* [tx-robot] updated from transifexNextcloud bot2017-04-2620-6/+108
* Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-268-1/+360
|\
| * Merge pull request #4508 from nextcloud/fix/remove-js-debug-loggingMorris Jobke2017-04-251-1/+0
| |\
| | * Remove js debug loggingChristoph Wurst2017-04-251-1/+0
| * | Fix auth flow background color and redirect view layoutJan-Christoph Borchardt2017-04-252-4/+11
| * | AppToken to 72 charsRoeland Jago Douma2017-04-251-1/+1
| * | Do not remove the state token to earlyRoeland Jago Douma2017-04-251-1/+3
| * | Correctly case the stateTokenRoeland Jago Douma2017-04-251-1/+1
| * | Add new auth flowLukas Reschke2017-04-257-0/+351
| |/
* | Fix testJan-Christoph Borchardt2017-04-261-1/+1
* | Fix emptycontent HTML and wordingJan-Christoph Borchardt2017-04-251-4/+5
* | Fix spinner position of Contacts menuJan-Christoph Borchardt2017-04-251-3/+1
* | Use HTTP POST to retrieve the list of contactsChristoph Wurst2017-04-252-2/+2
* | Fix failing contacts menu js test dataChristoph Wurst2017-04-251-2/+12
* | Fix icon of second actionChristoph Wurst2017-04-251-3/+5
* | Use absolute URI for action iconsChristoph Wurst2017-04-251-2/+4
* | Let apps register contact menu provider via info.xmlChristoph Wurst2017-04-251-6/+7
* | Use tooltop for contact's top action titleChristoph Wurst2017-04-251-1/+4
* | Contacts menuChristoph Wurst2017-04-2511-21/+988
|/
* Fix loading spinner for new app menuJulius Härtl2017-04-252-13/+33
* Responsive app menuJulius Härtl2017-04-253-87/+100
* Merge pull request #3195 from nextcloud/settings-apps-tabularMorris Jobke2017-04-251-0/+0
|\
| * Fix app icon being inverted for app store apps tooJan-Christoph Borchardt2017-04-251-0/+1
| * Show placeholder for image-less apps in app managementJan-Christoph Borchardt2017-04-251-1/+0
* | Merge pull request #4462 from danxuliu/fix-sharing-password-protected-linkRoeland Jago Douma2017-04-254-33/+327
|\ \
| * | Use "complete" callback in onPasswordEnteredDaniel Calviño Sánchez2017-04-242-3/+3
| * | Extract common ajax call for addShare and updateShareDaniel Calviño Sánchez2017-04-241-36/+17
| * | Document options parameter in saveLinkShareDaniel Calviño Sánchez2017-04-241-1/+8
| * | Add "complete" callback support for addShareDaniel Calviño Sánchez2017-04-242-0/+57
| * | Add "complete" callback support for updateShareDaniel Calviño Sánchez2017-04-242-0/+55
| * | Add missing unit test cases and conditionsDaniel Calviño Sánchez2017-04-241-0/+49
| * | Fix working icon not hidden when successfully setting a passwordDaniel Calviño Sánchez2017-04-242-0/+145
* | | Fix remember redirect_url on failed login attemptsChristoph Wurst2017-04-251-0/+3
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2560-1464/+544
| |/ |/|
* | Merge pull request #4321 from nextcloud/improve-sharing-tooltipMorris Jobke2017-04-241-43/+38
|\ \
| * | simplify share placeholderBjoern Schiessle2017-04-181-20/+7
| * | change sharing tooltip with a more general description of all available share...Bjoern Schiessle2017-04-121-23/+31
* | | Fix link password toggleRoeland Jago Douma2017-04-241-1/+1
* | | Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password...Roeland Jago Douma2017-04-241-2/+2
|\ \ \
| * | | Fix working icon placement on password saveDaniel Calviño Sánchez2017-04-241-2/+2