summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-08110-162/+446
* Merge pull request #5291 from nextcloud/stable12-5287Morris Jobke2017-06-072-16/+39
|\
| * unify look of disabled display name / email address and the other input fieldsBjoern Schiessle2017-06-072-10/+11
| * show input fields if they are not empty but disable them in global scale modeBjoern Schiessle2017-06-071-6/+28
|/
* Merge pull request #5278 from nextcloud/stable12-5277Morris Jobke2017-06-072-3/+8
|\
| * Allow to change avatar when groups are disablesMorris Jobke2017-06-072-3/+8
|/
* Merge pull request #5186 from nextcloud/backport-5126-email-change-spamMorris Jobke2017-06-071-0/+6
|\
| * Don't trigger activity when the email didn't changeJoas Schilling2017-05-311-0/+6
* | [tx-robot] updated from transifexNextcloud bot2017-06-07182-710/+4464
* | Merge pull request #5270 from nextcloud/stable12-5223Björn Schießle2017-06-064-28/+110
|\ \
| * | adjust the testJoas Schilling2017-06-061-0/+46
| * | Also cover the settings endpointJoas Schilling2017-06-061-19/+31
| * | Don't allow the user to set fields they can't seeJoas Schilling2017-06-062-9/+33
* | | Merge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12Morris Jobke2017-06-063-0/+8
|\ \ \ | |/ / |/| |
| * | allow admin to disable groups on personal pageBjoern Schiessle2017-06-063-0/+8
* | | Merge pull request #5266 from nextcloud/backport-5166-combine-apptokens-and-s...Morris Jobke2017-06-066-83/+39
|\ \ \ | |/ / |/| |
| * | Update autoloaderMorris Jobke2017-06-062-0/+4
| * | Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
| * | Combine sessions and app passwords view into one single viewChristoph Wurst2017-06-064-85/+33
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-06-0634-50/+316
* | [tx-robot] updated from transifexNextcloud bot2017-06-0556-56/+56
* | [tx-robot] updated from transifexNextcloud bot2017-06-0450-54/+108
* | [tx-robot] updated from transifexNextcloud bot2017-06-0330-144/+298
* | Merge pull request #5224 from nextcloud/useful-gs-settings-stable12Björn Schießle2017-06-0214-31/+363
|\ \
| * | add new config switched for the global scale architectureBjoern Schiessle2017-06-0214-31/+363
* | | Merge pull request #5225 from nextcloud/no-client-info-without-firstrunwizardBjörn Schießle2017-06-022-3/+5
|\ \ \
| * | | Don't show client info, when the app is disabledJoas Schilling2017-06-022-3/+5
* | | | Merge pull request #5216 from nextcloud/5213-stable12blizzz2017-06-022-3/+102
|\ \ \ \
| * | | | emit changeUser only if there really was a change (quota, displayname)Arthur Schiwon2017-06-012-3/+102
| |/ / /
* | | | Merge pull request #5217 from nextcloud/5209-stable12blizzz2017-06-021-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | fix install on mb4 enabled mariadb/mysqlArthur Schiwon2017-06-011-1/+1
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2017-06-0296-386/+780
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-06-0196-164/+1036
* | Merge pull request #5127 from nextcloud/backport-5090-fixing-missing-backgrou...Joas Schilling2017-05-311-2/+1
|\ \ | |/ |/|
| * Register the autoloading earlier so we can load the background jobsJoas Schilling2017-05-261-2/+1
* | [tx-robot] updated from transifexNextcloud bot2017-05-3130-282/+296
* | [tx-robot] updated from transifexNextcloud bot2017-05-3046-154/+724
* | [tx-robot] updated from transifexNextcloud bot2017-05-2938-142/+1032
* | [tx-robot] updated from transifexNextcloud bot2017-05-2812-12/+14
* | [tx-robot] updated from transifexNextcloud bot2017-05-2720-18/+44
|/
* [tx-robot] updated from transifexNextcloud bot2017-05-2652-4/+666
* [tx-robot] updated from transifexNextcloud bot2017-05-2574-246/+2410
* [tx-robot] updated from transifexNextcloud bot2017-05-2444-18/+150
* Merge pull request #5073 from nextcloud/external-get-for-group-sql-type-12Roeland Jago Douma2017-05-231-1/+1
|\
| * use the correct param type when getting external storages for groupsRobin Appelman2017-05-231-1/+1
|/
* Merge pull request #5005 from nextcloud/bugfix-stable12/fix_replacing_4mbunic...Roeland Jago Douma2017-05-232-2/+2
|\
| * fix replacing of 4MB Unicode Chars in cal props tableGeorg Ehrke2017-05-212-2/+2
* | Merge pull request #5017 from nextcloud/stable12-5016Roeland Jago Douma2017-05-231-0/+3
|\ \
| * | Reset opcache if update is detectedMorris Jobke2017-05-211-0/+3
* | | [tx-robot] updated from transifexNextcloud bot2017-05-23104-120/+204