Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4478 from nextcloud/improve_settings_help | Joas Schilling | 2017-04-26 | 8 | -18/+16 |
|\ | |||||
| * | Wording fixes | Jan-Christoph Borchardt | 2017-04-25 | 3 | -6/+4 |
| * | Small layout fixes to settings hints | Jan-Christoph Borchardt | 2017-04-25 | 2 | -3/+3 |
| * | change the headline as suggested | Frank Karlitschek | 2017-04-25 | 1 | -2/+1 |
| * | one more hint | Frank Karlitschek | 2017-04-25 | 1 | -0/+1 |
| * | adding some documentation hints and some smaller cleanup | Frank Karlitschek | 2017-04-25 | 5 | -11/+11 |
* | | Merge pull request #4500 from nextcloud/downstream-27118 | Morris Jobke | 2017-04-26 | 3 | -26/+20 |
|\ \ | |||||
| * | | Restrict proppatch to the proper nodes | Vincent Petry | 2017-04-25 | 3 | -26/+20 |
| |/ | |||||
* | | Merge pull request #4416 from gvmura/avoid-duplicate-files-google | Morris Jobke | 2017-04-26 | 1 | -0/+13 |
|\ \ | |||||
| * | | avoid duplicate files in google with the same name | gvmura | 2017-04-21 | 1 | -0/+13 |
* | | | Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo | Morris Jobke | 2017-04-25 | 6 | -13/+332 |
|\ \ \ | |||||
| * | | | Fix usersInGroup retrieval | Arthur Schiwon | 2017-04-25 | 2 | -14/+39 |
| * | | | fix method name due to changes in master | Arthur Schiwon | 2017-04-25 | 1 | -1/+1 |
| * | | | Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2 | Arthur Schiwon | 2017-04-25 | 6 | -8/+302 |
| |\ \ \ | |||||
| | * | | | user_ldap: Add support for gidNumber | Xuanwo | 2017-04-25 | 6 | -8/+302 |
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-26 | 36 | -20/+348 |
* | | | | | Audit log for enabling/disabling a user | Joas Schilling | 2017-04-25 | 2 | -0/+18 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion | Joas Schilling | 2017-04-25 | 2 | -0/+35 |
|\ \ \ \ | |||||
| * | | | | 4190 | Roger Szabo | 2017-04-25 | 2 | -0/+35 |
| |/ / / | |||||
* | | | | Merge pull request #3531 from nextcloud/theming-scss | Morris Jobke | 2017-04-25 | 5 | -709/+328 |
|\ \ \ \ | |||||
| * | | | | Mock it | Joas Schilling | 2017-04-25 | 1 | -12/+39 |
| * | | | | Logo and background URLs must be relative | Joas Schilling | 2017-04-25 | 2 | -11/+8 |
| * | | | | Fix theming tests | Julius Härtl | 2017-04-25 | 2 | -30/+13 |
| * | | | | Implement scss variable injection by OC_Defaults | Julius Haertl | 2017-04-25 | 5 | -681/+293 |
| |/ / / | |||||
* / / / | Fix invalid character | Joas Schilling | 2017-04-25 | 2 | -2/+2 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-25 | 16 | -20/+30 |
* | | | Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing | Morris Jobke | 2017-04-24 | 2 | -84/+92 |
|\ \ \ | |||||
| * | | | Remove dead arguments | Joas Schilling | 2017-04-24 | 2 | -45/+1 |
| * | | | Fix similar issues with the group id | Joas Schilling | 2017-04-24 | 2 | -4/+8 |
| * | | | Fix the storage info and other checks when the user has wrong casing | Joas Schilling | 2017-04-24 | 2 | -35/+83 |
* | | | | Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password... | Roeland Jago Douma | 2017-04-24 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | Fix working icon placement on password save | Daniel Calviño Sánchez | 2017-04-24 | 1 | -2/+3 |
* | | | | | Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings | Roeland Jago Douma | 2017-04-24 | 3 | -4/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix sinon.stub deprecation warnings | Christoph Wurst | 2017-04-24 | 3 | -4/+6 |
* | | | | | | Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr | blizzz | 2017-04-24 | 35 | -175/+972 |
|\ \ \ \ \ \ | |||||
| * | | | | | | unit test adjustment | Roger Szabo | 2017-04-07 | 2 | -23/+33 |
| * | | | | | | lower case for attributes | Roger Szabo | 2017-04-06 | 1 | -7/+7 |
| * | | | | | | blizzz comments 03.04.2017 with caching | Roger Szabo | 2017-04-06 | 1 | -2/+7 |
| * | | | | | | blizzz comments 03.04.2017 | Roger Szabo | 2017-04-06 | 5 | -22/+26 |
| * | | | | | | usertest adjustment | Roger Szabo | 2017-03-31 | 1 | -1/+1 |
| * | | | | | | usertest adjustment | Roger Szabo | 2017-03-31 | 1 | -11/+11 |
| * | | | | | | remove redundant tabs | Roger Szabo | 2017-03-31 | 1 | -4/+4 |
| * | | | | | | restore ldap_password_renew_pr | Roger Szabo | 2017-03-31 | 34 | -163/+941 |
* | | | | | | | Merge pull request #4443 from nextcloud/cleanup-unused-imports | Joas Schilling | 2017-04-24 | 48 | -82/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Remove unused use statements | Morris Jobke | 2017-04-22 | 48 | -82/+1 |
* | | | | | | | Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname | Roeland Jago Douma | 2017-04-24 | 6 | -12/+77 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | add owner-displayname property to calendars and addressbooks | Georg Ehrke | 2017-04-23 | 6 | -12/+77 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #4444 from nextcloud/remove-unused-variables | Roeland Jago Douma | 2017-04-24 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unused variables | Morris Jobke | 2017-04-22 | 1 | -1/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-24 | 26 | -4/+62 |
| |/ / / / |/| | | | |