c57c9eae76
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 16:01:24 +01:00
262f221d11
Merge branch 'master' into fix-setupfs-only-for-existing-users-master
2014-01-21 15:35:32 +01:00
98415d68a5
Merge pull request #6864 from owncloud/protect-versions-preview-master
...
don't use the user id within the versions preview call as it could be us...
2014-01-21 06:16:22 -08:00
37e278f2a9
don't use the user id within the versions preview call as it could be used to access previews of another user
2014-01-21 13:50:56 +01:00
2e7fed1b9b
Merge pull request #6861 from owncloud/neutral_download_zip_default_name
...
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
2014-01-21 04:19:26 -08:00
c9194f761f
Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle
...
user workaround to compare CLOB column with CHAR value
2014-01-21 04:14:28 -08:00
267e1f3c40
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
2014-01-21 12:41:10 +01:00
a3ea5aa2ac
fixing comment + adding unit test for checkPasswordProtectedShare
2014-01-21 12:07:08 +01:00
21832bc890
user workarount to compare CLOB column with CHAR value
2014-01-21 11:56:34 +01:00
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
6746ad0a73
in case no share is found for the given token we can return right away
2014-01-21 10:55:10 +01:00
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
f29bd1cb0b
adding code coverage support
2014-01-21 00:57:18 +01:00
0f794b6889
Merge pull request #6820 from owncloud/phpunit-test-config
...
Load a separate config (if present) when running unit tests
2014-01-20 12:14:09 -08:00
92d8db6f19
Merge pull request #6849 from owncloud/checkupdate-reuse
...
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 10:37:18 -08:00
ee30977383
Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc
...
When reading the size of "files" mountpoints need to be excluded
2014-01-20 09:28:49 -08:00
9555305565
change publicUploadButtonMock to public_upload
...
Changed jQuery selector for public preview to public_upload to correctly show preview
2014-01-20 11:58:01 -05:00
cdb7f40412
Merge pull request #6842 from owncloud/fix-quotes-again-master
...
Quote column names on adding description
2014-01-20 08:52:21 -08:00
4ec6debe2b
remove unused variable
2014-01-20 17:27:03 +01:00
ca57a849ff
When reading the size of "files" mountpoints need to be excluded
...
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.
This is because the default call (legacy) used to return the size of
mount points as well.
Fixes #6731
2014-01-20 17:11:33 +01:00
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
62dd58aa19
Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix
...
Fixed quota wrapper to not wrap failed fopen streams
2014-01-20 05:29:27 -08:00
3971b12768
undo 3rdparty change
2014-01-20 14:20:01 +01:00
94504d7265
undo 3rdparty change
2014-01-20 14:18:10 +01:00
164915a3f8
Move test config folder to tests/config
2014-01-20 13:41:52 +01:00
f88360eba3
Merge pull request #6827 from rnveach/fix_6730
...
Fix 6730
2014-01-20 01:44:34 -08:00
99e068761a
adding a comment to the database schema
2014-01-20 10:17:31 +01:00
221e656e91
Revert "use getAppWebPath() in here as well"
...
This reverts commit 6254f0a403
2014-01-20 10:10:34 +01:00
8e64909e99
Updating 3rdparty once more ....
2014-01-20 09:25:30 +01:00
39be83ca8b
Merge pull request #6676 from aseques/check_internet_proxy
...
Fix internet detection to use OC_Util::getUrlContent
2014-01-19 12:08:55 -08:00
1af7dab535
Fixed quota wrapper to not wrap failed fopen streams
...
When calling fopen() on some storage types, these return false instead
of throwing an exception.
This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.
Also added 'rb' as another case that doesn't need to be wrapped.
Fixes #6832
2014-01-19 18:51:36 +01:00
f354717c4c
Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix
...
Fixed isPreviewAvailable warnings in log
2014-01-19 04:48:12 -08:00
80dead5a9f
fix double call of changeEmailAddress()
2014-01-18 22:59:49 +01:00
fea1cc82e8
Keep the EOF-Newline
2014-01-18 17:51:41 +01:00
903b330ccc
Merge pull request #6721 from tsumi/patch-1
...
Added SVG fallback to apps settings popup
2014-01-18 08:34:45 -08:00
3a2e03a7f0
Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps
...
Fix activation of unknown apps
2014-01-18 08:13:57 -08:00
419d2d27e8
Merge pull request #6818 from owncloud/add_documentation_to_appinfo
...
Allow app developers to add documentation links to the appinfo
2014-01-18 08:09:07 -08:00
ce0cbbd7bc
remove comment & add space
2014-01-18 14:22:56 +01:00
9edbd142a2
Removes Bogus Styles.
2014-01-18 00:46:06 +05:30
a41440436c
added trigger to redo selection text on a directory change
2014-01-17 11:49:00 -05:00
90a41ef26a
fixed selector string and removed all checkbox if it was selected
2014-01-17 11:46:44 -05:00
80d871ab1e
added website field
2014-01-17 16:35:48 +01:00
f0a5007e9a
fix input element closing tag
2014-01-17 16:32:01 +01:00
e2de3b8337
distinguish app links from doc links
2014-01-17 16:08:32 +01:00
b291fb9cd7
make sure there's enough room for the file actions
2014-01-17 15:47:26 +01:00
bf0471a92e
show link to app documentation
2014-01-17 14:56:25 +01:00
1df6bf997a
add link to documentation
2014-01-17 14:56:15 +01:00
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
3e803b5e36
restrict zooming on mobile devices for the publicly accessible, optimized pages
2014-01-17 14:41:05 +01:00
6b4c3df087
Load a separate config (if present) when running unit tests
2014-01-17 14:40:48 +01:00
Thomas Müller
Jörn Friedrich Dreyer
icewind1991
Vincent Petry
Myles McNamara
Robin Appelman
Morris Jobke
kondou
raghunayyar
rnveach
Bjoern Schiessle
Jan-Christoph Borchardt