summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove avatar on user deletionRoeland Jago Douma2017-12-111-0/+23
* Dispatch event on User predeleteRoeland Jago Douma2017-12-111-1/+5
* Merge pull request #7249 from nextcloud/guest-flexMorris Jobke2017-12-111-10/+12
|\
| * Fixed topJohn Molakvoæ (skjnldsv)2017-11-231-1/+1
| * Fixed heigh resizeJohn Molakvoæ (skjnldsv)2017-11-221-2/+3
| * Use flex for guest full screen alignmentJohn Molakvoæ (skjnldsv)2017-11-221-8/+9
* | Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-userMorris Jobke2017-12-113-12/+143
|\ \
| * | don't cache user, if no internal user id was retrieved/assignedArthur Schiwon2017-12-072-7/+17
| * | ensure that users are cached when they are retrievedArthur Schiwon2017-12-073-7/+128
* | | Merge pull request #6651 from nextcloud/remote-cloud-clientRoeland Jago Douma2017-12-1129-1/+1706
|\ \ \
| * | | Add some more tests for ocs remote apiRobin Appelman2017-12-085-59/+259
| * | | refuse to use http if we know a remote has httpsRobin Appelman2017-12-082-0/+135
| * | | validate user responseRobin Appelman2017-12-081-1/+8
| * | | add more typehintsRobin Appelman2017-12-086-1/+17
| * | | Add public api for remote apiRobin Appelman2017-12-0820-9/+623
| * | | Some tests for the remote cloud apiRobin Appelman2017-12-087-4/+232
| * | | Add api clients for talking to remote cloudsRobin Appelman2017-12-088-0/+505
* | | | Merge pull request #6682 from nextcloud/dav-mimetype-fallbackRoeland Jago Douma2017-12-112-10/+29
|\ \ \ \
| * | | | Fallback to filename based detection if the remote dav server doesn't know th...Robin Appelman2017-09-282-10/+29
* | | | | Merge pull request #7324 from nextcloud/no-sorters-no-instancesRoeland Jago Douma2017-12-112-46/+106
|\ \ \ \ \
| * | | | | don't create sorter instances when none was requestedArthur Schiwon2017-11-282-46/+106
* | | | | | Merge pull request #7427 from nextcloud/fix-white-color-in-emailsMorris Jobke2017-12-1111-22/+74
|\ \ \ \ \ \
| * | | | | | Fix email buttons for white themeMorris Jobke2017-12-1111-22/+74
* | | | | | | Merge pull request #7313 from nextcloud/ensure-that-x-oc-mtime-header-is-an-i...Morris Jobke2017-12-112-18/+187
|\ \ \ \ \ \ \
| * | | | | | | Reject X-OC-MTime header if given as a string with hexadecimal notationDaniel Calviño Sánchez2017-11-282-2/+6
| * | | | | | | Don't use runInSeparateProcessThomas Müller2017-11-272-7/+11
| * | | | | | | Add tests for X-OC-MTime header handlingDaniel Calviño Sánchez2017-11-271-0/+133
| * | | | | | | Make possible to provide a specific HTTP request object to FileDaniel Calviño Sánchez2017-11-272-12/+35
| * | | | | | | Ensure that X-OC-MTime header is an integer also with chunked uploadsDaniel Calviño Sánchez2017-11-271-6/+11
* | | | | | | | Merge pull request #7244 from nextcloud/css-file-suffix-with-apps-versionsMorris Jobke2017-12-111-5/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix syntax errorMorris Jobke2017-12-111-1/+1
| * | | | | | | | Fixed phpdoc and function typeJohn Molakvoæ (skjnldsv)2017-12-111-2/+8
| * | | | | | | | Fixed md5 generation and added fallback for scss requestsJohn Molakvoæ (skjnldsv)2017-12-111-6/+32
| * | | | | | | | Use apps versions to generate suffix when possibleJohn Molakvoæ (skjnldsv)2017-12-111-5/+14
|/ / / / / / / /
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-12-1120-162/+466
* | | | | | | | [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