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

40986 Commits

Author SHA1 Message Date
Nextcloud bot a94976bfc8
[tx-robot] updated from transifex 2017-10-20 00:08:34 +00:00
Lukas Reschke 9932b7498d Merge pull request #6873 from nextcloud/ldap_proxy_redix_fix 
Ldap proxy Redis fix
 2017-10-19 12:03:04 +02:00
Joas Schilling bb1af9b284 Merge pull request #6811 from nextcloud/feature/noid/disable_caldav_invitations 
Opt out of IMip CalDAV Plugin
 2017-10-19 11:57:52 +02:00
Lukas Reschke 7de6f7cd07 Merge pull request #6677 from nextcloud/downstream-dont-reset-quota 
don't reset quota
 2017-10-19 11:42:37 +02:00
Joas Schilling 6efa0b86d0
Allow quota of 0 again 
Regression from f1fccaca06

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:37:29 +02:00
Lukas Reschke 3f352d5f3b Merge pull request #6825 from nextcloud/no-filecache-update 
No automatic filecache update
 2017-10-19 11:30:56 +02:00
Lukas Reschke 3a3e6c34d0 Merge pull request #6835 from nextcloud/dav-plugins-from-apps-only 
Let apps register Sabre plugins or collections (v2)
 2017-10-19 11:09:12 +02:00
Roeland Jago Douma 4388ec2231
Little bit of code cleanup 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-19 11:05:24 +02:00
Lukas Reschke f6f7b50cf0 Merge pull request #6853 from nextcloud/apps_autoloader 
Allow apps to have their own autoloader
 2017-10-19 11:05:23 +02:00
Roeland Jago Douma a6760560c6
Do not check existance before fetch 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-19 11:03:31 +02:00
Nextcloud bot 07b6e234bd
[tx-robot] updated from transifex 2017-10-19 00:08:27 +00:00
Joas Schilling bea04d12d5 Merge pull request #6515 from nextcloud/templating-of-email-subjects 
Allow templating of email subjects
 2017-10-18 15:41:18 +02:00
Joas Schilling cc798fd65f
Fix autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:16 +02:00
Joas Schilling 3119fd41ce
Set the data from the template 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling c9af36a9ab
Introduce a public interface for Message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling 8b37fe7f65
Set the subject with the email template to allow theming 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling f109c1a10c
Allow templating of email subjects 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:00 +02:00
Nextcloud bot 8e884ba52f
[tx-robot] updated from transifex 2017-10-18 00:08:23 +00:00
Roeland Jago Douma ff9f325677
Ignore composer stuff in phan 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-17 22:22:36 +02:00
Roeland Jago Douma 5d7d96dc45
Update autoload checker 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-17 21:55:06 +02:00
Roeland Jago Douma f51eccf34a
Move files_sharing to a proper classmap 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-17 21:35:51 +02:00
Roeland Jago Douma 3a9c24c04f
Allow apps to have their own autoloader 
This will allow apps to also have a proper classmap and authorative
autoloader.

Currently if a file: <appdir>/composer/autoload.php exists we will use
it. Else we keep the current behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-17 21:35:49 +02:00
Roeland Jago Douma cd0d27e46d Merge pull request #6854 from nextcloud/s3-multipart-propagate-exception 
propagate multipart upload exception when aborting upload
 2017-10-17 20:42:51 +02:00
Robin Appelman 91b3536f45
propagate multipart upload exception when aborting upload 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-17 15:10:58 +02:00
Bjoern Schiessle e964f83f28
fix url 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-10-17 11:24:01 +02:00
Julius Härtl be71ce32dc Merge pull request #5673 from tbille/gui-bug-authentication 
Destroy modal when closed
 2017-10-17 10:55:12 +02:00
Thomas Bille 75bc40f7a0 Destroy modal when closed 
Signed-off-by: Thomas Bille <contact@tbille.fr>
 2017-10-17 09:09:45 +01:00
Nextcloud bot 59c3ea91fd
[tx-robot] updated from transifex 2017-10-17 00:08:23 +00:00
Roeland Jago Douma d34c7e89a0 Merge pull request #6844 from nextcloud/phan-repo 
Phan is moved to a new repo
 2017-10-16 19:23:03 +02:00
Roeland Jago Douma 17bd2fb268
Phan is moved to a new repo 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-16 16:23:55 +02:00
Georg Ehrke b958725f78
Make it possible to opt out of IMip Plugin for CalDAV 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-10-16 13:49:46 +02:00
Georg Ehrke 7828cf454e
add admin settings panel for dav app 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-10-16 13:49:08 +02:00
blizzz c25be8d83c Merge pull request #6837 from nextcloud/timespan-check-3 
Fix future time spans
 2017-10-16 13:35:53 +02:00
Joas Schilling 3b3ba8d0a1
Update autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-16 13:23:05 +02:00
Nextcloud bot 84a7285f08
[tx-robot] updated from transifex 2017-10-16 00:08:26 +00:00
Roeland Jago Douma 1b2568e637 Merge pull request #6585 from nextcloud/theming-fileupload-errorhandling 
Theming: Handle errors on uploaded files properly
 2017-10-15 21:44:48 +02:00
Roeland Jago Douma a5912cbe33 Merge pull request #6812 from nextcloud/upload-cache-path 
also use configured 'cache_path' for new chunking
 2017-10-15 21:42:41 +02:00
Roeland Jago Douma a0823540b0 Merge pull request #6791 from nextcloud/fix-test-warnings 
Fix test warnings
 2017-10-15 21:40:43 +02:00
Roeland Jago Douma 3438020d66 Merge pull request #6813 from nextcloud/exclude-avatar-from-same-site-cookie 
Exclude avatar from Same-Site Cookie requirement
 2017-10-15 21:38:40 +02:00
dartcafe ac2a6e0f2f
Fix future time spans 
Signed-off-by: dartcafe <github@dartcafe.de>
 2017-10-15 08:31:11 +02:00
Julius Härtl 79c4538511
Dav: codestyle fixes in PluginManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-14 20:51:59 +02:00
Vincent Petry a829ac787a
Let apps register Sabre plugins or collections 
upstream #26761

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-14 20:50:53 +02:00
John Molakvoæ 7a05cf300c Merge pull request #6761 from nextcloud/fix-avatar-loading-state 
Fix popover position and avatar loading
 2017-10-14 10:53:54 +02:00
John Molakvoæ (skjnldsv) f33ed5fb13
Ellipsis 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-14 10:37:17 +02:00
John Molakvoæ (skjnldsv) 4ca88471b0
Fix popover position and avatar loading 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-14 10:37:17 +02:00
John Molakvoæ 0ce3636fba Merge pull request #6829 from nextcloud/fix-app-nav-edit-inputs 
Fix app-navigation editable entry input colors
 2017-10-14 07:07:02 +02:00
Nextcloud bot d251623b01
[tx-robot] updated from transifex 2017-10-14 02:29:04 +00:00
Joas Schilling 4e0c078f48 Merge pull request #6826 from nextcloud/fix-class-name-in-exception-logger-plugin 
Fix class name in exception logger plugin
 2017-10-13 18:04:23 +02:00
John Molakvoæ (skjnldsv) c68c538a86
Fix app-navigation editable entry input colors 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-13 16:21:38 +02:00
Joas Schilling 7c53f921a9
Use ::class to avoid errors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-13 12:36:20 +02:00