4d9ff49f61
Merge pull request #8283 from owncloud/translatable-max-in-upload
...
make max. text translatable
2014-04-22 10:23:08 +02:00
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
1aa7774178
make max. text translatable
2014-04-21 02:41:33 +02:00
93ed6a695e
Merge pull request #8169 from owncloud/change-to-show
...
Change from showHTML to show
* owncloud/change-to-show:
Change from showHTML to show
2014-04-20 15:53:33 +02:00
1abd9c1305
[tx-robot] updated from transifex
2014-04-19 01:56:06 -04:00
f434c3a213
Fix localization issues of files_trashbin
2014-04-17 21:10:21 +02:00
36c8dec10a
Merge pull request #8220 from owncloud/type-hinting-ldap
...
Fix PHPdoc in user_ldap
2014-04-17 18:15:40 +02:00
d82a31d121
keep long file names in one line to not overflow download button on mobile
2014-04-17 17:11:28 +02:00
0b4431216d
Merge pull request #8236 from owncloud/header-right-fix
...
remove duplication of header and 'header-right' element, also ellipsize when too wide
2014-04-17 15:18:40 +02:00
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
a7d7ca2fb3
[tx-robot] updated from transifex
2014-04-17 01:56:06 -04:00
81751cb616
Add missing param hint
2014-04-16 17:54:10 +02:00
9434ed44f8
add max-width to directLink input to prevent overflow
2014-04-16 16:43:35 +02:00
9c6f8e59ae
fix header code duplication, code style fixes
2014-04-16 16:26:41 +02:00
547ddf7775
remove duplication of 'header-right' element, also make it overflow when too wide
2014-04-16 15:53:38 +02:00
924aee718c
fix shift of icons in 'New' menu in IE8/9, fix #7987
2014-04-16 14:58:27 +02:00
f6551d214f
Merge pull request #7815 from owncloud/ldap_fix_usercount_master
...
correct LDAP user count on setup with many users (occ user:report)
2014-04-16 10:36:19 +02:00
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
83e8981e24
add link to further discussion about that folder check
2014-04-15 21:39:13 +02:00
bad41c05b8
Fix PHPdoc in user_ldap
...
using scrutinizer patch
2014-04-15 21:05:49 +02:00
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
2dbb2db7e0
Merge pull request #7780 from owncloud/share-file-exists
...
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
8bb003868c
Fix user_ldap default setting value
2014-04-13 16:49:23 +01:00
869e7a51f0
Prevent error in files_trashbin
...
`glob` can return FALSE when the directory is empty, instead of an empty array,
causing an error at `foreach`.
"Note: On some systems it is impossible to distinguish between empty match and
an error."
See http://www.php.net/manual/en/function.glob.php -> Return Values
2014-04-13 14:51:33 +01:00
fa8814902e
Adjust logic for deciding if trashbin empty
...
Any error in opening the trashbin directory returns 'true' for isEmpty.
An error is prevented by checking if the directory exists before trying to
open it.
2014-04-13 13:49:04 +01:00
2454759af7
Check whether the user has permissions to add personal storage backends
2014-04-13 11:01:50 +02:00
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
329b8f3e99
[tx-robot] updated from transifex
2014-04-12 01:56:11 -04:00
6343391e58
Change from showHTML to show
...
There is no need to use `showHTML` here.
2014-04-11 20:38:27 +02:00
e704bc2bf0
Merge pull request #7807 from sarciszewski/patch-1
...
Update crypt.php
2014-04-11 19:19:02 +02:00
10dc1de644
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
...
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
d67cba973e
Typo fix.
2014-04-11 15:23:43 +02:00
07ea57465b
drop folder support on public shared folders
2014-04-11 14:54:13 +02:00
1c57ffa16f
Give hint when composing filter failed
2014-04-11 14:08:12 +02:00
e28227ecdc
fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh
2014-04-11 13:56:06 +02:00
6f1e9f8920
Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651
2014-04-11 13:48:45 +02:00
36107e1bad
[tx-robot] updated from transifex
2014-04-11 01:55:15 -04:00
d229856fc5
Merge pull request #8076 from owncloud/enable-dav-browser
...
Re-enable the sabredav browser plugin to fix sync client setup
2014-04-10 21:47:03 +02:00
0edacf372c
fix single file upload in firefox
2014-04-10 18:07:36 +02:00
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
e8be2ac554
In cases folder drag and drop is not supported a proper message is displayed
2014-04-09 23:32:12 +02:00
2fc9e27ced
use FileList.findFileEl
2014-04-09 22:16:41 +02:00
d2961dcf11
Merge branch 'master' into lukepolo-master
...
Conflicts:
apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
d8f56e3c00
Merge pull request #8049 from owncloud/filepickersvg
...
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
b19671d204
Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js
...
remove obsolete code
2014-04-09 14:50:15 +02:00
9feebeaf40
Merge pull request #7837 from owncloud/fix_7530
...
LDAP: fix determining objectclasses takes long
2014-04-09 12:27:17 +02:00
dbebf6bb5e
add comment to clearify when a skip in the foreach happens
2014-04-09 12:25:48 +02:00
9b0f289143
remove obsolete code
2014-04-09 12:09:28 +02:00
ee3368d2ad
replace hardcoded limit of 400 with user controlled ldapPagingSize value
2014-04-09 11:38:51 +02:00
2e5adadad7
Put inner loop into own method, let's see whether it makes scrutinizer happier
2014-04-09 11:31:56 +02:00
bdc418d1f9
var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop
2014-04-09 11:31:56 +02:00
43402c56dd
initialize variable
2014-04-09 11:31:56 +02:00
40f9875f11
LDAP: fix user report i.e. count for LDAP servers with really many users
2014-04-09 11:31:56 +02:00
8bb27551bd
LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0
2014-04-09 11:31:56 +02:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
35ab6fe5a9
Disable sharing in trashbin app
2014-04-08 17:13:59 +02:00
2407321625
add tests for LDAP
2014-04-08 12:57:06 +02:00
142fc5f3af
fix return value when a search string was passed to return integer instead of array
2014-04-08 12:53:59 +02:00
96cb75f5cf
implement countUsersInGroup in LDAP group backend
2014-04-08 12:04:38 +02:00
411a810ebe
Merge pull request #8032 from owncloud/fs-backend-registration
...
Files External: allow dynamic backend registration
2014-04-08 11:27:02 +02:00
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
68b7822cf5
js style fixes according to our jshintrc rules
2014-04-07 23:45:35 +02:00
d15a4719d2
fix folder upload in js
2014-04-07 23:04:08 +02:00
971a311fee
adding parentId to file info array
2014-04-07 23:03:19 +02:00
6d373e97c3
remove unused exit()
2014-04-07 23:02:49 +02:00
3587c88fe9
Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
...
Conflicts:
apps/files/js/file-upload.js
2014-04-07 22:28:16 +02:00
3ac009c2b4
unit tests for dynamic backend registration
2014-04-07 20:18:57 +02:00
21a54ba50f
Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js
...
Fix copy conflict dialog translation
2014-04-07 14:38:00 +02:00
3c9f588449
Merge pull request #6221 from leo-b/ldap_get_all_groups
...
fix updateGroups background job for ldap servers with > 1000 groups
2014-04-07 13:00:32 +02:00
c90b0ac00b
Fix copy conflict dialog translation
2014-04-07 11:46:47 +02:00
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
593977f016
Re-enable the sabredav browser plugin
2014-04-06 14:49:39 +02:00
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
01d93f81f6
Show higher resolution previews for high dpi screens
2014-04-04 17:10:46 +02:00
a4eafca77f
Moved code to replace svg with png to OC.Util
...
- Moved code that replaces the "svg" extension for the given file to
core as OC.Util.replaceSVGIcon.
- Added unit test for OC.Util.replaceSVGIcon
- Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global
"replaceSVG" function.
- Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
2014-04-04 11:34:26 +02:00
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
bf7624fb25
Merge pull request #6968 from owncloud/files-ajaxload
...
Ajaxify files list for files + trashbin + public page
2014-04-03 22:02:05 +02:00
e3b9a86184
remove duplicate method checkDependencies()
2014-04-03 17:17:44 +02:00
c6976d89a6
use command -v to detect if smbclient exists
2014-04-03 17:09:40 +02:00
d1e78d7a6b
Correctly set svg for crumb divider
2014-04-03 17:08:06 +02:00
14a5381977
Merge branch 'master' into fs-backend-registration
...
Conflicts:
apps/files_external/templates/settings.php
2014-04-03 17:04:16 +02:00
7c9537f33a
Fixed dirInfo check for non existing dir in files ajax call
2014-04-03 17:04:13 +02:00
c0ebc1dfb1
Update backends and their configurations
2014-04-03 16:57:26 +02:00
3101663129
Removed redundant free space and upload limit in public page
2014-04-03 16:50:21 +02:00
730bca98b4
Moved dependency checks to end of class files
...
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends
Conflicts:
apps/files_external/lib/google.php
apps/files_external/lib/swift.php
apps/files_external/templates/settings.php
2014-04-03 16:46:22 +02:00
ff9a4a6d91
Added cURL dependency for Amazon S3, Dropbox and SWIFT
...
Conflicts:
apps/files_external/lib/amazons3.php
apps/files_external/lib/swift.php
2014-04-03 16:38:43 +02:00
e2969062ca
Merge pull request #7969 from Xenopathic/files_external_fix
...
Fix error log spam
2014-04-03 16:31:58 +02:00
46379113a1
Changed dependency check messages from warnings to notes
...
Added check for duplicate dependency check messages to display only the first
2014-04-03 16:31:54 +02:00
8ca897df76
Added cURL dependency check to Google Drive and WebDAV backend
...
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing
Conflicts:
apps/files_external/lib/config.php
apps/files_external/lib/google.php
2014-04-03 16:30:48 +02:00
f7da4280ca
Modified app to dynamically register backends instead of hard-coding them
...
Moved dependency check to the individual backends instead of the config
Conflicts:
apps/files_external/appinfo/app.php
apps/files_external/lib/config.php
2014-04-03 16:21:52 +02:00
a2efdb8722
Merge pull request #7970 from owncloud/webdav-upload-hash
...
Fix uploading files containing a # in the path for webdav
2014-04-03 16:09:44 +02:00
eaad6a4e27
Fix error log spam
...
Regression from e002b7242c
2014-04-03 13:43:02 +01:00
7dafdfbe88
add tests for sharing files the users doesn't have access to
2014-04-03 13:14:34 +02:00
54783550e8
[tx-robot] updated from transifex
2014-04-03 01:56:12 -04:00
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
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
1e6a79e244
Reuse known free space in the files app
2014-04-02 16:53:45 +02:00
0be9de5df5
Files, trashbin, public apps use ajax/JSON for the file list
...
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +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
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
3f9beb8c6b
Upgraded phpseclib to version 0.3.6
2014-04-02 12:31:59 +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
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +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
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
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
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
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04: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
76c63a5760
Fix uploading files containing a # in the path for webdav
2014-03-31 17:00:32 +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
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
6ac85480f7
replace last personalblock fieldset within files_external
2014-03-31 13:00:46 +02:00
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
fe78d963d9
Implement getPath for shared files
2014-03-28 15:26:15 +01:00
7adb5ae2c5
Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
...
don't write file if opening a stream to encrypt the data fails
2014-03-28 14:59:05 +01:00
b158939283
adapt description of paging size configuration
2014-03-28 14:20:01 +01:00
0d9d70b51c
change default ldap paging size to 500
2014-03-28 14:02:19 +01:00
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
b9100bc2de
don't write file if opening a stream to encrypt the data fails
2014-03-28 12:02:49 +01:00
0757f87dba
Merge pull request #7872 from owncloud/trash-disablestoragestats
...
Do not retrieve storage stats for trash bin
2014-03-28 11:22:19 +01:00
f3d6b2f3e9
Do not retrieve storage stats for trash bin
2014-03-28 11:21:33 +01:00
e806b6d9a0
Merge pull request #7842 from Xenopathic/files_external_config_optional
...
Enable the use of 'optional' on password fields for mount configuration
2014-03-28 10:02:28 +00:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
e3b951f412
Merge pull request #7724 from owncloud/mobile
...
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
d2e5dd2a15
Merge pull request #7913 from owncloud/fix-logo
...
fix SVG replacement for logo so it works in IE8, fix #7866
2014-03-28 02:29:35 +01:00
6a8e93ffa6
fix breadcrumbs for IE8
2014-03-27 23:53:19 +01:00
531f3cf1a8
Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
...
Fix swift touch operation
2014-03-27 18:10:45 +01:00
25326b89da
replace personalblock fieldset with section class in core user_ apps
2014-03-27 17:00:47 +01:00
Jörn Friedrich Dreyer
Jenkins for ownCloud
Volkan Gezer
Andreas Fischer
blizzz
Jan-Christoph Borchardt
Morris Jobke
Robin McCorkell
Jenkins for ownCloud
Bart Visscher
Robin Appelman
Björn Schießle
Lukas Reschke
Volkan Gezer
Vincent Petry
Philipp Kapfer
icewind1991
Alexander Bergolth
Morris Jobke