Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4467 from nextcloud/lists-for-html-mails | Roeland Jago Douma | 2017-04-26 | 2 | -22/+138 |
|\ | |||||
| * | Allow meta info and icons | Joas Schilling | 2017-04-25 | 2 | -8/+32 |
| * | Add lists to HTML emails | Joas Schilling | 2017-04-24 | 2 | -22/+114 |
* | | Merge pull request #4061 from nextcloud/downstream-26407 | Roeland Jago Douma | 2017-04-26 | 3 | -40/+86 |
|\ \ | |||||
| * | | no ternary | Jörn Friedrich Dreyer | 2017-03-25 | 1 | -2/+10 |
| * | | fix constant | Jörn Friedrich Dreyer | 2017-03-25 | 1 | -1/+1 |
| * | | Add Redis Cluster support | Robin McCorkell | 2017-03-25 | 3 | -40/+78 |
* | | | 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 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'avoid-duplicate-files-google' of https://github.com/gvmura/serv... | root | 2017-04-21 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | avoid duplicate files in google with the same name | gvmura | 2017-04-21 | 1 | -0/+13 |
| * | | | | | avoid duplicate files in google with the same name | gvmura | 2017-04-21 | 1 | -0/+13 |
| |/ / / / | |||||
* | | | | | Merge pull request #4449 from stweil/mimetypes | Morris Jobke | 2017-04-26 | 3 | -0/+36 |
|\ \ \ \ \ | |||||
| * | | | | | Add test code for new image mime types | Stefan Weil | 2017-04-25 | 1 | -0/+21 |
| * | | | | | Add repair steps for new image mime types | Stefan Weil | 2017-04-25 | 1 | -0/+13 |
| * | | | | | Add mimetypes for jp2 and webp | Stefan Weil | 2017-04-25 | 1 | -0/+2 |
* | | | | | | Merge pull request #4486 from nextcloud/fix-js-unit | Morris Jobke | 2017-04-25 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove DOMPurify from srcFiles | Lukas Reschke | 2017-04-25 | 1 | -2/+1 |
| |/ / / / / | |||||
* | | | | | | 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 | 174 | -622/+1044 |
* | | | | | | | | Merge pull request #3233 from nextcloud/contactsmenu | Jan-Christoph Borchardt | 2017-04-26 | 35 | -21/+2831 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into contactsmenu | Jan-Christoph Borchardt | 2017-04-26 | 17 | -5/+849 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #4499 from nextcloud/downstream-26984 | Morris Jobke | 2017-04-25 | 4 | -2/+72 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Audit log for enabling/disabling a user | Joas Schilling | 2017-04-25 | 2 | -0/+18 |
| * | | | | | | | | | Trigger change when a user is enabled/disabled | Joas Schilling | 2017-04-25 | 2 | -2/+54 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging | Morris Jobke | 2017-04-25 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove js debug logging | Christoph Wurst | 2017-04-25 | 1 | -1/+0 |
* | | | | | | | | | | Merge pull request #4479 from nextcloud/auth-flow | Morris Jobke | 2017-04-25 | 10 | -0/+770 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix auth flow background color and redirect view layout | Jan-Christoph Borchardt | 2017-04-25 | 2 | -4/+11 |
| * | | | | | | | | | | AppToken to 72 chars | Roeland Jago Douma | 2017-04-25 | 2 | -3/+3 |
| * | | | | | | | | | | Do not remove the state token to early | Roeland Jago Douma | 2017-04-25 | 1 | -1/+3 |
| * | | | | | | | | | | Correctly case the stateToken | Roeland Jago Douma | 2017-04-25 | 1 | -1/+1 |
| * | | | | | | | | | | Add new auth flow | Lukas Reschke | 2017-04-25 | 10 | -0/+761 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4495 from nextcloud/downstream-27638 | Roeland Jago Douma | 2017-04-25 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Catch session already closed exception in destructor | Victor Dubiniuk | 2017-04-25 | 2 | -2/+7 |
| |/ / / / / / / / | |||||
| | * | | | | | | | Fix test | Jan-Christoph Borchardt | 2017-04-26 | 1 | -1/+1 |
| | * | | | | | | | Fix emptycontent HTML and wording | Jan-Christoph Borchardt | 2017-04-25 | 1 | -4/+5 |
| | * | | | | | | | Fix spinner position of Contacts menu | Jan-Christoph Borchardt | 2017-04-25 | 1 | -3/+1 |
| | * | | | | | | | Use HTTP POST to retrieve the list of contacts | Christoph Wurst | 2017-04-25 | 2 | -2/+2 |
| | * | | | | | | | Update composer autoloader | Christoph Wurst | 2017-04-25 | 4 | -6/+8 |
| | * | | | | | | | Adjust entry unit test to newly added avatar property | Christoph Wurst | 2017-04-25 | 1 | -0/+1 |
| | * | | | | | | | Fix failing contacts menu js test data | Christoph Wurst | 2017-04-25 | 1 | -2/+12 |
| | * | | | | | | | Fix icon of second action | Christoph Wurst | 2017-04-25 | 1 | -3/+5 |
| | * | | | | | | | Use absolute URI for action icons | Christoph Wurst | 2017-04-25 | 3 | -8/+29 |
| | * | | | | | | | Don't show contacts an entry for themselves | Christoph Wurst | 2017-04-25 | 5 | -14/+59 |