summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-08110-162/+446
|
* Merge pull request #5185 from nextcloud/error-spam-in-logMorris Jobke2017-06-071-0/+8
|\ | | | | Don't try to generate logs for chunking paths
| * Don't try to generate logs for chunking pathsJoas Schilling2017-05-311-0/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5277 from nextcloud/fix-personal-settings-regressionMorris Jobke2017-06-072-3/+8
|\ \ | | | | | | Allow to change avatar when groups are disables
| * | Allow to change avatar when groups are disablesMorris Jobke2017-06-072-3/+8
|/ / | | | | | | | | | | | | | | | | | | | | * password form overlaps upload button and doesn't allow to click it * regression from #5259 Signed-off-by: Morris Jobke <hey@morrisjobke.de> make sure that we always clear all floating rules after the user settings parts Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #5267 from nextcloud/personal-sessions-renamweJoas Schilling2017-06-074-22/+22
|\ \ | | | | | | reword sessions to security in personal settings
| * | reword sessions to security in personal settingsRobin Appelman2017-06-064-22/+22
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-07188-712/+4512
| | |
* | | Merge pull request #5259 from nextcloud/disable-groups-on-personal-pageMorris Jobke2017-06-063-0/+8
|\ \ \ | | | | | | | | allow admin to disable groups on personal page
| * | | allow admin to disable groups on personal pageBjoern Schiessle2017-06-063-0/+8
| |/ / | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #5268 from nextcloud/allow-to-theme-emailsMorris Jobke2017-06-062-0/+17
|\ \ \ | | | | | | | | Allow to overwrite the email template again
| * | | Allow to overwrite the email template againJoas Schilling2017-06-062-0/+17
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fieldsMorris Jobke2017-06-064-28/+110
|\ \ \ | | | | | | | | Don't allow the user to set fields they can't see
| * | | adjust the testJoas Schilling2017-06-061-0/+46
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Also cover the settings endpointJoas Schilling2017-06-021-19/+31
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Don't allow the user to set fields they can't seeJoas Schilling2017-06-022-9/+33
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #5265 from nextcloud/follow-up-5166-bring-back-descriptionMorris Jobke2017-06-063-0/+8
|\ \ \ \ | |_|/ / |/| | | Bring back the description for app passwords
| * | | Update autoloaderMorris Jobke2017-06-062-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5166 from ↵Morris Jobke2017-06-054-85/+33
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/merge-sessions-app-passwords-list Combine sessions and app passwords view into one single view
| * | | Combine sessions and app passwords view into one single viewChristoph Wurst2017-05-304-85/+33
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [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 click
| * | | | Copy permalink directly on clickRoeland Jago Douma2017-05-231-9/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [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
|\ \ \ \ \ | | | | | | | | | | | | Trigger changeUser hook only on real changes
| * | | | | emit changeUser only if there really was a change (quota, displayname)Arthur Schiwon2017-06-012-3/+102
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #5209 from nextcloud/fix-install-mysql-mb4blizzz2017-06-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix install on mb4 enabled mariadb/mysql
| * | | | | fix install on mb4 enabled mariadb/mysqlArthur Schiwon2017-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #5084 from nextcloud/useful-gs-settingsBjörn Schießle2017-06-0214-31/+363
|\ \ \ \ \ \ | | | | | | | | | | | | | | add new config switched for the global scale architecture
| * | | | | | add new config switched for the global scale architectureBjoern Schiessle2017-05-2914-31/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | [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 change
| * | | | | l10n changerakekniven2017-05-251-1/+1
| | | | | | | | | | | | | | | | | | See https://www.transifex.com/nextcloud/nextcloud/translate/#nb_NO/sharebymail/108178153
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-01100-168/+1040
| | | | | |
* | | | | | Merge pull request #5104 from nextcloud/ldap-attempt-reconnectblizzz2017-06-011-16/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | Contd: Add layer on top of LDAP methods to catch server disconnects and attempt re-connection
| * | | | | | fix pagingArthur Schiwon2017-05-261-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | make sure used ldap connection resource is always up to dateArthur Schiwon2017-05-251-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | moved to something a little less invasive. back to passing CR around.bline2017-05-251-36/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | special case for controlPagedResultResponse. It would be nice if there was a ↵bline2017-05-251-33/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generic way to pass by reference with call_user_func_array.. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | Merge pull request #5160 from nextcloud/comradekingu-patch-1Morris Jobke2017-05-311-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | no "mail" or mid sentence "E-mail"
| * | | | | | 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 zipstreamer
| * | | | | | Always enable Zip64 extension for zipstreamerNicolai Ehemann2017-05-251-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Nicolai Ehemann <en@enlightened.de>
* | | | | | Merge pull request #5135 from patschi/remove-appmenu-limitJoas Schilling2017-05-301-5/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove appmenu limit
| * | | | | Closed #5121, remove appmenu limitPatrik Kernstock2017-05-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-05-3046-154/+724
| |_|/ / / |/| | | |