Thomas Müller
3115053bbb
Merge pull request #10604 from owncloud/fixing-favicon
...
Adding type to favicon
2014-08-26 17:35:50 +02:00
Thomas Müller
910b827b98
Merge pull request #9844 from OliverKohlDSc/patch-1
...
CRON call ends in null exception
2014-08-26 14:42:07 +02:00
Thomas Müller
2e8026a7b5
Merge pull request #10619 from owncloud/issue/6722
...
Add a test to break the slugifyPath() with folder and file afterwards
2014-08-26 10:33:18 +02:00
Jenkins for ownCloud
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
Clark Tomlinson
6523c575f3
Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries
...
Do not try to close the same resource multiple times
2014-08-25 12:52:06 -04:00
Clark Tomlinson
58ab105515
Merge pull request #10421 from owncloud/share-external-delete
...
Remove no longer existing files from the cache when scanning external storage
2014-08-25 11:28:50 -04:00
Vincent Petry
c86824fa09
Merge pull request #10023 from owncloud/tmp-file-created-status
...
Log unsuccessful temp file creation and return false
2014-08-25 17:24:46 +02:00
Vincent Petry
5e2f627d3d
Merge pull request #10108 from owncloud/files_external-allowed-backend
...
Only load personal external storages for allowed backends
2014-08-25 17:07:35 +02:00
Joas Schilling
989da69cff
Do not try to close the same resource multiple times
2014-08-25 15:31:43 +02:00
Joas Schilling
1846aebfff
Use md5() of the original name instead of uniqid() for slugifying
...
Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.
If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.
Fix #6722
2014-08-25 15:06:12 +02:00
Joas Schilling
b861e1d696
Fix code layout before fixing the function
2014-08-25 15:06:10 +02:00
Joas Schilling
6a7be8a36a
Use a data provider instead of calling the function manually everytime
2014-08-25 15:06:09 +02:00
Joas Schilling
51c9b3c62d
Add a test to break the slugifyPath() with folder and file afterwards
2014-08-25 14:38:33 +02:00
Lukas Reschke
992b0f9b06
Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset
...
Warn user on resetting passwords via occ when encryption is enabled
2014-08-25 14:23:28 +02:00
Vincent Petry
8ab1c84161
Merge pull request #10591 from owncloud/routes_for_files_external
...
explicit routes for files_external
2014-08-25 11:45:41 +02:00
Jörn Friedrich Dreyer
ebf7758d10
Merge pull request #10595 from owncloud/swift-stream
...
Stream downloads from Swift object stores without downloading it first
2014-08-25 11:26:39 +02:00
Jenkins for ownCloud
adca48aa93
[tx-robot] updated from transifex
2014-08-25 01:56:07 -04:00
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
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
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