summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* jQuery UI dropdown: correct max-height of 4 1/2 entriesJan-Christoph Borchardt2016-11-171-3/+3
* jQuery UI dropdown: correct clickable area of 44pxJan-Christoph Borchardt2016-11-171-0/+4
* Merge pull request #2177 from nextcloud/appmanager-getapppathMorris Jobke2016-11-174-0/+67
|\
| * Expose getAppPath to public APIJulius Haertl2016-11-174-0/+67
* | Merge pull request #2188 from nextcloud/remove-settings-pane-in-apps-managementMorris Jobke2016-11-171-5/+0
|\ \
| * | Remove settings pane in app managementMorris Jobke2016-11-171-5/+0
* | | Merge pull request #2187 from nextcloud/select2-adjustmentsMorris Jobke2016-11-171-1/+13
|\ \ \
| * | | select2: show cursor pointer on hovering entriesJan-Christoph Borchardt2016-11-171-0/+9
| * | | select2: make sure dropdown always shows a last half entry to hint at moreJan-Christoph Borchardt2016-11-171-1/+1
| * | | select2: ellipsize long namesJan-Christoph Borchardt2016-11-171-0/+3
* | | | Merge pull request #2176 from nextcloud/share-cache-root-infoMorris Jobke2016-11-174-3/+37
|\ \ \ \
| * | | | reuse the known rootinfo in the shared cache when possibleRobin Appelman2016-11-174-3/+37
| | |_|/ | |/| |
* | | | Merge pull request #2173 from nextcloud/bugfix/2171/birthday-12-31-too-youngRobin Appelman2016-11-172-1/+6
|\ \ \ \
| * | | | BirthdayCalendar: fix issue with birthyear to high when birthday on Dec 31stGeorg Ehrke2016-11-172-1/+6
* | | | | Merge pull request #2163 from nextcloud/app-password-scope-warngingsMorris Jobke2016-11-172-5/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix warnings when updating app passwordRobin Appelman2016-11-162-5/+3
* | | | | Merge pull request #2167 from nextcloud/mountmanager-lockdownMorris Jobke2016-11-171-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | ensure we setup the mount manager when in lockdownRobin Appelman2016-11-161-2/+2
| |/ / /
* | | | Merge pull request #2153 from nextcloud/version-hintMorris Jobke2016-11-171-4/+9
|\ \ \ \
| * | | | Show all in one messageJoas Schilling2016-11-161-4/+9
| * | | | add explanatory text of what to do on app version errorJan-Christoph Borchardt2016-11-161-2/+2
* | | | | Merge pull request #2124 from nextcloud/oc_26591Lukas Reschke2016-11-171-2/+7
|\ \ \ \ \
| * | | | | Cache js, css and woff files for a week (#26591)Jörn Friedrich Dreyer2016-11-141-2/+7
* | | | | | Merge pull request #2175 from nextcloud/token-invalidate-debugChristoph Wurst2016-11-171-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | use lower loglevel for token cleanup messagesRobin Appelman2016-11-171-2/+2
|/ / / / /
* | | | | Merge pull request #2170 from nextcloud/ocs_person_to_controllerJoas Schilling2016-11-175-57/+248
|\ \ \ \ \
| * | | | | Add OCSControllerTestsRoeland Jago Douma2016-11-161-0/+209
| * | | | | Move OC\OCS\Person to OCSControllerRoeland Jago Douma2016-11-164-57/+39
* | | | | | Merge pull request #2174 from nextcloud/icons-audio-video-offJoas Schilling2016-11-177-2/+42
|\ \ \ \ \ \
| * | | | | | add icons for audio mute and video offJan-Christoph Borchardt2016-11-177-2/+42
|/ / / / / /
* | | | | | Merge pull request #2164 from nextcloud/token-login-wanringLukas Reschke2016-11-171-1/+1
|\ \ \ \ \ \
| * | | | | | fix warning with token loginRobin Appelman2016-11-161-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2016-11-17118-460/+832
* | | | | | Merge pull request #2122 from nextcloud/downstream-26520Morris Jobke2016-11-173-7/+11
|\ \ \ \ \ \
| * | | | | | only use one kind of hack for the storage wrappers of the sharing codeMorris Jobke2016-11-162-1/+4
| * | | | | | Hack to prevent warning for read-only wrapper in public linksVincent Petry2016-11-162-6/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2141 from nextcloud/icon-backgroundRoeland Jago Douma2016-11-175-7/+31
|\ \ \ \ \ \
| * | | | | | add dark background fade to icons to make them visible on light backgroundsJan-Christoph Borchardt2016-11-155-7/+31
* | | | | | | Merge pull request #2151 from nextcloud/theming-fixesMorris Jobke2016-11-162-30/+53
|\ \ \ \ \ \ \
| * | | | | | | theming: move reset button into field and only show when focusedJan-Christoph Borchardt2016-11-162-30/+53
| |/ / / / / /
* | | | | | | Merge pull request #2131 from nextcloud/fix-tabs-in-translationRoeland Jago Douma2016-11-161-6/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | No HTML in stringRoeland Jago Douma2016-11-161-1/+10
| * | | | | | convert text to single line so tabs in translation issue is fixedJan-Christoph Borchardt2016-11-161-6/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2147 from nextcloud/dont-update-same-valueRoeland Jago Douma2016-11-161-4/+6
|\ \ \ \ \ \
| * | | | | | Use getvalue to fetch the valueRoeland Jago Douma2016-11-161-5/+4
| * | | | | | Don't update value if it is already set to the same valueMorris Jobke2016-11-161-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2157 from nextcloud/fix-checkboxesJoas Schilling2016-11-163-8/+6
|\ \ \ \ \ \
| * | | | | | Fix margin for checkboxes in multiselect optionsJulius Haertl2016-11-161-3/+1
| * | | | | | Revert "Fix #1782"Julius Haertl2016-11-162-5/+5
* | | | | | | Merge pull request #2123 from nextcloud/downstream-26522Joas Schilling2016-11-162-2/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |