summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5259 from nextcloud/disable-groups-on-personal-pageMorris Jobke2017-06-063-0/+8
|\
| * allow admin to disable groups on personal pageBjoern Schiessle2017-06-063-0/+8
* | Merge pull request #5268 from nextcloud/allow-to-theme-emailsMorris Jobke2017-06-062-0/+17
|\ \
| * | Allow to overwrite the email template againJoas Schilling2017-06-062-0/+17
| |/
* | Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fieldsMorris Jobke2017-06-064-28/+110
|\ \
| * | adjust the testJoas Schilling2017-06-061-0/+46
| * | Also cover the settings endpointJoas Schilling2017-06-021-19/+31
| * | Don't allow the user to set fields they can't seeJoas Schilling2017-06-022-9/+33
* | | Merge pull request #5265 from nextcloud/follow-up-5166-bring-back-descriptionMorris Jobke2017-06-063-0/+8
|\ \ \ | |_|/ |/| |
| * | Update autoloaderMorris Jobke2017-06-062-0/+4
| * | Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
|/ /
* | Merge pull request #5166 from nextcloud/feature/merge-sessions-app-passwords-...Morris Jobke2017-06-054-85/+33
|\ \
| * | Combine sessions and app passwords view into one single viewChristoph Wurst2017-05-304-85/+33
* | | [tx-robot] updated from transifexNextcloud bot2017-06-0634-50/+316
* | | [tx-robot] updated from transifexNextcloud bot2017-06-0556-56/+56
* | | Merge pull request #4791 from nextcloud/permalink_copy_on_clickMorris Jobke2017-06-041-9/+30
|\ \ \
| * | | Copy permalink directly on clickRoeland Jago Douma2017-05-231-9/+30
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-0452-54/+110
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-0332-144/+324
* | | | Merge pull request #5213 from nextcloud/fix-change-hookblizzz2017-06-022-3/+102
|\ \ \ \
| * | | | emit changeUser only if there really was a change (quota, displayname)Arthur Schiwon2017-06-012-3/+102
| | |_|/ | |/| |
* | | | Merge pull request #5209 from nextcloud/fix-install-mysql-mb4blizzz2017-06-021-1/+1
|\ \ \ \
| * | | | fix install on mb4 enabled mariadb/mysqlArthur Schiwon2017-06-011-1/+1
* | | | | Merge pull request #5084 from nextcloud/useful-gs-settingsBjörn Schießle2017-06-0214-31/+363
|\ \ \ \ \
| * | | | | add new config switched for the global scale architectureBjoern Schiessle2017-05-2914-31/+363
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-02100-388/+808
| |/ / / / |/| | | |
* | | | | Merge pull request #5110 from nextcloud/rakekniven-patch-1Joas Schilling2017-06-010-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | l10n changerakekniven2017-05-251-1/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-01100-168/+1040
* | | | | Merge pull request #5104 from nextcloud/ldap-attempt-reconnectblizzz2017-06-011-16/+68
|\ \ \ \ \
| * | | | | fix pagingArthur Schiwon2017-05-261-3/+4
| * | | | | make sure used ldap connection resource is always up to dateArthur Schiwon2017-05-251-6/+8
| * | | | | moved to something a little less invasive. back to passing CR around.bline2017-05-251-36/+40
| * | | | | special case for controlPagedResultResponse. It would be nice if there was a ...bline2017-05-251-33/+78
* | | | | | Merge pull request #5160 from nextcloud/comradekingu-patch-1Morris Jobke2017-05-311-2/+2
|\ \ \ \ \ \
| * | | | | | no "mail" or mid sentence "E-mail"comradekingu2017-05-291-2/+2
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-05-3130-282/+296
* | | | | | Merge pull request #5116 from McNetic/zipstreamerJoas Schilling2017-05-301-1/+1
|\ \ \ \ \ \
| * | | | | | Always enable Zip64 extension for zipstreamerNicolai Ehemann2017-05-251-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5135 from patschi/remove-appmenu-limitJoas Schilling2017-05-301-5/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Closed #5121, remove appmenu limitPatrik Kernstock2017-05-261-5/+0
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-05-3046-154/+724
| |_|/ / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-2938-142/+1032
* | | | | Merge pull request #5126 from nextcloud/setting-the-same-email-shouldnt-trigg...Lukas Reschke2017-05-281-0/+6
|\ \ \ \ \
| * | | | | Don't trigger activity when the email didn't changeJoas Schilling2017-05-261-0/+6
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-05-2812-12/+14
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-05-2720-18/+44
* | | | | | Merge pull request #5095 from patschi/patch-1Björn Schießle2017-05-261-1/+1
|\ \ \ \ \ \
| * | | | | | Fix #5059 by adding sanity checks before using varPatrik Kernstock2017-05-241-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5090 from nextcloud/try-fixing-missing-background-jobs-on...blizzz2017-05-261-2/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |