mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,114 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

4112 Commits

Author SHA1 Message Date
Nextcloud bot eb2442b871
[tx-robot] updated from transifex 2017-08-06 00:08:24 +00:00
Nextcloud bot 21f2fe5cb9
[tx-robot] updated from transifex 2017-08-05 00:08:08 +00:00
Morris Jobke 90d8070da3 Merge branch 'master' into clean-settings-layout 2017-08-04 11:11:33 +02:00
Marin Treselj 54444110d9 Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout 2017-08-04 10:23:52 +02:00
Marin Treselj a4d9845326 Fix federation icon menu and container paddings. 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-04 10:22:03 +02:00
Joas Schilling 9abbd6ab13 Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" 2017-08-03 17:27:24 +02:00
Morris Jobke ac4927809c Merge branch 'master' into clean-settings-layout 2017-08-03 15:07:42 +02:00
Marin Treselj 7de9eb16d8 Reintroduce a more compact grid. 
Overrides core `.section` values.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-03 13:12:00 +02:00
Marin Treselj 7284458e24 Clean up HTML structure, fix labels. 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-03 12:51:27 +02:00
Nextcloud bot 21dd85678f
[tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Marin Treselj ffcdc96a0b Proof of concept #5593 - inline SVG icon for icon-contacts 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-02 18:27:24 +02:00
Morris Jobke 45d080d70e Merge pull request #5951 from nextcloud/use-public-method 
Use public API instead of private
 2017-08-02 09:27:34 +02:00
Nextcloud bot 2800e017de
[tx-robot] updated from transifex 2017-08-02 00:08:10 +00:00
Lukas Reschke 21d1d05667
Use public API instead of private 
The private API here doesn't have the backends yet properly initialized, probably another bug but let's go with the easy bug fix here. Next step is to write integration tests and then figure out why changing this to the private API (which it actually calls) doesn't work.

Fixes https://github.com/nextcloud/server/issues/5950

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 18:19:28 +02:00
Lukas Reschke f93a82b8b0
Remove explicit type hints for Controller 
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 17:32:03 +02:00
Morris Jobke 6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware 
Prop argument type for Middleware
 2017-08-01 14:28:16 +02:00
Jos Poortvliet a69bbd7ffb Update server.php 
Typo: tips and tRicks ...

Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
 2017-08-01 10:19:01 +02:00
Lukas Reschke c25e782dd6
Fix settings/Controller/ 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke 084bac3530
Return '0' instead of null 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke e1f52fc901
Stricter phan config fixes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:13 +02:00
Nextcloud bot 456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Roeland Jago Douma 3548603a88
Fix middleware implementations signatures 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Nextcloud bot 97d06a7698
[tx-robot] updated from transifex 2017-07-31 00:08:02 +00:00
Nextcloud bot 98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot b43abf7512
[tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Morris Jobke 63aa12e38c Merge pull request #5895 from nextcloud/fix-password-change 
Fix show password button for password change
 2017-07-27 13:29:13 +02:00
Nextcloud bot 65ade4b6d5
[tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Morris Jobke 8f0a0c805e Fix show password button for password change 
* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 22:54:23 +02:00
Nextcloud bot da31a30edb
[tx-robot] updated from transifex 2017-07-26 00:08:06 +00:00
Nextcloud bot 11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Roeland Jago Douma 6d4731024a
Some app fixes of phpstorm inspections 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:42:07 +02:00
Andreas Jacobsen 25ada8208d Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/server into clean-settings-layout 2017-07-24 10:15:01 +02:00
Andreas Jacobsen 35494703f3 Fixed bug with sharing-settings 
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
 2017-07-24 10:14:57 +02:00
Nextcloud bot d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot 46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Nextcloud bot ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Marcel Waldvogel 15c51f410e The app password avoids 1Il etc. Adapted comment accordingly 
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
 2017-07-21 09:48:14 +02:00
Nextcloud bot 964d5338dc
[tx-robot] updated from transifex 2017-07-21 00:08:06 +00:00
Nextcloud bot 26c42d3d30
[tx-robot] updated from transifex 2017-07-20 00:08:04 +00:00
Nextcloud bot 0ee83ac56b
[tx-robot] updated from transifex 2017-07-19 00:08:22 +00:00
Roeland Jago Douma ac5d238ffe Merge pull request #5758 from nextcloud/comradekingu-patch-7 
Spelling: ": Bigversal"
 2017-07-18 09:06:34 +02:00
Nextcloud bot b1b843e572
[tx-robot] updated from transifex 2017-07-18 00:08:02 +00:00
Allan Nordhøy 9b0cb57e3b : Bigversal 2017-07-18 00:05:01 +02:00
Andreas Jacobsen 118f0d2b4d Merge branch 'master' into clean-settings-layout 2017-07-15 09:33:24 +02:00
Andreas Jacobsen 84eb18b011 Personal settings file changed 2017-07-15 09:30:38 +02:00
Nextcloud bot a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Andreas Jacobsen b0e83e17bb Updated layout 
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
 2017-07-14 11:46:12 +02:00
Bjoern Schiessle 2f50ba92da
this template file is no longer needed 
since https://github.com/nextcloud/server/pull/4890 the templates
are located at settings/templates/settings/personal/

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-14 11:38:21 +02:00
Andreas Jacobsen 91651cfbb9 Moved settings to left 
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
 2017-07-14 09:43:19 +02:00