summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-12-094-2/+116
* Merge pull request #7426 from nextcloud/Abijeet-masterMorris Jobke2017-12-082-2/+6
|\
| * Allows adding of hex color to the theme-colorAbijeet2017-12-082-2/+6
* | Merge pull request #7433 from nextcloud/fix-constructor-spy-in-unit-test-with...Morris Jobke2017-12-081-1/+1
|\ \
| * | Fix constructor spy in unit test with Sinon 4.1.3Daniel Calviño Sánchez2017-12-081-1/+1
| |/
* | Merge pull request #7252 from nextcloud/send-comment-on-enterMorris Jobke2017-12-082-12/+92
|\ \
| * | Fix Enter sending comment instead of adding autocomplete item to messageDaniel Calviño Sánchez2017-12-072-2/+50
| * | Add unit tests for posting comments with enter keyDaniel Calviño Sánchez2017-11-301-0/+28
| * | Set text only in the message div of the new comment formDaniel Calviño Sánchez2017-11-301-10/+13
| * | Submit comments with Enter and use Shift+Enter for new linesDaniel Calviño Sánchez2017-11-231-2/+3
* | | Merge pull request #7321 from nextcloud/ldap-update-loginfilterLukas Reschke2017-12-081-0/+17
|\ \ \ | |_|/ |/| |
| * | Update login filter when user filter was newly generatedArthur Schiwon2017-11-281-0/+17
* | | [tx-robot] updated from transifexNextcloud bot2017-12-088-12/+84
* | | [tx-robot] updated from transifexNextcloud bot2017-12-078-0/+66
* | | 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