9b99c1d6f0
Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry
...
Convert StorageNotAvailableException to SabreDAV exception
2014-11-10 12:52:52 +01:00
676b911b22
Merge pull request #12027 from owncloud/cleanup_exceptions
...
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
cccedf6f30
Convert StorageNotAvailableException to SabreDAV exception
...
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.
This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
2014-11-10 12:01:24 +01:00
c3e3432662
[tx-robot] updated from transifex
2014-11-10 01:54:30 -05:00
541344d880
logging changes
2014-11-07 12:45:42 -05:00
f27b6b0ab8
don't scan part files
2014-11-07 15:20:51 +01:00
a10ae2816e
clean up encryption exceptions
2014-11-07 13:48:31 +01:00
d26a427f92
Also propagate etag changes when the watcher finds a changed file
2014-11-07 12:56:09 +01:00
e345697cab
Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
...
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
88c329b394
Merge pull request #12019 from owncloud/fix-template-shortcuts
...
second parameter in template shortcuts script() and style() is optional
2014-11-07 11:01:10 +01:00
7d47d50724
[tx-robot] updated from transifex
2014-11-07 01:55:10 -05:00
d383c45c13
Merge pull request #12003 from owncloud/password-migration
...
Use new hashing API for OC_User_Database
2014-11-06 22:43:57 +01:00
81e6329c04
second parameter in template shortcuts script() and style() is optional
2014-11-06 21:26:50 +01:00
e53354bfd7
Merge pull request #12009 from owncloud/make-optional
...
Make second argument optional
2014-11-06 19:43:11 +01:00
0c230fb57e
Merge pull request #11945 from owncloud/share-setup-other-user
...
Setup shared mounts for the correct user when setting up the filesystem
2014-11-06 19:24:24 +01:00
c21d1da01a
Support displaynames for dummy user backend
2014-11-06 18:31:40 +01:00
20cd9a134f
Make second argument optional
...
Equivalent to addVendorScript und addScript from OC_Util
2014-11-06 18:17:21 +01:00
5b8a6b66b5
Load PHPAss via autoloader
2014-11-06 16:32:53 +01:00
8f1fa32e1f
Merge pull request #11998 from owncloud/add-get-logger-to-interface
...
Add getLogger() to IServerContainer
2014-11-06 16:04:54 +01:00
c4d7483a0a
Use new hashing API for OC_User_Database
...
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
2014-11-06 15:42:06 +01:00
24ca2d858f
Add OCP\Security\IHasher
...
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.
Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
5f2a083686
Merge pull request #11883 from owncloud/clear-session-for-setup
...
Clear session before setup
2014-11-06 14:39:51 +01:00
f73d653036
Merge pull request #11972 from owncloud/usermanager-remove-delete
...
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
2014-11-06 13:52:25 +01:00
0e3e1e3563
Add getLogger() to IServerContainer
...
Makes my IDE complaining less ;-)
2014-11-06 13:36:36 +01:00
73569b29bc
md5 now handled via bower
2014-11-06 13:22:16 +01:00
e49b9022a1
bower snapjs
2014-11-06 12:03:57 +01:00
afa14d571c
Merge pull request #11982 from owncloud/bower-underscore
...
bower underscore
2014-11-06 08:42:29 +01:00
fa4018d36c
[tx-robot] updated from transifex
2014-11-06 01:55:04 -05:00
957dee5af1
bower underscore
2014-11-05 23:23:03 +01:00
4659b0e6a0
Merge pull request #11936 from owncloud/bower-jquery
...
Bower jquery
2014-11-05 16:43:24 +01:00
1eefc21329
Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead
2014-11-05 15:45:58 +01:00
e624e9064c
Merge pull request #11965 from owncloud/fix-jsonresponse
...
fix typo in content type for JSONResponse
2014-11-05 14:03:12 +01:00
06267fec8f
Merge pull request #11928 from owncloud/support-HTML-in-logo
...
Support HTML in logo
2014-11-05 13:54:29 +01:00
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
91a23bfa9c
fix typo in content type
2014-11-05 12:04:56 +01:00
c8f55e7f87
[tx-robot] updated from transifex
2014-11-05 01:54:36 -05:00
74d375d8ea
migrate jQuery to bower
2014-11-04 14:28:29 +01:00
7f4e447a5f
fix shortcuts - underline instead of camelCase
2014-11-04 13:57:38 +01:00
fde8ef0655
Merge pull request #11916 from owncloud/introduce-bower
...
Introduce bower dependency managment for frontend libraries
2014-11-04 11:59:33 +01:00
287faf9923
[tx-robot] updated from transifex
2014-11-04 01:55:05 -05:00
7f1d974796
Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig
...
First check whether it is the default config before touching
2014-11-03 21:20:42 +01:00
be5ae6c44f
Support HTML in logo claim
2014-11-03 21:14:27 +01:00
1a405e56f5
replace moment.js with bower version
...
* fix JS unit tests
2014-11-03 20:54:50 +01:00
d763b32048
ability to add bower resources
...
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
2014-11-03 20:54:40 +01:00
994768d99f
Update Pimple to V3.0
2014-11-03 16:57:16 +01:00
9790801268
First check whether it is the default config before touchign
...
Potentially fixes https://github.com/owncloud/core/issues/11678
2014-11-03 16:37:04 +01:00
a4f0483f56
Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5
2014-11-03 13:52:47 +01:00
56cf1d9d27
fix odd behaviour
2014-10-31 18:46:47 +01:00
fd4b97d758
Merge pull request #9044 from owncloud/add-missing-email-principal
...
adding missing email address for principal
2014-10-31 13:24:42 +01:00
d30fd23544
Clear session before setup
...
Fixes https://github.com/owncloud/core/issues/11861
2014-10-31 11:21:00 +01:00
Vincent Petry
Jenkins for ownCloud
Craig Morrissey
Bjoern Schiessle
Robin Appelman
Lukas Reschke
Thomas Müller
Morris Jobke
Robin Appelman
Bernhard Posselt