6d378515f8
Merge pull request #8014 from owncloud/uploadsize-reuse
...
Reuse known free space in the files app
2014-04-02 18:40:34 +02:00
a6de5efbab
Merge pull request #7978 from owncloud/enc_cleanup
...
there is no need to re-calculate the shares after a touch
2014-04-02 18:23:33 +02:00
1e6a79e244
Reuse known free space in the files app
2014-04-02 16:53:45 +02:00
16d10844cd
Merge pull request #7995 from owncloud/fix-h3-styles
...
fix h3 style, move out from settings to apps CSS
2014-04-02 14:45:58 +02:00
b616cc1f2d
Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib
...
Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
2014-04-02 14:10:09 +02:00
7bdc085022
Merge pull request #8006 from wakeup/master
...
Fix admin-dir_permissions redirection when cannot write warning is shown.
2014-04-02 13:21:53 +02:00
1782dcbb50
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
...
always encrypt files to owner
2014-04-02 13:20:51 +02:00
c0746f6b49
Merge pull request #7968 from owncloud/core-overwritewebrootwithroot
...
Allow using "/" in "overwritewebroot"
2014-04-02 12:56:36 +02:00
b6ad7c3cdd
Fix admin-dir_permissions redirection when cannot write warning
...
is shown.
2014-04-02 12:41:46 +02:00
3f9beb8c6b
Upgraded phpseclib to version 0.3.6
2014-04-02 12:31:59 +02:00
4cc70ec39d
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
...
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
5301056ab1
fix h3 style, move out from settings to apps CSS
2014-04-02 09:18:33 +02:00
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
d762e25cc5
Merge pull request #7989 from owncloud/files-deletefileregressionfix
...
Fixed broken delete file action
2014-04-01 22:54:05 +02:00
82d1ea240e
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
...
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
bd2cf6ee29
Merge pull request #7817 from owncloud/app-navigation-for-apps
...
Makes #app-navigation a part of app management.
2014-04-01 21:38:43 +02:00
630b5b648f
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
...
Correct the remembering of the trashbin app state in encryption test
2014-04-01 21:23:53 +02:00
f37a76c396
Remember before change works better
2014-04-01 19:46:46 +02:00
0e93c3fd9a
Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists
...
Fix dirInfo check when dir does not exist
2014-04-01 16:51:30 +02:00
017d7953d7
Merge pull request #7984 from owncloud/wording-applicable2
...
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
2014-04-01 16:44:31 +02:00
aaa8d6ec02
Fixed broken delete file action
2014-04-01 16:09:48 +02:00
6e6a131b32
Merge pull request #7696 from owncloud/chunk-remainingspacefix
...
Fixed chunking and insufficient storage check
2014-04-01 16:09:19 +02:00
0bede65947
Fix dirInfo check when dir does not exist
2014-04-01 15:15:03 +02:00
27eff1ac30
Merge pull request #7293 from owncloud/update-shares-postgres
...
fix update to remove shares where file doesn't exist on postgres
2014-04-01 14:56:37 +02:00
acfb3cfff5
external storage: set storages to be available for All Users by default
2014-04-01 14:31:22 +02:00
0a112de676
external storage: change confusing 'applicable' to 'available for'
2014-04-01 14:26:06 +02:00
a179335775
Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
...
Fixed user list offset call
2014-04-01 14:17:05 +02:00
c45793033d
Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
...
move check if a file should be encrypted to the pre hook
2014-04-01 13:56:46 +02:00
be0660f84f
Merge pull request #7943 from hjort/master
...
Correction: failure on sharing when user ID was prefixed by zero
2014-04-01 12:57:16 +02:00
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
a94ac41512
Merge pull request #7966 from owncloud/url_generation_hack
...
Check if web root has already been appended
2014-04-01 10:59:53 +02:00
0d2a81a095
apply proposed change
2014-04-01 10:48:55 +02:00
0067a4eac2
Added missing fclose in file_get_contents and file_put_contents
2014-04-01 10:08:16 +02:00
d6ce45fe61
Correctly read the full stream in file_get_contents
...
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
0ca80254ec
Merge pull request #7967 from owncloud/sharing_fix_select_statement
...
select statement always need to contain file_source respectively item_source
2014-03-31 21:34:42 +02:00
c578ab68fe
there is no need to re-calculate the shares after a touch
2014-03-31 18:24:53 +02:00
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
ab696edba6
Merge pull request #7916 from owncloud/fix-input-sizes
...
Fix input sizes
2014-03-31 15:56:19 +02:00
cf361b6b4a
Allow using "/" in "overwritewebroot"
...
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
2014-03-31 15:36:48 +02:00
aa867ad647
don't call getFileInfo() to avoid to open the same file twice
2014-03-31 15:29:16 +02:00
8ebb1f15d3
move check if a file should be encrypted to the pre hook
2014-03-31 15:29:16 +02:00
3a731a01b1
select statement always need to contain file_source respectively item_source
2014-03-31 15:03:35 +02:00
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
6292aa57af
Check if web root has already been appended
2014-03-31 14:24:38 +02:00
8bd308ffed
merge CSS rules
2014-03-31 13:51:53 +02:00
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
icewind1991
Vincent Petry
Robin Appelman
Morris Jobke
Volkan Gezer
Jan-Christoph Borchardt
Jenkins for ownCloud
Bart Visscher
blizzz
Björn Schießle
Morris Jobke
Thomas Tanghus