summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-2938-142/+1032
| | | |
* | | | Merge pull request #5126 from ↵Lukas Reschke2017-05-281-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/setting-the-same-email-shouldnt-trigger-activity Don't trigger activity when the email didn't change
| * | | | Don't trigger activity when the email didn't changeJoas Schilling2017-05-261-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [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 var
| * | | | | Fix #5059 by adding sanity checks before using varPatrik Kernstock2017-05-241-1/+1
| | |/ / / | |/| | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
* | | | | Merge pull request #5090 from ↵blizzz2017-05-261-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/try-fixing-missing-background-jobs-on-app-update Register the autoloading earlier so we can load the background jobs
| * | | | Register the autoloading earlier so we can load the background jobsJoas Schilling2017-05-241-2/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | / / [tx-robot] updated from transifexNextcloud bot2017-05-2654-4/+692
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-2576-246/+2436
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-05-2444-18/+150
| |
* | Merge pull request #5004 from ↵Roeland Jago Douma2017-05-232-2/+2
|\ \ | | | | | | | | | | | | nextcloud/bugfix/fix_replacing_4mbunicode_for_calendar_properties_table fix replacing of 4MB Unicode Chars in cal props table
| * | fix replacing of 4MB Unicode Chars in cal props tableGeorg Ehrke2017-05-212-2/+2
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #5042 from nextcloud/external-get-for-group-sql-typeRoeland Jago Douma2017-05-231-1/+1
|\ \ \ | | | | | | | | use the correct param type when getting external storages for groups
| * | | use the correct param type when getting external storages for groupsRobin Appelman2017-05-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4969 from ↵Roeland Jago Douma2017-05-231-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-broken-activity-avatars-with-external-users Fix username and avatar for external users
| * | | | Fix username and avatar for external usersJoas Schilling2017-05-191-0/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-23104-120/+204
| |/ / / |/| | |
* | | | Merge pull request #5010 from ↵Joas Schilling2017-05-221-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app Fix starting lower case letter in tooltip of Theming app
| * | | | Fix starting lower case letter in tooltip of Theming appDaniel Calviño Sánchez2017-05-201-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #5014 from nextcloud/update-opcache-recommendationRoeland Jago Douma2017-05-222-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update Opcache recommendation
| * | | | | Update Opcache recommendationMorris Jobke2017-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5016 from nextcloud/reset-opcache-on-updater-page-loadRoeland Jago Douma2017-05-221-0/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Reset opcache if update is detected
| * | | | | Reset opcache if update is detectedMorris Jobke2017-05-211-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This even works if opcache_reset is in the disabled_functions php.ini setting. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5023 from nextcloud/version_bumpJoas Schilling2017-05-2223-56/+68
|\ \ \ \ \ | | | | | | | | | | | | We are working on 13 now!