summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interfaceTobias Kaminsky2017-12-062-9/+70
|\
| * show e2e folder icon on encrypted foldersBjoern Schiessle2017-11-202-1/+30
| * Add data attribute to file list rows telling if the file is encryptedDaniel Calviño Sánchez2017-11-202-7/+37
| * adjust permissions in web view for encrypted foldersBjoern Schiessle2017-11-201-1/+3
* | Merge pull request #7385 from nextcloud/shared-delay-rootMorris Jobke2017-12-061-17/+27
|\ \
| * | delay calculating the shared cache root until it's usedRobin Appelman2017-12-041-17/+27
* | | Merge pull request #7395 from nextcloud/remove-unusedLukas Reschke2017-12-061-3/+0
|\ \ \
| * | | Remove unused variablesMorris Jobke2017-12-051-3/+0
| |/ /
* | | Merge pull request #7348 from nextcloud/filterout_shares_of_nonexisting_usersRoeland Jago Douma2017-12-062-0/+7
|\ \ \
| * | | Fix testsRoeland Jago Douma2017-12-042-1/+3
| * | | A failed storage is a not available storageRoeland Jago Douma2017-12-041-0/+5
| |/ /
* | | Merge pull request #7387 from nextcloud/swift-retryRoeland Jago Douma2017-12-061-1/+2
|\ \ \
| * | | add retry wrapper when reading files from swiftRobin Appelman2017-12-041-1/+2
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-12-068-6/+22
* | | [tx-robot] updated from transifexNextcloud bot2017-12-054-2/+6
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-12-044-0/+6
* | [tx-robot] updated from transifexNextcloud bot2017-12-032-0/+6
* | [tx-robot] updated from transifexNextcloud bot2017-12-0210-10/+52
* | check userExists later, saves lookups for appData_INSTANCEID useridsArthur Schiwon2017-12-011-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-12-01142-0/+500
* | [tx-robot] updated from transifexNextcloud bot2017-11-3020-18/+32
* | Actually set the status so we don't cause another exceptionRoeland Jago Douma2017-11-294-0/+78
* | Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_serverRoeland Jago Douma2017-11-292-0/+6
|\ \
| * | Do not log Exception if a connection error occuredRoeland Jago Douma2017-11-292-0/+6
* | | Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7...Roeland Jago Douma2017-11-291-3/+3
|\ \ \ | |/ / |/| |
| * | Fix silent conflicts due to merging #7256 after #7251Daniel Calviño Sánchez2017-11-281-3/+3
* | | [tx-robot] updated from transifexNextcloud bot2017-11-2912-0/+24
* | | [tx-robot] updated from transifexNextcloud bot2017-11-28200-422/+422
|/ /
* | 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 #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-275-114/+81
|\ \ \
| * | | recycle SharedFileInfo values in fileInfoArthur Schiwon2017-11-232-5/+22
| * | | rip out obsolete recipientsDisplayNameArthur Schiwon2017-11-234-98/+20
| * | | adjust tests and apply sortingArthur Schiwon2017-11-233-10/+32
| * | | Fix avatars in file rows of incoming sharesArthur Schiwon2017-11-232-0/+2
| * | | fix avatars in file rows of outgoing sharesArthur Schiwon2017-11-232-2/+6
* | | | 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-271-3/+3
|\ \ \ \
| * | | | 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
|\ \ \ \ \ \