Arthur Schiwon
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
Arthur Schiwon
43402c56dd
initialize variable
2014-04-09 11:31:56 +02:00
Arthur Schiwon
40f9875f11
LDAP: fix user report i.e. count for LDAP servers with really many users
2014-04-09 11:31:56 +02:00
Arthur Schiwon
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
Jenkins for ownCloud
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
Vincent Petry
35ab6fe5a9
Disable sharing in trashbin app
2014-04-08 17:13:59 +02:00
Arthur Schiwon
2407321625
add tests for LDAP
2014-04-08 12:57:06 +02:00
Arthur Schiwon
142fc5f3af
fix return value when a search string was passed to return integer instead of array
2014-04-08 12:53:59 +02:00
Arthur Schiwon
96cb75f5cf
implement countUsersInGroup in LDAP group backend
2014-04-08 12:04:38 +02:00
Thomas Müller
411a810ebe
Merge pull request #8032 from owncloud/fs-backend-registration
...
Files External: allow dynamic backend registration
2014-04-08 11:27:02 +02:00
Jenkins for ownCloud
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
Thomas Müller
68b7822cf5
js style fixes according to our jshintrc rules
2014-04-07 23:45:35 +02:00
Thomas Müller
d15a4719d2
fix folder upload in js
2014-04-07 23:04:08 +02:00
Thomas Müller
971a311fee
adding parentId to file info array
2014-04-07 23:03:19 +02:00
Thomas Müller
6d373e97c3
remove unused exit()
2014-04-07 23:02:49 +02:00
Thomas Müller
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
Thomas Müller
3ac009c2b4
unit tests for dynamic backend registration
2014-04-07 20:18:57 +02:00
Thomas Müller
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
blizzz
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
Jörn Friedrich Dreyer
c90b0ac00b
Fix copy conflict dialog translation
2014-04-07 11:46:47 +02:00
Jenkins for ownCloud
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
Robin Appelman
593977f016
Re-enable the sabredav browser plugin
2014-04-06 14:49:39 +02:00
Jenkins for ownCloud
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
Volkan Gezer
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
Robin Appelman
01d93f81f6
Show higher resolution previews for high dpi screens
2014-04-04 17:10:46 +02:00
Vincent Petry
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
Vincent Petry
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
Jenkins for ownCloud
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
Morris Jobke
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
Thomas Müller
e3b9a86184
remove duplicate method checkDependencies()
2014-04-03 17:17:44 +02:00
Thomas Müller
c6976d89a6
use command -v to detect if smbclient exists
2014-04-03 17:09:40 +02:00
Vincent Petry
d1e78d7a6b
Correctly set svg for crumb divider
2014-04-03 17:08:06 +02:00
Thomas Müller
14a5381977
Merge branch 'master' into fs-backend-registration
...
Conflicts:
apps/files_external/templates/settings.php
2014-04-03 17:04:16 +02:00
Vincent Petry
7c9537f33a
Fixed dirInfo check for non existing dir in files ajax call
2014-04-03 17:04:13 +02:00
Thomas Müller
c0ebc1dfb1
Update backends and their configurations
2014-04-03 16:57:26 +02:00
Vincent Petry
3101663129
Removed redundant free space and upload limit in public page
2014-04-03 16:50:21 +02:00
Philipp Kapfer
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
Philipp Kapfer
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
Vincent Petry
e2969062ca
Merge pull request #7969 from Xenopathic/files_external_fix
...
Fix error log spam
2014-04-03 16:31:58 +02:00
Philipp Kapfer
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
Philipp Kapfer
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
Philipp Kapfer
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
Thomas Müller
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
Robin McCorkell
eaad6a4e27
Fix error log spam
...
Regression from e002b7242c
2014-04-03 13:43:02 +01:00
Robin Appelman
7dafdfbe88
add tests for sharing files the users doesn't have access to
2014-04-03 13:14:34 +02:00
Jenkins for ownCloud
54783550e8
[tx-robot] updated from transifex
2014-04-03 01:56:12 -04:00
icewind1991
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
Vincent Petry
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
Robin Appelman
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
Robin Appelman
1e6a79e244
Reuse known free space in the files app
2014-04-02 16:53:45 +02:00
Vincent Petry
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
Vincent Petry
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
Morris Jobke
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
Vincent Petry
3f9beb8c6b
Upgraded phpseclib to version 0.3.6
2014-04-02 12:31:59 +02:00
Jenkins for ownCloud
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
Thomas Müller
d762e25cc5
Merge pull request #7989 from owncloud/files-deletefileregressionfix
...
Fixed broken delete file action
2014-04-01 22:54:05 +02:00
Vincent Petry
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
Bart Visscher
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
Bart Visscher
f37a76c396
Remember before change works better
2014-04-01 19:46:46 +02:00
Vincent Petry
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
Morris Jobke
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
Vincent Petry
aaa8d6ec02
Fixed broken delete file action
2014-04-01 16:09:48 +02:00
Vincent Petry
0bede65947
Fix dirInfo check when dir does not exist
2014-04-01 15:15:03 +02:00
Vincent Petry
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
Jan-Christoph Borchardt
acfb3cfff5
external storage: set storages to be available for All Users by default
2014-04-01 14:31:22 +02:00
Jan-Christoph Borchardt
0a112de676
external storage: change confusing 'applicable' to 'available for'
2014-04-01 14:26:06 +02:00
Björn Schießle
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
Vincent Petry
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Vincent Petry
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Jenkins for ownCloud
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
Bjoern Schiessle
c578ab68fe
there is no need to re-calculate the shares after a touch
2014-03-31 18:24:53 +02:00
Bjoern Schiessle
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
Thomas Müller
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
Robin Appelman
76c63a5760
Fix uploading files containing a # in the path for webdav
2014-03-31 17:00:32 +02:00
Bjoern Schiessle
aa867ad647
don't call getFileInfo() to avoid to open the same file twice
2014-03-31 15:29:16 +02:00
Bjoern Schiessle
8ebb1f15d3
move check if a file should be encrypted to the pre hook
2014-03-31 15:29:16 +02:00
Robin Appelman
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
Jan-Christoph Borchardt
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
Jan-Christoph Borchardt
6ac85480f7
replace last personalblock fieldset within files_external
2014-03-31 13:00:46 +02:00
Jenkins for ownCloud
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
Robin Appelman
fe78d963d9
Implement getPath for shared files
2014-03-28 15:26:15 +01:00
Björn Schießle
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
Alexander Bergolth
b158939283
adapt description of paging size configuration
2014-03-28 14:20:01 +01:00
Alexander Bergolth
0d9d70b51c
change default ldap paging size to 500
2014-03-28 14:02:19 +01:00
Vincent Petry
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Bjoern Schiessle
b9100bc2de
don't write file if opening a stream to encrypt the data fails
2014-03-28 12:02:49 +01:00
Björn Schießle
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
Vincent Petry
f3d6b2f3e9
Do not retrieve storage stats for trash bin
2014-03-28 11:21:33 +01:00
Robin McCorkell
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
Thomas Müller
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
Thomas Müller
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
Jenkins for ownCloud
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
Morris Jobke
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
Morris Jobke
6a8e93ffa6
fix breadcrumbs for IE8
2014-03-27 23:53:19 +01:00
Vincent Petry
531f3cf1a8
Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
...
Fix swift touch operation
2014-03-27 18:10:45 +01:00
Jan-Christoph Borchardt
25326b89da
replace personalblock fieldset with section class in core user_ apps
2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
6de572c6e6
replace personalblock fieldset with section class in files apps
2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
832d3c954e
enable SVG->PNG fallback for 'New' menu
2014-03-27 14:48:54 +01:00
Jan-Christoph Borchardt
f88b24d532
enable SVG->PNG fallback for newly uploaded files and folders
2014-03-27 14:48:35 +01:00
Vincent Petry
2a08e35d72
Fix swift touch operation
...
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.
This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
2014-03-27 12:34:30 +01:00
Vincent Petry
1f6259d9c2
Merge pull request #7875 from Xenopathic/files_external_smb_auto
...
SMB/CIFS mounts using ownCloud login, fixes #7843
2014-03-27 12:18:51 +01:00
Vincent Petry
1469ce7b38
Merge pull request #7898 from owncloud/ext-swiftmtime
...
Fixed mtime reading from OpenStack API
2014-03-27 09:31:37 +01:00
Jenkins for ownCloud
ed0cba0ff4
[tx-robot] updated from transifex
2014-03-27 01:56:30 -04:00
Vincent Petry
fa00a18677
Fixed mtime reading from OpenStack API
...
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
Robin McCorkell
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
Jan-Christoph Borchardt
eeaefd84c3
change mobile breakpoint for shared view to 768px as well
2014-03-26 16:32:09 +01:00
Robin McCorkell
a1dca821f9
Use braces on single line if statements
2014-03-26 15:11:09 +00:00
Robin McCorkell
cd5ebac7c4
Fix error in $isPersonal setting
2014-03-26 14:37:29 +00:00
Robin McCorkell
b077528087
Perform proper checking for share availability
...
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.
The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
2014-03-26 14:36:45 +00:00
Robin McCorkell
cac4aaa8c4
Rename SMB_Auto to SMB_OC and change visible name
...
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
2014-03-26 14:35:07 +00:00
Robin McCorkell
86aa6104e6
Revoke sharable permission on automatic SMB shares
...
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
2014-03-26 14:35:07 +00:00
Robin McCorkell
3445c062ec
Use loginname instead of display name
...
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
2014-03-26 14:35:07 +00:00
Robin McCorkell
ba63e46b5e
SMB/CIFS mount using OwnCloud logon credentials
...
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.
Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
2014-03-26 14:35:07 +00:00
Vincent Petry
b656c68ede
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
...
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
Robin Appelman
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
Vincent Petry
e002b7242c
Fix merging of external storage configurations
...
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
Vincent Petry
8d95c0d013
Pretty print mount.json when possible
2014-03-26 11:32:03 +01:00
Vincent Petry
cbfd16089b
Fixed share upgrade cleanup tests to use the correct ids
2014-03-26 09:29:28 +01:00
Jenkins for ownCloud
75d8de378c
[tx-robot] updated from transifex
2014-03-26 01:56:21 -04:00
Thomas Müller
8958b9147b
adding ellipsis on file names to public file list as well
2014-03-26 00:14:38 +01:00
Thomas Müller
d0f84e936f
adding proper notification area for multi line messages
2014-03-26 00:04:11 +01:00
Thomas Müller
e6392163a4
adding ellipsis on file names
2014-03-25 23:40:40 +01:00
Thomas Müller
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
Vincent Petry
ec9260647a
Fixed share updater unit test
...
Now using \OC_DB::insertId() to retrieve the generated ids because
Oracle ignores the passed values.
2014-03-25 20:18:58 +01:00
Vincent Petry
5111fad006
Merge pull request #7689 from owncloud/last_cron_log
...
Log last cron execution
2014-03-25 19:17:36 +01:00
Bjoern Schiessle
31681a3a27
finally fix the paths for the OCS Share API
2014-03-25 17:52:45 +01:00
Bjoern Schiessle
3653a51af2
fix path creation for re-shares, issue #7662
2014-03-25 17:48:50 +01:00
Thomas Müller
f9279ac77a
killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
2014-03-25 17:42:41 +01:00
Vincent Petry
e72b2e6e3b
Fix public upload to not close session when encryption is on
...
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
2014-03-24 17:34:37 +01:00
Robin McCorkell
690c31ec20
Insert missing brace
2014-03-24 13:27:46 +00:00
Scott Arciszewski
09cc020535
Update crypt.php
...
Use a 256-bit random value
2014-03-24 08:57:33 -04:00
icewind1991
d87001a093
Merge pull request #7768 from owncloud/trashempty-nocache
...
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-24 13:34:30 +01:00
Robin Appelman
6b66b42f6e
catch the case where files_trashbin/files doesn't exist
2014-03-24 12:33:44 +01:00
Jenkins for ownCloud
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
Jenkins for ownCloud
0245e64cec
[tx-robot] updated from transifex
2014-03-22 01:56:09 -04:00
kondou
e6b4d28229
Move success/error squircles to settings
2014-03-21 20:27:22 +01:00
Jan-Christoph Borchardt
905aabf5d4
mobile: document min-width value
2014-03-21 16:43:40 +01:00
Jan-Christoph Borchardt
f2566e649f
mobile: adjust break to 768, also fix min-widths
2014-03-21 16:36:45 +01:00
Arthur Schiwon
422ccf4cdb
add test for cloning and keeping configuration seperate
2014-03-21 15:31:30 +01:00
Arthur Schiwon
86d479cb28
Use array_key_exists instead of isset, because the latter returns false if the assigned value is null
2014-03-21 15:29:49 +01:00
Jan-Christoph Borchardt
c6aefada71
do not show Deleted Files on mobile, not optimized yet and button too long
2014-03-21 15:29:37 +01:00
Arthur Schiwon
055a09e487
On clone create a new instance of the Configuration
...
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +01:00
Robin McCorkell
c4e7d7989a
Enable the use of 'optional' on password fields (JavaScript part)
...
See ed0c10a10b
2014-03-21 13:51:45 +00:00
Jan-Christoph Borchardt
40c20b2eeb
mobile: remove shift for multiselect bar to account for missing navigation
2014-03-21 14:34:05 +01:00
Thomas Müller
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
Vincent Petry
37af74efb3
Merge pull request #7655 from owncloud/shared-unencryptedsize
...
Fixed warning when browsing Shared folder
2014-03-21 12:28:27 +01:00
blizzz
3f95f9325f
Merge pull request #7823 from owncloud/fix_7796
...
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
Arthur Schiwon
4230983e69
define var
2014-03-21 10:10:49 +01:00
Arthur Schiwon
6f605ecd67
make tests work on systems without php5_ldap
2014-03-21 10:08:17 +01:00
Jenkins for ownCloud
bcf388d3c5
[tx-robot] updated from transifex
2014-03-21 01:55:35 -04:00
Arthur Schiwon
3d2ab76347
add tests for cumulativeSearchOnAttribute
2014-03-21 00:17:51 +01:00
Arthur Schiwon
a085d7715f
fix potential infinite loop when the DN of the first entry was already read.
2014-03-20 22:59:41 +01:00
Arthur Schiwon
561d699ca6
Use the LDAP wrapper for checking resources, needs for proper testing
2014-03-20 22:58:57 +01:00
Arthur Schiwon
bd881348e8
Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway
2014-03-20 22:57:50 +01:00
Robin McCorkell
7c3da27bf6
Fix duplicate ipauniqueid
2014-03-20 20:38:06 +00:00
Robin McCorkell
7a0eccfc63
Correct field modifier checking
...
Existing code checks for the existence of a modifier ('&', '!', '#', '*')
anywhere in the field name, but strips the first character regardless. This
change makes it so that only modifiers at the beginning of the string are
counted.
2014-03-20 18:28:42 +00:00
Robin McCorkell
ed0c10a10b
Enable the use of 'optional' on password fields
...
The logic has been changed, in that 'class="optional"' is applied to both
password and text types if the field begins with the optional market, '&'.
2014-03-20 18:27:40 +00:00
Lukas Reschke
2c561c9c50
Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
...
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
Vincent Petry
d95fde3924
Removed comment
2014-03-20 15:24:05 +01:00
Arthur Schiwon
057c2638e4
LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530
2014-03-20 13:58:08 +01:00
Morris Jobke
5747e0e3f9
remove executable flag for file-upload.js
2014-03-20 13:26:21 +01:00
Morris Jobke
95a13e2690
Merge pull request #7814 from oskholl/master
...
Fix: 'Upload button tooltip doesn't disappear'
2014-03-20 13:25:21 +01:00
Vincent Petry
1e4e0cfcd5
Lazy load phpseclib in ext storage config
2014-03-20 13:21:34 +01:00
Robin Appelman
cf23defa52
Fix typo in mount loading
2014-03-20 12:52:09 +01:00
Thomas Müller
8a81df0f2c
Merge pull request #7651 from owncloud/close-session-faster-master
...
Close session faster
2014-03-20 11:07:21 +01:00
Jenkins for ownCloud
3aa8647634
[tx-robot] updated from transifex
2014-03-20 01:56:42 -04:00
Oskar Hollmann
90839b784f
Comment moved to prevent 'Line is too long' warning.
2014-03-19 23:05:03 +01:00
Oskar Hollmann
fa28c089fa
Fix: 'Upload button tooltip doesn't disappear'
...
Fixes issue #7461 . Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
2014-03-19 22:09:09 +01:00
Robin McCorkell
ca595611f5
Add FreeIPA UUID compatibility, fixes #7796
...
Ability to use ipauniqueid for the UUID of a user
2014-03-19 20:30:24 +00:00
Scott Arciszewski
36da3bc359
Update crypt.php
...
A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit?
Also, 183 bytes = 1464 bits.
Here's a safe alternative: 2048 bits, with comment-code sanity
2014-03-19 13:31:51 -04:00
Vincent Petry
9116c39a82
Fixed ext storage password field order issue
...
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
Vincent Petry
5b6c36347b
Fixed ext storage unit test for groups
...
Now creating real users and groups for testing external storage mounts
2014-03-19 17:55:34 +01:00
Vincent Petry
8e0a5ed5df
Added tests to check mount point list for a target user
2014-03-19 15:21:54 +01:00
Robin Appelman
214357ca68
Improve sorting performance of large lists of files
2014-03-19 13:53:59 +01:00
Vincent Petry
4cb53f77b2
Moved external storage mounting code to files_external app
...
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
Thomas Müller
c216c4777b
Merge branch 'master' into close-session-faster-master
...
Conflicts:
apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
Vincent Petry
80180bea32
Added IV for ext storage password encryption
2014-03-19 11:42:22 +01:00
Thomas Müller
33e96597d1
Merge pull request #7790 from owncloud/fix/7788
...
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Vincent Petry
40a70ecf79
Added password obfuscation for external storage config
...
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
2014-03-19 10:52:22 +01:00
Vincent Petry
e0dada704c
Added ext storage unit tests for writing then reload the mount config
2014-03-19 10:52:22 +01:00
Vincent Petry
ff5b79edeb
Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage
...
Fix validation of allowed personal backend
2014-03-19 10:00:12 +01:00
Jenkins for ownCloud
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
Robin McCorkell
340cd2734b
Merge pull request #7766 from Xenopathic/master
...
Fix smb4php to work with home shares
2014-03-18 19:42:04 +00:00
Vincent Petry
1f79f368ef
Added unit tests for when adding ext storage mount points
...
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
doing an actual check/connection (note: this is necessary because the
static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
Thomas Müller
76961ce072
fixing javascript error where $(Files.breadcrumbs[1]).get(0) returns undefined - happens on resize to a very small width
2014-03-18 17:59:21 +01:00
Vincent Petry
8ababef4cd
Fix validation of allowed personal backend
2014-03-18 17:54:14 +01:00
Thomas Müller
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
Jan-Christoph Borchardt
285fc5ba96
mobile: change CSS order so rename and versions are hidden
2014-03-18 11:50:08 +01:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Thomas Müller
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Thomas Müller
ea8705bac8
additional class is added to the file actions called e.g. 'action-share', 'action-rename'
...
in order to allow proper translations of the action's display name an additional parameter has been added to the register function
2014-03-17 20:15:10 +01:00
Robin Appelman
38b1529c2a
More robust way to check if the folder is empty
2014-03-17 17:03:32 +01:00
Robin Appelman
332c14a878
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-17 16:35:08 +01:00
Robin McCorkell
792d0d3314
Fix smb4php to work with home shares
...
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
2014-03-17 15:03:25 +00:00
Frank Karlitschek
8a24e1eb96
clearify the use-case of this app
2014-03-17 12:29:17 +01:00
Morris Jobke
7ffaf0d70a
Merge pull request #7734 from owncloud/icon-class-remove
...
remove unneeded icon class
2014-03-16 10:24:57 +01:00
Jenkins for ownCloud
c89aa6d5fe
[tx-robot] updated from transifex
2014-03-16 03:13:21 -04:00
Jenkins for ownCloud
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
Thomas Müller
bbbbb033f3
in case of phpunit executions calling header() and exit() is too bad
2014-03-14 18:20:33 +01:00