Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-08 | 110 | -162/+446 |
| | |||||
* | Merge pull request #5185 from nextcloud/error-spam-in-log | Morris Jobke | 2017-06-07 | 1 | -0/+8 |
|\ | | | | | Don't try to generate logs for chunking paths | ||||
| * | Don't try to generate logs for chunking paths | Joas Schilling | 2017-05-31 | 1 | -0/+8 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #5277 from nextcloud/fix-personal-settings-regression | Morris Jobke | 2017-06-07 | 2 | -3/+8 |
|\ \ | | | | | | | Allow to change avatar when groups are disables | ||||
| * | | Allow to change avatar when groups are disables | Morris Jobke | 2017-06-07 | 2 | -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-renamwe | Joas Schilling | 2017-06-07 | 4 | -22/+22 |
|\ \ | | | | | | | reword sessions to security in personal settings | ||||
| * | | reword sessions to security in personal settings | Robin Appelman | 2017-06-06 | 4 | -22/+22 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-07 | 188 | -712/+4512 |
| | | | |||||
* | | | Merge pull request #5259 from nextcloud/disable-groups-on-personal-page | Morris Jobke | 2017-06-06 | 3 | -0/+8 |
|\ \ \ | | | | | | | | | allow admin to disable groups on personal page | ||||
| * | | | allow admin to disable groups on personal page | Bjoern Schiessle | 2017-06-06 | 3 | -0/+8 |
| |/ / | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | Merge pull request #5268 from nextcloud/allow-to-theme-emails | Morris Jobke | 2017-06-06 | 2 | -0/+17 |
|\ \ \ | | | | | | | | | Allow to overwrite the email template again | ||||
| * | | | Allow to overwrite the email template again | Joas Schilling | 2017-06-06 | 2 | -0/+17 |
| |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fields | Morris Jobke | 2017-06-06 | 4 | -28/+110 |
|\ \ \ | | | | | | | | | Don't allow the user to set fields they can't see | ||||
| * | | | adjust the test | Joas Schilling | 2017-06-06 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Also cover the settings endpoint | Joas Schilling | 2017-06-02 | 1 | -19/+31 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Don't allow the user to set fields they can't see | Joas Schilling | 2017-06-02 | 2 | -9/+33 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #5265 from nextcloud/follow-up-5166-bring-back-description | Morris Jobke | 2017-06-06 | 3 | -0/+8 |
|\ \ \ \ | |_|/ / |/| | | | Bring back the description for app passwords | ||||
| * | | | Update autoloader | Morris Jobke | 2017-06-06 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Bring back the description for app passwords | Joas Schilling | 2017-06-06 | 1 | -0/+4 |
|/ / / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #5166 from ↵ | Morris Jobke | 2017-06-05 | 4 | -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 view | Christoph Wurst | 2017-05-30 | 4 | -85/+33 |
| | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-06 | 34 | -50/+316 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-05 | 56 | -56/+56 |
| | | | | |||||
* | | | | Merge pull request #4791 from nextcloud/permalink_copy_on_click | Morris Jobke | 2017-06-04 | 1 | -9/+30 |
|\ \ \ \ | | | | | | | | | | | Copy permalink directly on click | ||||
| * | | | | Copy permalink directly on click | Roeland Jago Douma | 2017-05-23 | 1 | -9/+30 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-04 | 52 | -54/+110 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-03 | 32 | -144/+324 |
| | | | | | |||||
* | | | | | Merge pull request #5213 from nextcloud/fix-change-hook | blizzz | 2017-06-02 | 2 | -3/+102 |
|\ \ \ \ \ | | | | | | | | | | | | | Trigger changeUser hook only on real changes | ||||
| * | | | | | emit changeUser only if there really was a change (quota, displayname) | Arthur Schiwon | 2017-06-01 | 2 | -3/+102 |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | Merge pull request #5209 from nextcloud/fix-install-mysql-mb4 | blizzz | 2017-06-02 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | fix install on mb4 enabled mariadb/mysql | ||||
| * | | | | | fix install on mb4 enabled mariadb/mysql | Arthur Schiwon | 2017-06-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | | Merge pull request #5084 from nextcloud/useful-gs-settings | Björn Schießle | 2017-06-02 | 14 | -31/+363 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add new config switched for the global scale architecture | ||||
| * | | | | | | add new config switched for the global scale architecture | Bjoern Schiessle | 2017-05-29 | 14 | -31/+363 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-02 | 100 | -388/+808 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #5110 from nextcloud/rakekniven-patch-1 | Joas Schilling | 2017-06-01 | 0 | -0/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | l10n change | ||||
| * | | | | | l10n change | rakekniven | 2017-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | See https://www.transifex.com/nextcloud/nextcloud/translate/#nb_NO/sharebymail/108178153 | ||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-01 | 100 | -168/+1040 |
| | | | | | | |||||
* | | | | | | Merge pull request #5104 from nextcloud/ldap-attempt-reconnect | blizzz | 2017-06-01 | 1 | -16/+68 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Contd: Add layer on top of LDAP methods to catch server disconnects and attempt re-connection | ||||
| * | | | | | | fix paging | Arthur Schiwon | 2017-05-26 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | | | make sure used ldap connection resource is always up to date | Arthur Schiwon | 2017-05-25 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | | | moved to something a little less invasive. back to passing CR around. | bline | 2017-05-25 | 1 | -36/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | | | special case for controlPagedResultResponse. It would be nice if there was a ↵ | bline | 2017-05-25 | 1 | -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-1 | Morris Jobke | 2017-05-31 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | no "mail" or mid sentence "E-mail" | ||||
| * | | | | | | no "mail" or mid sentence "E-mail" | comradekingu | 2017-05-29 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-31 | 30 | -282/+296 |
| | | | | | | |||||
* | | | | | | Merge pull request #5116 from McNetic/zipstreamer | Joas Schilling | 2017-05-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Always enable Zip64 extension for zipstreamer | ||||
| * | | | | | | Always enable Zip64 extension for zipstreamer | Nicolai Ehemann | 2017-05-25 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nicolai Ehemann <en@enlightened.de> | ||||
* | | | | | | Merge pull request #5135 from patschi/remove-appmenu-limit | Joas Schilling | 2017-05-30 | 1 | -5/+0 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Remove appmenu limit | ||||
| * | | | | | Closed #5121, remove appmenu limit | Patrik Kernstock | 2017-05-26 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at> | ||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-30 | 46 | -154/+724 |
| |_|/ / / |/| | | | |