Lukas Reschke
104d1eaed2
Merge pull request #10528 from owncloud/fix-htaccess-check-error
...
Fix htaccess check error
2014-08-24 20:40:06 +02:00
Lukas Reschke
4bc72cc4e0
Remove different URL for EE
...
This can now be achieved by setting `appstoreenabled` to `false` in config.php
2014-08-24 20:22:15 +02:00
Robin McCorkell
b5c2964070
Merge pull request #9818 from owncloud/fix-mount-file-config
...
Comment out mount_file config option
2014-08-24 17:32:24 +01:00
Jenkins for ownCloud
70db496b58
[tx-robot] updated from transifex
2014-08-24 01:56:10 -04:00
Michael Kuhn
0a77a5ec19
Add unit tests for new unshareFromSelf() functionality.
2014-08-23 12:05:19 +02:00
Jenkins for ownCloud
047ec64ac0
[tx-robot] updated from transifex
2014-08-23 01:57:00 -04:00
Clark Tomlinson
2ad0d3f1be
Throw exception if file cannot be accessed via http
...
Format file
Removing calls to deprecated classes and using internal method to get via http
Missed a character
Fix inverted logic
2014-08-22 19:41:30 -04:00
Clark Tomlinson
e0a8321b23
Adding type to favicon
2014-08-22 16:26:39 -04:00
Thomas Müller
a77d468d35
Merge pull request #10584 from owncloud/simple-wizard-trusted-domains
...
Add a trusted domain wizard
2014-08-22 17:12:17 +02:00
kondou
b86e124e03
Warn user on resetting passwords via occ when encryption is enabled
2014-08-22 16:15:04 +02:00
Lukas Reschke
dd871098c5
Redirect user after clicking on link
...
Use DI
2014-08-22 16:01:03 +02:00
Lukas Reschke
88c3a4a31a
Expose setSystemValue
2014-08-22 15:53:23 +02:00
Clark Tomlinson
620610a3a7
Merge pull request #10590 from owncloud/fix-10585
...
Add require_once to update.php due to routing
2014-08-22 09:06:03 -04:00
Thomas Müller
0e8916b147
Merge pull request #7539 from owncloud/repair-legacystorageid
...
Added repair script to upgrade the legacy home storage ids
2014-08-22 14:22:39 +02:00
Robin Appelman
191a82e768
Stream downloads from Swift object stores without downloading it first
2014-08-22 14:11:36 +02:00
Thomas Müller
b8b2ef8748
no statement caching for Oracle
2014-08-22 12:06:36 +02:00
Jörn Friedrich Dreyer
ffe54e260a
explicit routes for files_external
2014-08-22 11:51:39 +02:00
Lukas Reschke
4aca46046b
Add require_once to update.php due to routing
...
Fixes https://github.com/owncloud/core/issues/10585
Partially reverts 52d5429768
2014-08-22 11:39:05 +02:00
Thomas Müller
d14dd98211
no external files on windows for now
2014-08-22 10:01:33 +02:00
Jenkins for ownCloud
8c94153d3e
[tx-robot] updated from transifex
2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df
Add a trusted domain wizard
...
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.
By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-21 22:22:35 +02:00
blizzz
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Vincent Petry
9c980954f4
Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowed
...
Fix share dropdown when links are not allowed
2014-08-21 15:32:11 +02:00
Vincent Petry
98d06094e7
Fix share dropdown when links are not allowed
...
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.
The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.
2014-08-21 13:49:02 +02:00
Morris Jobke
0cb189353f
Merge pull request #10548 from owncloud/encryption-app-description
...
Better description to prevent people from misunderstanding the use case of encryption app
2014-08-21 13:01:18 +02:00
Bernhard Posselt
ba8eed0788
Better description to prevent people from misunderstanding the use case
2014-08-21 12:05:56 +02:00
Thomas Müller
5637aca122
no external files on windows for now
2014-08-21 11:49:53 +02:00
Thomas Müller
dae8466077
no external files on windows for now
2014-08-21 11:32:51 +02:00
Lukas Reschke
691db8e26e
Merge pull request #10458 from owncloud/fix-tar-tests
...
temporarily disable TAR tests on travis
2014-08-21 10:07:05 +02:00
Morris Jobke
bcb3d03f6c
Fix windows tests skipping
...
* add call to setUp from inherited test class
2014-08-21 08:50:39 +02:00
Robin Appelman
63570df75f
Add files as string to tar archives
2014-08-21 08:49:57 +02:00
Robin Appelman
88c32861bc
reformat
2014-08-21 08:49:57 +02:00
Jenkins for ownCloud
952fac8493
[tx-robot] updated from transifex
2014-08-21 01:56:31 -04:00
Vincent Petry
8f201c7383
Explicily close the statement cursors
...
Fixes the issue that makes SQLite freeze on later tests.
2014-08-20 23:49:15 +02:00
Clark Tomlinson
61f63718ce
Merge pull request #10562 from Volker-E/master
...
fixing #10561 & HTML structure
2014-08-20 17:27:25 -04:00
Lukas Reschke
92c80dd946
Merge pull request #10518 from owncloud/fix_storage_const_autoload
...
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Vincent Petry
04c982a96e
Fix unit test messing up the transaction on Oracle
...
Since the unit test is skipped anyway for Oracle, the dropTable() call
should be skipped as well to avoid having a leftover transaction and
cause further transactions to be nested and break the next test suites
requiring transactions.
2014-08-20 23:14:06 +02:00
Vincent Petry
068f9d10f1
Added repair step for legacy storages
2014-08-20 23:14:05 +02:00
Volker E.
ec1596054f
Removing `x-webkit-speech` attribute #10561
...
Remove obsolete (from Google Chrome 36 on) attribute due to security vulnerability
2014-08-20 22:59:55 +02:00
Volker E.
98d0d48b54
fix HTML structure by rmv. obsolete input end tag
2014-08-20 22:36:58 +02:00
Morris Jobke
74af852c34
Merge pull request #10557 from owncloud/better-hover-apps
...
full opacity for the hovered/focused app as well for better contrast
2014-08-20 22:26:38 +02:00
Robin McCorkell
9094b380ca
Comment out mount_file config option
...
Prevents sample config issues with external storages. Fixes #9734
2014-08-20 20:25:06 +01:00
Jan-Christoph Borchardt
f6c2002554
full opacity for the hovered/focused app as well for better contrast
2014-08-20 19:34:02 +02:00
Vincent Petry
36c88e2830
Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupported
...
Return whole file if range request cannot be granted due to encryption
2014-08-20 18:14:09 +02:00
Thomas Müller
375a8535c4
Merge pull request #10546 from owncloud/add-note-about-cheers
...
Add note about the term "Cheers" at end of mail
2014-08-20 16:42:08 +02:00
Jörn Friedrich Dreyer
6c593c6adf
Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource
...
urlencode s3 copyObject() copysource
2014-08-20 15:48:51 +02:00
Morris Jobke
b6d3a6a054
Add note about the term "Cheers" at end of mail
...
* for translators
* fixes #8689
2014-08-20 15:14:07 +02:00
Morris Jobke
57746ffed4
Update music repo
2014-08-20 09:50:00 +02:00
Morris Jobke
e3c0db1026
Merge pull request #10534 from owncloud/autotest-cleanuponinterrupt
...
Restore autotest config on SIGINT or SIGTERM
2014-08-20 09:45:07 +02:00
Jenkins for ownCloud
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00