summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix testsRoeland Jago Douma2017-11-292-13/+39
* Since we update the avatar in the sync service remove the generated fileRoeland Jago Douma2017-11-291-0/+7
* Sinc we use AppData the regex is not needed anymoreRoeland Jago Douma2017-11-291-4/+1
* Move avatar code to Avatar ClassRoeland Jago Douma2017-11-292-169/+190
* Always generate avatarRoeland Jago Douma2017-11-291-5/+155
* Merge pull request #7333 from nextcloud/mario-readme-patchRoeland Jago Douma2017-11-291-1/+1
|\
| * Update README.mdMario Đanić2017-11-291-1/+1
|/
* [tx-robot] updated from transifexNextcloud bot2017-11-2924-0/+186
* Merge pull request #7327 from nextcloud/bugfix/7325/access-list-regression-fo...blizzz2017-11-282-3/+120
|\
| * Only in case of $currentAccess the array uses the id as indexJoas Schilling2017-11-281-1/+7
| * Fix current access list test and add one for $currentAccess === falseJoas Schilling2017-11-281-2/+113
|/
* [tx-robot] updated from transifexNextcloud bot2017-11-28314-1958/+1066
* Merge pull request #7303 from nextcloud/fix-contact-menuMorris Jobke2017-11-271-0/+1
|\
| * Fix contacts menu height for SafariMorris Jobke2017-11-271-0/+1
* | Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_errorMorris Jobke2017-11-276-5/+44
|\ \
| * | catch errors when parsing calendar data for calendar query requestsGeorg Ehrke2017-11-276-5/+44
* | | Merge pull request #7305 from nextcloud/log-level-for-log-extendingMorris Jobke2017-11-272-4/+5
|\ \ \
| * | | Pass log level to log reportersMorris Jobke2017-11-272-4/+5
* | | | Merge pull request #7292 from Neraste/fix/4789_disabled_usersLukas Reschke2017-11-271-3/+3
|\ \ \ \
| * | | | Fix #4789: Group admins cannot see disabled usersNeraste2017-11-271-3/+3
* | | | | Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncTokenMorris Jobke2017-11-271-0/+3
|\ \ \ \ \
| * | | | | Log InvalidSyncToken on DAV in debug levelMorris Jobke2017-11-271-0/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #7307 from nextcloud/do-not-log-not-implemented-davLukas Reschke2017-11-271-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Log NotImplementedException on DAV in debug levelMorris Jobke2017-11-271-0/+4
| |/ / /
* | | | Merge pull request #7222 from nextcloud/fix-filerow-avatarsblizzz2017-11-277-145/+241
|\ \ \ \
| * | | | fix sorting test on phantomjsArthur Schiwon2017-11-241-15/+29
| * | | | recycle SharedFileInfo values in fileInfoArthur Schiwon2017-11-233-6/+22
| * | | | fix tooltips for goodArthur Schiwon2017-11-231-1/+1
| * | | | apply tooltip to all avatarsArthur Schiwon2017-11-231-2/+1
| * | | | rip out obsolete recipientsDisplayNameArthur Schiwon2017-11-236-108/+31
| * | | | adjust tests and apply sortingArthur Schiwon2017-11-235-37/+144
| * | | | adjust, fix and extend testsArthur Schiwon2017-11-232-25/+48
| * | | | Fix avatars in file rows of incoming sharesArthur Schiwon2017-11-233-5/+8
| * | | | fix avatars in file rows of outgoing sharesArthur Schiwon2017-11-233-9/+20
* | | | | Merge pull request #7210 from nextcloud/pg10Morris Jobke2017-11-278-120/+41
|\ \ \ \ \
| * | | | | Bump thirdparty refLukas Reschke2017-11-271-0/+0
| * | | | | run postgresql 10 tests in droneRobin Appelman2017-11-222-3/+23
| * | | | | add postgresql10 compatibility to dbalRobin Appelman2017-11-226-117/+18
* | | | | | Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-...blizzz2017-11-272-11/+34
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Replace with non-deprecated JS callLukas Reschke2017-11-271-1/+1
| * | | | | Disable contacts menu for mentions to current user in comment messagesDaniel Calviño Sánchez2017-11-272-4/+9
| * | | | | Disable contacts menu for mentioned users in comments being composedDaniel Calviño Sánchez2017-11-272-7/+14
| * | | | | Fix cursor for author row and avatars in commentsDaniel Calviño Sánchez2017-11-262-4/+15
* | | | | | Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-...Morris Jobke2017-11-272-5/+30
|\ \ \ \ \ \
| * | | | | | Make "contenteditable=false" divs look like disabled input fieldsDaniel Calviño Sánchez2017-11-231-2/+27
| * | | | | | Fix input field not disabled while a comment is being sentDaniel Calviño Sánchez2017-11-231-3/+3
* | | | | | | Merge pull request #7246 from william-p/Add_html5_audioplayer_publicLukas Reschke2017-11-271-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add HTML5 audio player in public viewWilliam Pain2017-11-221-0/+6
* | | | | | | | Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sendin...Morris Jobke2017-11-272-2/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Show delete working icon at the same position as the delete iconDaniel Calviño Sánchez2017-11-242-2/+4