Thomas Müller
d96b97043b
Merge pull request #14944 from owncloud/fix-php-doc-and-co
...
Fix PHPDoc and Co.
2015-03-17 11:34:07 +01:00
Thomas Müller
98a42dbccc
Merge pull request #14927 from oparoz/raw-mimetypes
...
Introducing the Raw media types
2015-03-17 11:32:09 +01:00
Lukas Reschke
e4c6b0abf5
Merge pull request #14931 from owncloud/issue/14881-closures-for-navigation-entries
...
Issue/14881 closures for navigation entries
2015-03-17 11:28:27 +01:00
Thomas Müller
a56e16fdaa
Oracle 11 XE is now fired up in a docker image - looks like we get back Oracle Testing on pull requests
2015-03-17 11:20:08 +01:00
Lukas Reschke
b1c19f74a1
Merge pull request #12085 from owncloud/add-swift-mailer
...
Migrate OC_Mail to SwiftMailer
2015-03-17 11:15:39 +01:00
Vincent Petry
5b6ecb2d98
Fix root request path for Dropbox
2015-03-17 10:56:24 +01:00
Lukas Reschke
db033e4e19
Fix PHPDoc and Co.
...
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
2015-03-17 10:37:09 +01:00
Vincent Petry
6525911439
Merge pull request #14929 from owncloud/s2s-scanner-warnings
...
Fix scanFile signature warnings
2015-03-17 09:51:45 +01:00
Jenkins for ownCloud
b51b4f0a2c
[tx-robot] updated from transifex
2015-03-17 01:55:43 -04:00
Adam Williamson
fa1be7d296
fall back to absolute path for pipelined assets ( #14940 )
...
If the asset is, for example, in an apps directory that is
outside the $SERVERROOT, we won't be able to get a relative
path. We shouldn't just fail hard in this case. Fall back to
using the absolute path instead (as we used to).
2015-03-16 19:08:11 -07:00
Morris Jobke
fc0aa0b6ae
Merge pull request #14936 from owncloud/fix-setup-config
...
Fix setup config namespace
2015-03-16 18:47:42 +01:00
Vincent Petry
7bc09f8f06
Fix setup config
2015-03-16 17:57:34 +01:00
Vincent Petry
6f687fa6ae
Merge pull request #14923 from owncloud/fix-preference-key-definition
...
Fix user preference key definition for insertIfNotExists()
2015-03-16 17:14:09 +01:00
Thomas Müller
54e1edbf03
Merge pull request #13733 from mmattel/Try_to_write_logtimezone_during_installation
...
Write the parameter 'logtimezone' into config.php during setup
2015-03-16 17:04:06 +01:00
Vincent Petry
669ff45625
Merge pull request #14877 from owncloud/smb-constructor-noconnect
...
Wait with getting the timezone from the smb server until we need it
2015-03-16 17:01:49 +01:00
Joas Schilling
ec1d5011b6
Add tests for the navigation manager (closure) behaviour
2015-03-16 16:46:17 +01:00
Vincent Petry
b9d9405135
Fix scanFile signature warnings
2015-03-16 16:45:11 +01:00
Olivier Paroz
bef12488c3
Introducing the Raw mimetypes
2015-03-16 16:25:04 +01:00
Joas Schilling
970846624f
Allow registering closures for navigation entries
...
This speeds up all pages that don't use the navigation by 0.04sec per app,
because we don't need to create the routing anymore, unless we really need to.
2015-03-16 16:17:43 +01:00
Joas Schilling
c2a5bd6a01
Also add a note that clob does not work in the compare array
2015-03-16 15:41:00 +01:00
Joas Schilling
06b2446269
The key is over configkey, user and app, not the value
...
stupid me :(
2015-03-16 15:37:12 +01:00
Vincent Petry
847880803e
Fix storage priority in JS unit test
2015-03-16 15:07:38 +01:00
Vincent Petry
06448170cf
Fix PHPDoc for StoragesController
2015-03-16 14:39:48 +01:00
Robin Appelman
7ab919256b
fix test
2015-03-16 14:13:56 +01:00
Lukas Reschke
7a70fffa6c
Don't fallback to Plaintext per default for legacy class
2015-03-16 14:10:03 +01:00
Lukas Reschke
d7c7808a5e
Add debug log message back
2015-03-16 13:01:17 +01:00
Joas Schilling
8f06353882
Remove load*() methods from public interface
...
We shall add a factory for that in the future
2015-03-16 12:57:15 +01:00
Lukas Reschke
e32f1582c7
Show more detailed error message
2015-03-16 12:47:06 +01:00
Lukas Reschke
dfd70337d6
Adjust unit test
2015-03-16 12:47:05 +01:00
Lukas Reschke
f92f3a1a6e
Incorporate review changes
2015-03-16 12:47:05 +01:00
Lukas Reschke
283476a2f7
Use new IMailer and add unit-tests for lostcontroller
2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada
Migrate to SwiftMail
...
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.
Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014
Conflicts:
3rdparty
lib/private/server.php
lib/public/iservercontainer.php
tests/lib/mail.php
tests/settings/controller/mailsettingscontrollertest.php
Conflicts:
3rdparty
lib/private/mail.php
lib/private/server.php
lib/public/iservercontainer.php
settings/ajax/lostpassword.php
settings/application.php
2015-03-16 12:47:05 +01:00
Joas Schilling
3052b9571e
Fix controller test
2015-03-16 12:45:18 +01:00
Joas Schilling
2731b80f74
Only register the core providers when necessary
2015-03-16 12:45:18 +01:00
Joas Schilling
47af533183
Move mimetype check from template to controller
2015-03-16 12:45:18 +01:00
Joas Schilling
8ed27d2ce0
Create an interface for OC_Image and OCP\Image for the public API
2015-03-16 12:45:15 +01:00
Joas Schilling
3b7aec1b7d
Only sort the list when required
2015-03-16 12:44:12 +01:00
Joas Schilling
37b827f0b2
Order the providers alphabetically
2015-03-16 12:44:12 +01:00
Joas Schilling
9c86574acf
Only do all the "find path" magic when we need to register them
2015-03-16 12:44:11 +01:00
Joas Schilling
e38dea3542
Cache result for isMimeTypeSupported()
2015-03-16 12:44:11 +01:00
Joas Schilling
e518eacba6
Add more type hinting
2015-03-16 12:44:11 +01:00
Joas Schilling
1a1dc9b335
Use DI for the config
2015-03-16 12:44:11 +01:00
Joas Schilling
c1f266db88
Add an interface for the preview providers
2015-03-16 12:44:11 +01:00
Joas Schilling
227ff0a9e3
Clean up some docs
2015-03-16 12:44:11 +01:00
Joas Schilling
0b37d5aea3
Move default provider registration to preview manager
2015-03-16 12:44:11 +01:00
Joas Schilling
cae8529359
Register preview providers on the preview manager instead of OC\Preview
2015-03-16 12:44:11 +01:00
Joas Schilling
4c4c0fa120
Use the PreviewManager where possible
2015-03-16 12:44:10 +01:00
Thomas Müller
1075914f8a
Merge pull request #14883 from owncloud/imagepng_expects_resource_issue
...
validate resource's integrity before using it
2015-03-16 12:22:27 +01:00
Vincent Petry
72632ad402
Generate storage config ids when missing
...
When reading in old mount.json files, they do not contain config ids.
Since these are needed to be able to use the UI and the new service
classes, these will be generated automatically.
The config grouping is based on a config hash.
2015-03-16 12:18:01 +01:00
Thomas Müller
c262d0d966
Update shipped.json
2015-03-16 11:59:40 +01:00
