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

40449 Commits

Author SHA1 Message Date
Morris Jobke c58853d223 Merge pull request #6398 from nextcloud/revert-6394-navigation-mail-fix 
Revert "Fix active entry highlight in certain apps"
 2017-09-07 09:35:53 +02:00
Morris Jobke 17d980cb9c Revert "Fix active entry highlight in certain apps" 2017-09-07 09:35:44 +02:00
Morris Jobke 5184f3a7b4 Merge pull request #6394 from nextcloud/navigation-mail-fix 
Fix active entry highlight in certain apps
 2017-09-07 09:30:15 +02:00
Morris Jobke 485e22acde Merge pull request #6329 from nextcloud/ldap-password 
Don't log LDAP password when server is not available
 2017-09-07 09:25:56 +02:00
Roeland Jago Douma daf3db8de6 Merge pull request #6381 from nextcloud/fix-error-message 
Fix "Uninitialized string offset: 0 at \/media\/psf\/stable9\/lib\/pr…
 2017-09-07 09:25:17 +02:00
Lukas Reschke 0bccd5a0d9
Fix "Uninitialized string offset: 0 at \/media\/psf\/stable9\/lib\/private\/URLGenerator.php#224" 
The URLGenerator doesn't support `` as target for absolute URLs, we need to link to `/` thus.

Regression introduced with 46229a00f3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-07 08:34:02 +02:00
Jan-Christoph Borchardt 55f67ff7e7 Fix active entry highlight in certain apps 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-07 02:45:12 +02:00
Nextcloud bot 9959560649
[tx-robot] updated from transifex 2017-09-07 00:08:23 +00:00
Morris Jobke d84a20e8fd Merge pull request #6332 from lukanetconsult/hotfix/6028-realpath-on-webroot 
Refactor webroot detection in resource locator
 2017-09-06 22:51:31 +02:00
Morris Jobke 8e6d86a862 Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for_past_events 
don't send invitation emails for past events
 2017-09-06 22:48:46 +02:00
tux-rampage 7a33b9273e Refactor webroot detection in resource locator 
The current implementation breaks installations with symlinks to
directories inside the webroot (i.E. apps).

With this change both variants, directory and symlinks, will be detected
correctly.

Fixes: #6028
Signed-off-by: Axel Helmert <axel.helmert@luka.de>
 2017-09-06 21:32:48 +02:00
Morris Jobke a10c4517cb Merge pull request #5571 from Luzifer/5570_backend_admin 
Allow group backend to declare users as admins
 2017-09-06 19:50:52 +02:00
Morris Jobke 6be8642c59 Merge pull request #6377 from nextcloud/fix-included-file 
Properly include file
 2017-09-06 19:50:01 +02:00
Morris Jobke 392e64395a Merge pull request #6247 from nextcloud/oauth-state-undefined 
Fix undefined index oauthState
 2017-09-06 19:47:24 +02:00
Morris Jobke d09bf0b9ff Merge pull request #6384 from nextcloud/failed-storage-tests 
adjust tests to new failed storage handling
 2017-09-06 19:12:45 +02:00
Robin Appelman ccc41aeddd
adjust tests to new failed storage handling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-06 17:12:19 +02:00
Morris Jobke 5d4540f179 Merge pull request #6364 from nextcloud/fix_login_loop 
Fix login with basic auth
 2017-09-06 17:04:00 +02:00
Joas Schilling b68609d0cf
Don't log LDAP password when server is not available 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-06 16:38:55 +02:00
Morris Jobke 444779ce96
Fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-06 16:38:24 +02:00
Morris Jobke 504c1abee0
Fix undefined index oauthState 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-06 16:38:24 +02:00
Lukas Reschke 033d2de002
Properly include file 
Regression from 005ef115fb

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-06 15:35:38 +02:00
Morris Jobke 6f7d200838 Merge pull request #6370 from nextcloud/fix-alternative-logins 
Fix layout of alternative login buttons
 2017-09-06 10:22:04 +02:00
Morris Jobke f5aea79bd7
Fix layout of alternative login buttons 
* fixes #6367

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-06 10:21:11 +02:00
Morris Jobke 1724fed8c5 Merge pull request #5415 from nextcloud/search-cache-node 
cache nodes from search results
 2017-09-06 10:16:01 +02:00
Nextcloud bot 9d930210ee
[tx-robot] updated from transifex 2017-09-06 00:08:21 +00:00
Morris Jobke 15cd21d252 Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name 
Set the meta data before everything
 2017-09-05 16:08:57 +02:00
Knut Ahlers 586cefc4f1
Add @since tag to constant 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
 2017-09-05 15:49:13 +02:00
Morris Jobke 4e3c39c1d1
Fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-05 13:55:36 +02:00
Morris Jobke cebbb1633a Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard 
recognize groupOfUniqueNames as valid LDAP group object
 2017-09-05 13:33:15 +02:00
Georg Ehrke a1df91da9d
Sabre/VObject returns DateTimeImmutable, not a simple DateTime 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Georg Ehrke 86f28669fc
don't send invitation emails for past events 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Roeland Jago Douma b96485b6bd
Fix login with basic auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-05 12:24:41 +02:00
Nextcloud bot 6be5dc91cb
[tx-robot] updated from transifex 2017-09-05 00:08:24 +00:00
Morris Jobke ff93dd7eb1 Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes 
LDAP Connectivity Fixes
 2017-09-04 18:31:32 +02:00
Joas Schilling dea011243e
Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 17:01:31 +02:00
Morris Jobke 91fc25c28c Merge pull request #6082 from nextcloud/theming-fix-white-element-color 
Use separate element color in theming
 2017-09-04 15:43:06 +02:00
Morris Jobke e0c92c2da3
Update autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 15:42:34 +02:00
Joas Schilling 6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Joas Schilling 95ecab0356
Set the meta data before everything 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 14:46:05 +02:00
Julius Härtl 63d1da50b4
Cleanup theming styles to fit the new login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:31:57 +02:00
Julius Härtl 8f10cee3ff
Fix tests for primary element color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Julius Härtl da5662c454
Use separate element color in theming 
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Morris Jobke 4fd3240b5f Merge pull request #6254 from nextcloud/async-bus-split 
Allow configuring different command bus backends
 2017-09-04 14:22:06 +02:00
Morris Jobke 1ebf91ec16
Add proper EOL 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 14:21:44 +02:00
Morris Jobke 30ca3b70ed Merge pull request #6196 from nextcloud/downstream-26539-2 
Handle invalid ext storage backend to keep mount point visible
 2017-09-04 14:17:28 +02:00
Morris Jobke 0326c2c54f
Fix broken tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 14:17:03 +02:00
Morris Jobke c04a494ea7 Merge pull request #6064 from nextcloud/fix-5219-absolute-path-must-be-relative-to-files-on-theming-update 
Still throw a locked exception when the path is not relative to $user/files/
 2017-09-04 14:05:34 +02:00
blizzz 2060ff591b Merge pull request #6120 from nextcloud/public_upload_share_api_fix 
Public upload share permission handling
 2017-09-04 12:43:02 +02:00
Roeland Jago Douma f0158e42e9 Merge pull request #6309 from nextcloud/new-dav-event 
add a new dav event to allow apps to register their own sabredav plugins
 2017-09-04 12:12:46 +02:00
Morris Jobke 5927a63680 Merge pull request #6351 from nhirokinet/master 
not to backquote LIMIT on CalDavBackend.php
 2017-09-04 12:10:57 +02:00