summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-12-1034-112/+950
* [tx-robot] updated from transifexNextcloud bot2017-12-096-12/+344
* Merge pull request #6876 from nextcloud/always_img_avatarMorris Jobke2017-12-084-39/+241
|\
| * Better center the letter and use semibold font typeMorris Jobke2017-12-081-1/+2
| * 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 #7426 from nextcloud/Abijeet-masterMorris Jobke2017-12-084-31/+39
|\ \
| * | Allows adding of hex color to the theme-colorAbijeet2017-12-084-31/+39
* | | 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 #7334 from nextcloud/feature/noid/language-depending-skele...blizzz2017-12-082-1/+21
|\ \ \
| * | | Fallback to "default" and check if directory existsMorris Jobke2017-12-082-2/+6
| * | | Allow `{lang}` as a placeholder in the skeleton directoryJoas Schilling2017-11-292-1/+17
* | | | Merge pull request #7115 from nextcloud/fix-flowMorris Jobke2017-12-082-3/+20
|\ \ \ \
| * | | | fix testsBjoern Schiessle2017-12-081-8/+0
| * | | | Fix flowMario Danic2017-11-092-3/+28
* | | | | Merge pull request #7390 from nextcloud/update-php-infoMorris Jobke2017-12-082-1/+7
|\ \ \ \ \
| * | | | | Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymoreMorris Jobke2017-12-082-1/+7
* | | | | | 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-0814-16/+128
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-0712-2/+168
* | | | | | Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interfaceTobias Kaminsky2017-12-069-12/+109
|\ \ \ \ \ \
| * | | | | | show e2e folder icon on encrypted foldersBjoern Schiessle2017-11-207-2/+46
| * | | | | | 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
| * | | | | | check for encryption state on propfindBjoern Schiessle2017-11-202-2/+23
* | | | | | | Merge pull request #7385 from nextcloud/shared-delay-rootMorris Jobke2017-12-062-26/+41
|\ \ \ \ \ \ \
| * | | | | | | delay calculating the shared cache root until it's usedRobin Appelman2017-12-042-26/+41
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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 #7351 from nextcloud/change-default-german-languageRoeland Jago Douma2017-12-063-4/+73
|\ \ \ \ \ \ \
| * | | | | | | update documentationBjoern Schiessle2017-12-011-1/+5
| * | | | | | | check if $defaultLanguage is a valid string before we move onBjoern Schiessle2017-12-011-2/+3
| * | | | | | | use formal version of German if default_language is set to 'de_DE'Bjoern Schiessle2017-11-302-3/+67
* | | | | | | | Merge pull request #7387 from nextcloud/swift-retryRoeland Jago Douma2017-12-062-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | add retry wrapper when reading files from swiftRobin Appelman2017-12-042-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-0620-6/+88
* | | | | | | | Merge pull request #7391 from nextcloud/config-sampleJohn Molakvoæ2017-12-051-3/+2
|\ \ \ \ \ \ \ \