Vincent Petry
d7f4547717
Merge pull request #6726 from owncloud/fix_6630
...
don't urldecode get var, php does this automatically
2014-02-14 14:34:20 +01:00
Thomas Müller
595b908b74
Merge pull request #7183 from owncloud/remove-force-lowercase
...
remove forced lowercase from extension, fix #4747
2014-02-14 13:58:42 +01:00
Vincent Petry
afe133d5d1
Merge pull request #7168 from owncloud/issue/7152
...
Send correct path on file upload when using public app
2014-02-14 12:25:20 +01:00
Vincent Petry
d5397d813c
Do not send file list for select all on Download/delete
...
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
with root
- Delete will send "allfiles" to the server that will find the file
list or the passed directory by itself
2014-02-13 20:28:52 +01:00
Robin Appelman
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
Guillaume AMAT
01dc7c5482
Gets the page title from oc_defaults in Files app
2014-02-13 10:48:01 +01:00
Jan-Christoph Borchardt
6e17d71a0d
remove forced lowercase from extension, fix #4747 , also coding style fixes
2014-02-13 10:39:38 +01:00
Thomas Müller
30662fa7ac
Merge pull request #7178 from owncloud/issue/6277
...
External FTP Storage should request hostname instead of URL
2014-02-12 23:01:41 +01:00
Joas Schilling
658af627ce
External FTP Storage should request hostname instead of URL
...
Fix issue #6277
2014-02-12 18:20:10 +01:00
root
d10f6e94dc
fix coding style to blizzz happy.. ;-)
2014-02-12 16:56:17 +01:00
Joas Schilling
9619459e37
Send correct path on file upload when using public app
...
Fix issue #7152
2014-02-12 15:49:09 +01:00
icewind1991
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Bart Visscher
1fb5f96c37
Style fixes
2014-02-12 09:09:51 +01:00
Guillaume AMAT
a62b393d02
Update page title when navigating through directories
2014-02-12 00:54:35 +01:00
Thomas Müller
3699728a3a
Merge pull request #7085 from owncloud/quick-fix-7019-master
...
Load authentication apps to get users from all backends
2014-02-11 18:41:08 +01:00
Arthur Schiwon
14d1abf63f
LDAP: improve debug message
2014-02-10 14:45:37 +01:00
Arthur Schiwon
18e1a10e96
LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image
2014-02-10 14:45:31 +01:00
Morris Jobke
eba1d574cf
Merge pull request #7134 from owncloud/issue/5794
...
Make google drive client secret and dropbox api secret a password field
2014-02-10 14:34:24 +01:00
Robin Appelman
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
Morris Jobke
02bdb47049
Merge pull request #7140 from owncloud/enc_dont_login_during_encryption
...
refuse login as long as the initial encryption is running
2014-02-10 13:25:39 +01:00
Arthur Schiwon
299d37154b
LDAP: add documentation info in info.xml
2014-02-10 12:59:11 +01:00
Vincent Petry
6b5a7035ee
Merge pull request #7126 from nickvergessen/issue/6683
...
Only add files to file list when uploading to current directory
2014-02-10 12:14:05 +01:00
Arthur Schiwon
e156f85bfb
Rephrase and clarify log message
2014-02-10 11:29:08 +01:00
Arthur Schiwon
a76840d206
Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670
2014-02-10 11:29:02 +01:00
Arthur Schiwon
e825a008c9
Wizard: disable LDAP referrals, fixes #6670
2014-02-10 11:28:55 +01:00
Arthur Schiwon
a908bd5695
throw an info message, when base dn test failed
2014-02-10 11:28:46 +01:00
Arthur Schiwon
bc17b40650
LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard
2014-02-10 11:28:38 +01:00
Bjoern Schiessle
050e84a08f
refuse login as long as the initial encryption is running
2014-02-10 10:56:11 +01:00
Thomas Müller
e7db48cd7f
Merge pull request #7133 from owncloud/fix-implied-eval
...
Fix implied evals and doubled definition of variable
2014-02-10 10:08:40 +01:00
Joas Schilling
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
Joas Schilling
828985dc60
Make google drive client secret and dropbox api secret a password field
...
Fix issue #5794
2014-02-07 18:12:01 +01:00
Bjoern Schiessle
91254c304d
name users after test
2014-02-07 18:07:38 +01:00
Morris Jobke
13fa0e2a9d
Fix implied evals and doubled definition of variable
...
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
Joas Schilling
af7366cd30
Only add files to file list when uploading to current directory
...
Fix Issue #6683
2014-02-07 13:06:50 +01:00
Bjoern Schiessle
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Vincent Petry
aff1cafaca
Merge pull request #7089 from owncloud/sharing-searchbymime
...
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
Pellaeon Lin
946fccc0dd
Remove unused template variable assignment of files_sharing/template/public.php
2014-02-06 12:26:36 +08:00
Pellaeon Lin
8c56e21ced
Move template variable assignment to correct place
2014-02-06 12:06:16 +08:00
Jan-Christoph Borchardt
b0692af29a
Merge pull request #7064 from owncloud/files-scrolltopafterupdate
...
Scroll to the top after switching dir
2014-02-05 16:13:55 +01:00
Björn Schießle
697b25f165
Merge pull request #7032 from owncloud/enc_fix_delete
...
Encryption replace delete proxy with pre/post hooks and add tests
2014-02-05 14:26:52 +01:00
Robin Appelman
1e79369338
merge master into storagestatistics-reuse
2014-02-05 13:36:55 +01:00
Vincent Petry
fa5ddc3e18
Fixed searchByMime in shared cache
...
- searchByMime now correctly returns files recursively search through
all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
Thomas Müller
9d9f360b77
Load authentication apps to get users from all backends - fixes #7019
2014-02-05 12:54:31 +01:00
Thomas Müller
6d3b61f388
Merge pull request #7011 from owncloud/jshint
...
Added .jshintrc
2014-02-04 12:11:32 -08:00
Vincent Petry
fe2a63ffd4
Scroll to the top after switching dir
...
Fixes #7061
2014-02-04 18:59:43 +01:00
Jan-Christoph Borchardt
0609f30d1c
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
...
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
icewind1991
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Jan-Christoph Borchardt
3692260174
Merge pull request #7055 from owncloud/ellipsize-modified-date
...
ellipsize long modified dates to make room for showing delete button
2014-02-03 15:57:00 -08:00
Jan-Christoph Borchardt
b56dbbe0e5
fix misalignment of modified dates, shift to right
2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt
6d7d3c16d0
ellipsize long modified dates to make room for showing delete button, fix #7040
2014-02-03 17:24:44 +01:00
Björn Schießle
9a0d7c5be4
Merge pull request #7014 from owncloud/fix_ocs_share_api
...
remove needless element tag from the ocs share api
2014-02-03 08:02:54 -08:00
Bjoern Schiessle
97921d0c25
add function to extract filename from sharekey name + tests
2014-02-03 13:39:05 +01:00
Bjoern Schiessle
fe5f512272
added tests for the delete hooks if the trash bin is disabled
2014-02-01 20:08:23 +01:00
Bjoern Schiessle
bef58f5361
don't expect OC_FilesystemView, this is depreciated
2014-01-31 20:39:52 +01:00
Bjoern Schiessle
4d1086c35f
better error detection and don't use glob()
2014-01-31 20:39:11 +01:00
Bjoern Schiessle
5610842e56
move unlink proxy to a hook which handles pre and post conditions
2014-01-31 20:38:35 +01:00
Georg Ehrke
1f30bffba3
Merge pull request #7017 from owncloud/trashpreview
...
Fixed image preview in trashbin subdirs
2014-01-31 07:29:08 -08:00
raghunayyar
5ccb395ec6
Makes Rename Icon Width 44px for touch sourfaces.
2014-01-31 12:33:00 +05:30
Vincent Petry
c5767b67b1
Fixed image preview in trashbin subdirs
2014-01-30 17:03:13 +01:00
Vincent Petry
d49c7ad4fb
Fixed double file encoding for previews
2014-01-30 16:34:37 +01:00
Georg Ehrke
c5742520e1
don't urldecode get var, php does this automatically
2014-01-30 16:32:45 +01:00
Pellaeon Lin
099b71c712
Merge branch 'master' into pr-exceed_upload_limit_msg
...
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Vincent Petry
ba1b9df8a9
Fixed file name validation unit test + added newline
...
- fixed file name validation unit test
- added "\n" as forbidden character in isFileNameValid()
2014-01-30 13:40:01 +01:00
Vincent Petry
d36a2ff9ee
Added .jshintrc
...
- Also fixes a few JSHint warnings in files app
- Added "global" comment on top of files app to suppress warning and
also inform devs about what globals are use
2014-01-30 13:40:01 +01:00
Bjoern Schiessle
f9d9a62e58
remove needless element tag
2014-01-30 13:34:41 +01:00
Vincent Petry
bc598f1919
Updated unit tests for rename action
...
- rename action is now checked inside of ".nametext" element
- added test to ensure that display() correctly resets all actions
including the rename one
2014-01-30 10:07:08 +01:00
raghunayyar
85e67be0aa
Rename action now appears as pencil icon
2014-01-30 10:07:08 +01:00
Jan-Christoph Borchardt
271088a7a2
Merge pull request #6777 from owncloud/mobile-style
...
Mobile style for public links: files, folders, picture sets
2014-01-29 09:17:02 -08:00
Jan-Christoph Borchardt
edea7781b7
make header scroll up for single shares, more view of content on small screens
2014-01-29 17:20:55 +01:00
Tigran Mkrtchyan
8cc9727520
mount: make location of mount.json configurable
...
do not share users data with config files
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
Thomas Müller
7655728ddf
- adding class to header div: share-folder or share-file
...
- for supported previews are shown with a size of 500px; icons with a size of 128px
2014-01-29 16:52:30 +01:00
Morris Jobke
afa00318bc
Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing
...
Added error message for when target folder was removed
2014-01-29 07:48:50 -08:00
Robin Appelman
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt
5a869732d1
adjust file type icon placement for when no preview can be generated
2014-01-29 15:28:57 +01:00
Pellaeon Lin
929c930b0a
Use $storageInfo['free']
2014-01-29 21:24:31 +08:00
Vincent Petry
58c7042e70
Added error message for when target folder was removed
...
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.
In the case of upload of multiple files, the upload is cancelled.
This situation can happen if the target folder was renamed or removed
from another browser window or client.
2014-01-29 12:46:11 +01:00
Björn Schießle
609d5f2458
Merge pull request #6987 from owncloud/share_api_and_encryption
...
[ocs share api] public upload is also possible with encryption enabled, since OC6
2014-01-29 02:50:25 -08:00
Jan-Christoph Borchardt
d310df505c
permanently show download action on mobile, only icon
2014-01-29 11:43:34 +01:00
Jan-Christoph Borchardt
8f81f007cd
fix horizontal scrollbar appearing when footer is too long, footer wraps now
2014-01-29 11:06:19 +01:00
Jan-Christoph Borchardt
13ed59c1cf
merge master into mobile-style
2014-01-29 10:55:44 +01:00
Vincent Petry
e6f93fc841
Fix warnings in logs when renaming over the web UI
...
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.
This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
2014-01-29 10:43:13 +01:00
Morris Jobke
cf2c061f1f
Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
...
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Bjoern Schiessle
cd4e044f66
public upload is also possible with encryption enabled, since OC6
2014-01-28 17:28:20 +01:00
Bjoern Schiessle
7f83f2a8f2
use more accurate error codes
2014-01-28 13:31:43 +01:00
VicDeo
0a77d41178
Merge pull request #6965 from owncloud/unused-free-space
...
Remove unused $freeSpace
2014-01-27 10:27:51 -08:00
Robin Appelman
b590f019f6
Remove unused $freeSpace
2014-01-27 16:51:32 +01:00
Thomas Müller
ab9ddda8f2
Merge pull request #6907 from owncloud/webdav-logexceptions
...
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman
3c1ab66eda
Reuse the calculated free_space in buildFileStorageStatistics
2014-01-27 15:56:57 +01:00
Morris Jobke
0a1708ba11
Merge pull request #6912 from owncloud/replace-webroot-in-css
...
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Vincent Petry
11ef12a106
Added exception logger plugin for sabre connector
...
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Jan-Christoph Borchardt
46745895ae
Merge pull request #5153 from owncloud/core-em-to-px
...
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt
6fbc73e673
Merge pull request #5152 from owncloud/files-em-to-px
...
Converts em to px values for styles in Files.
2014-01-27 02:28:01 -08:00
Björn Schießle
1d3da8b0ed
Merge pull request #6916 from owncloud/encryption_update_filecache
...
[encryption] update file cache after the file was written
2014-01-27 01:37:52 -08:00
raghunayyar
2a0e8329f9
Fixes settings.css and converts more styles.
2014-01-26 03:02:52 +05:30
raghunayyar
932e8f9f58
Fixes width of the dropdown menus as per computed styles.
2014-01-26 02:59:28 +05:30
Jan-Christoph Borchardt
c767ebcc03
fix multiselect bar being too short on big displays
2014-01-24 18:20:52 +01:00
Morris Jobke
dff2675efa
Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix
...
Fixed max upload size input field style
2014-01-24 07:05:50 -08:00
Björn Schießle
6875e3d9c7
Merge pull request #6921 from owncloud/trash_mimetype_size
...
increase size of mimetype column
2014-01-24 07:05:18 -08:00
Bjoern Schiessle
83878b9a7d
only update file cache with the unenecrypted size when the file was written
2014-01-24 16:01:00 +01:00
Pellaeon Lin
19675c2c9d
Fix variable name
2014-01-24 22:54:16 +08:00
Morris Jobke
1fe60e435e
Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
...
#6051 [ux][files] Move File Spinner
2014-01-24 06:53:53 -08:00
Vincent Petry
9f003a3546
Merge pull request #5954 from owncloud/extstorage-stream-sftp
...
[Ext storage] Now using SFTP stream wrapper from phpseclib
2014-01-24 06:20:23 -08:00
Vincent Petry
c6695bbd76
Fixed download URL in public page
...
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry
0671c58e36
Fixed filelist unit tests hidden params
...
Also added dummy table
2014-01-24 13:19:44 +01:00
Thomas Müller
9fa788c452
Merge pull request #6736 from owncloud/tests-jsunittests
...
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Vincent Petry
4734146580
Fixed max upload size input field style
...
Added "type=text" makes it look like nice like all other fields
2014-01-23 20:50:09 +01:00
Thomas Müller
617aa3cf29
Instead of 'No preview available for ...' we simple display the mieme-type icon
2014-01-23 20:15:10 +01:00
Bjoern Schiessle
28b6434f46
increase size of mimetype column
2014-01-23 18:28:59 +01:00
Jan-Christoph Borchardt
799e744ad7
remove background and width from multiselect bar, fix Download button not showing on mobile
2014-01-23 15:35:30 +01:00
Vincent Petry
bf95532fb6
Removed unused writeBack method
2014-01-23 15:05:05 +01:00
Jan-Christoph Borchardt
f0c9e8205f
remove %webroot from files_sharing app
2014-01-23 14:04:13 +01:00
Morris Jobke
4b7dfd34f8
fix conflicts and add missing closing tag
2014-01-23 13:51:51 +01:00
Jan-Christoph Borchardt
809fb8482d
remove %webroot% from files app
2014-01-23 13:11:08 +01:00
Vincent Petry
421f24868a
Now using SFTP stream wrapper from phpseclib
...
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
2014-01-23 12:43:12 +01:00
Björn Schießle
0daabe5b6a
Merge pull request #6898 from owncloud/encryption_infinite_loop
...
[encryption] infinite loop on sharing
2014-01-23 01:09:34 -08:00
Thomas Müller
ade726ad32
focus link text only on click in the input field - closes #6817
2014-01-23 01:08:42 +01:00
Thomas Müller
f950ce82ae
Merge branch 'master' into mobile-style
...
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Bjoern Schiessle
b489d6b0af
fix infinite loop if folder and subfolder has the same name
2014-01-22 17:15:01 +01:00
Bjoern Schiessle
eaed786eed
add path relative to the files folder of the currently logged in user to the output of getFolderContent()
2014-01-22 17:11:37 +01:00
Robin Appelman
02aa44d055
Merge branch 'master' into memcache-public
2014-01-22 13:19:49 +01:00
Björn Schießle
4474421ada
Merge pull request #6890 from owncloud/version_fix_array_order
...
[files_versions] fix array order
2014-01-22 02:52:30 -08:00
Morris Jobke
cf6e79cda8
Merge pull request #6719 from tripflex/fix_pubup_progbar
...
Fix public upload progress bar
2014-01-22 02:28:28 -08:00
Bjoern Schiessle
a567f74d86
fix array order
2014-01-22 11:13:15 +01:00
Bjoern Schiessle
8d36ddcf03
code clean-up
2014-01-22 11:10:32 +01:00
Bjoern Schiessle
0b89a45f11
fix size calculation of getAllVersions()
2014-01-22 11:10:23 +01:00
Thomas Müller
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
Thomas Müller
3b7fea25a3
Merge pull request #6863 from owncloud/versioning_expire_function_tests
...
Versioning expire function tests
2014-01-21 08:39:50 -08:00
Vincent Petry
91e66eeee1
Merge pull request #6868 from owncloud/enc-fixrandomfailunittest
...
Replaced time() with uniqid() to make sure the file name is unique
2014-01-21 08:35:41 -08:00
Vincent Petry
f09c19c316
Replaced time() with uniqid() to make sure the file name is unique
...
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)
This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
2014-01-21 16:31:58 +01:00
Bjoern Schiessle
85269641db
add first unit test for the versioning app
2014-01-21 16:22:08 +01:00
Bjoern Schiessle
9efd07fbab
isolate getExpireList function to make it testable
2014-01-21 16:22:08 +01:00
Thomas Müller
c57c9eae76
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 16:01:24 +01:00
Thomas Müller
262f221d11
Merge branch 'master' into fix-setupfs-only-for-existing-users-master
2014-01-21 15:35:32 +01:00
Thomas Müller
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
Jörn Friedrich Dreyer
21832bc890
user workarount to compare CLOB column with CHAR value
2014-01-21 11:56:34 +01:00
Thomas Müller
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
Thomas Müller
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
icewind1991
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
Vincent Petry
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
Myles McNamara
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
Thomas Müller
4ec6debe2b
remove unused variable
2014-01-20 17:27:03 +01:00
Vincent Petry
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
Robin Appelman
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
Morris Jobke
f88360eba3
Merge pull request #6827 from rnveach/fix_6730
...
Fix 6730
2014-01-20 01:44:34 -08:00
Vincent Petry
f354717c4c
Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix
...
Fixed isPreviewAvailable warnings in log
2014-01-19 04:48:12 -08:00
kondou
fea1cc82e8
Keep the EOF-Newline
2014-01-18 17:51:41 +01:00
raghunayyar
9edbd142a2
Removes Bogus Styles.
2014-01-18 00:46:06 +05:30
rnveach
a41440436c
added trigger to redo selection text on a directory change
2014-01-17 11:49:00 -05:00
rnveach
90a41ef26a
fixed selector string and removed all checkbox if it was selected
2014-01-17 11:46:44 -05:00
Morris Jobke
f0a5007e9a
fix input element closing tag
2014-01-17 16:32:01 +01:00
Jan-Christoph Borchardt
b291fb9cd7
make sure there's enough room for the file actions
2014-01-17 15:47:26 +01:00
Bjoern Schiessle
1df6bf997a
add link to documentation
2014-01-17 14:56:15 +01:00
Robin Appelman
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
Robin Appelman
299bb4d99d
remove more is_array from encryption
2014-01-17 14:38:14 +01:00
Vincent Petry
f4c198b907
Fixed isPreviewAvailable warnings in log
...
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.
Fixes #6423
2014-01-17 14:22:05 +01:00
Vincent Petry
21d32d8a9e
Merge pull request #6810 from kofemann/for-upstream
...
webdav: return SPACE_UNKNOWN if server do not support quota
2014-01-17 04:09:53 -08:00
Robin Appelman
ec7c339930
Don't use is_array on FileInfo
2014-01-17 12:56:17 +01:00
Vincent Petry
4d4bbbda3a
Merge pull request #6807 from owncloud/enc_updated_description
...
updated description of the files encryption app
2014-01-17 03:54:09 -08:00
Tigran Mkrtchyan
a78dc11732
webdav: return SPACE_UNKNOWN if server do not support quota
...
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-17 11:45:26 +01:00
Bjoern Schiessle
6b69c52037
updated description of the files encryption app
2014-01-17 11:08:49 +01:00
Pellaeon Lin
4726a2021b
Add $freeSpace and $uploadLimit to files_sharing
2014-01-17 17:10:42 +08:00
raghunayyar
4f593f99b6
Removes Bogus classes from previous commits.
2014-01-16 23:35:30 +05:30
Vincent Petry
350214c609
Added Javascript unit tests
...
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
raghunayyar
12e5d0f68d
Fixes typos, adds ; wherever not present.
2014-01-16 21:06:14 +05:30
raghunayyar
b7b83377c5
Fixes header going down in trash bin app.
2014-01-16 21:00:57 +05:30
Jan-Christoph Borchardt
d463edaf09
on mobile, show single shared image at full width without margin
2014-01-16 15:56:18 +01:00
Jan-Christoph Borchardt
5cdab5fff3
show publicly shared image on full width, without margin
2014-01-16 15:32:23 +01:00
Jan-Christoph Borchardt
c0590676a0
fix public share download button width
2014-01-16 15:28:39 +01:00
Morris Jobke
16033c8123
Merge pull request #6264 from owncloud/files-draggabledestroy
...
Fix to not destroy draggable when no draggable was set
2014-01-16 05:52:43 -08:00
Pellaeon Lin
6ec50e4b0c
Comments to clarify
2014-01-16 19:48:46 +08:00
Vincent Petry
2233aa2a04
Fixed files row height in Firefox/KDE
...
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.
This fix makes the checkbox absolute to prevent it to influence the row
height.
2014-01-16 12:05:05 +01:00
Pellaeon Lin
cd6ab29313
Use t() 's native method
2014-01-16 17:51:00 +08:00
raghunayyar
fd49d3c5c5
Fixes typo in versions.css
2014-01-16 14:45:23 +05:30
raghunayyar
775e08e0ee
Merge branch 'master' into core-em-to-px
...
Conflicts:
apps/files_sharing/css/public.css
apps/user_ldap/css/settings.css
core/css/multiselect.css
core/css/share.css
2014-01-16 14:42:37 +05:30
raghunayyar
f975fd5499
Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase
2014-01-16 14:23:39 +05:30
Myles McNamara
62040fe2d2
change em to px
2014-01-15 17:06:48 -05:00
Vincent Petry
bd643c47f3
Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix
...
Fixed Dropbox/Google storage async save call
2014-01-15 07:41:01 -08:00
Björn Schießle
5163e648f8
Merge pull request #6780 from owncloud/trash_bin_copy_recursively
...
copy files to owners trash recursively
2014-01-15 06:57:33 -08:00
Jan-Christoph Borchardt
3e7cf4110d
tweak color and position of username in public share
2014-01-15 15:49:42 +01:00
Jan-Christoph Borchardt
db837bf696
improvements to public files mobile view
2014-01-15 15:48:42 +01:00
Thomas Müller
50ae2ab14c
add download button on single file share page
2014-01-15 15:31:27 +01:00
Thomas Müller
b3a6683784
remove unused js code and css rules
2014-01-15 15:22:40 +01:00
Thomas Müller
ce231c406d
no new menu on public upload
2014-01-15 15:07:52 +01:00
Thomas Müller
6c76b4ba12
fixing preview generation
2014-01-15 15:07:24 +01:00
Thomas Müller
807b885a0e
reuse file upload as used within files app - remove public upload button
2014-01-15 14:36:18 +01:00
Bjoern Schiessle
592ae16603
remove old code
2014-01-15 14:35:17 +01:00
Bjoern Schiessle
f4179a3f5a
don't try to encrypt/decrypt cache chunks or files in the trash bin
2014-01-15 14:29:33 +01:00
Bjoern Schiessle
f11f65c6a5
copy files to owner trash recursively
2014-01-15 14:27:23 +01:00
Robin Appelman
d279ddd9a2
Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder
2014-01-15 13:36:14 +01:00
Robin Appelman
729210daa0
Merge branch 'master' into memcache-public
...
Conflicts:
apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
Bjoern Schiessle
76fa7bab63
call getFileInfo to enforce a file cache entry for the new version, fix #6286
2014-01-15 11:37:47 +01:00
raghunayyar
d8eac2b9bc
Merge branch 'master' into files-em-to-px
...
Conflicts:
apps/files/css/files.css
2014-01-15 14:59:50 +05:30
Pellaeon Lin
dbbbfee7de
Fix namespace
2014-01-15 12:36:27 +08:00
Jan-Christoph Borchardt
072ef7f010
remove min-width rule to fix mobile views
2014-01-14 22:14:46 +01:00
Jan-Christoph Borchardt
2bdd014f83
first mobile style rules, hide extra columns in files view and scroll header
2014-01-14 22:14:06 +01:00
Vincent Petry
8135828b2e
Fix to not destroy draggable when no draggable was set
...
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.
Fixes #6254
2014-01-14 19:17:23 +01:00
Arthur Schiwon
25fecb4f25
typo, grammar
2014-01-14 16:33:18 +01:00
Arthur Schiwon
097b6b8be9
LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page
2014-01-14 16:33:09 +01:00
Arthur Schiwon
bb6bad6b3c
remove unused variables
2014-01-14 16:33:02 +01:00
Arthur Schiwon
e4b7c6ef10
LDAP: fix TLS detection
2014-01-14 16:32:55 +01:00
Vincent Petry
ab21c25e38
Merge pull request #6759 from owncloud/extstorage-smbtimezonefix
...
Fixed timezone issue with SMB storage
2014-01-14 06:03:24 -08:00
Bjoern Schiessle
fa7f53e89d
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 13:38:41 +01:00
Andreas Fischer
cb071a9f35
Merge pull request #6755 from owncloud/remove-ru_RU-master
...
remove ru_RU - it has bee removed from transifex
* owncloud/remove-ru_RU-master:
remove ru_RU - it has bee removed from transifex
2014-01-14 00:44:34 +01:00
Vincent Petry
1eb5ebd58c
Fixed timezone issue with SMB storage
...
Now forcing smbclient to also run on UTC
2014-01-14 00:37:57 +01:00
Bjoern Schiessle
d1b47021f1
don't unshare on delete
2014-01-13 16:49:16 +01:00
Thomas Müller
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
Vincent Petry
5e04b7f284
Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
...
Fixing Issue #6301 on master branch
2014-01-13 07:09:01 -08:00
Myles McNamara
97be32e2e8
modify js to move upload wrapper, modify css to match core values
2014-01-10 14:07:20 -05:00
Myles McNamara
9ebffd6635
remove extra upload controls
2014-01-10 14:03:55 -05:00
Myles McNamara
0802b662be
fix upload button layout
2014-01-10 12:20:31 -05:00
Vincent Petry
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
Vincent Petry
b24c21b00f
Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
...
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
Robin Appelman
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
Robin Appelman
d50c7391d8
Use $server->getMemCacheFactory() in ldap connection
2014-01-09 13:54:50 +01:00
blizzz
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Vincent Petry
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
Arthur Schiwon
677d83d45f
LDAP: add tests for countUsers
2014-01-08 12:24:29 +01:00
Arthur Schiwon
53498bc876
remove unnecessary line
2014-01-08 12:20:56 +01:00
Arthur Schiwon
b669e1a3c1
LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search.
2014-01-08 12:07:57 +01:00
Thomas Müller
a8d20e0919
Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
...
Added ownCloud backend for external storage
2014-01-08 01:49:15 -08:00
Jenkins for ownCloud
6be2dee5bc
[tx-robot] updated from transifex
2014-01-08 01:55:41 -05:00
Thomas Müller
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Jenkins for ownCloud
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
0e843b9d7d
[tx-robot] updated from transifex
2014-01-06 01:55:59 -05:00
Thomas Müller
e2d739fa21
Merge pull request #6580 from monreal/master
...
Silence output of 'which' command used in smbclient detection
2014-01-05 04:32:30 -08:00
Jenkins for ownCloud
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
aaa48576ee
[tx-robot] updated from transifex
2014-01-04 01:55:57 -05:00
Jenkins for ownCloud
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
Jenkins for ownCloud
760fa9ea30
[tx-robot] updated from transifex
2013-12-31 01:55:42 -05:00
Jenkins for ownCloud
9ea9638490
[tx-robot] updated from transifex
2013-12-30 01:55:38 -05:00
Jenkins for ownCloud
e345f3f511
[tx-robot] updated from transifex
2013-12-29 01:55:36 -05:00
Jenkins for ownCloud
71c829f92a
[tx-robot] updated from transifex
2013-12-28 01:55:35 -05:00
Michael Monreal
f52a9e5e42
Silence output of 'which' command used in smbclient detection
2013-12-27 18:10:47 +01:00
Jenkins for ownCloud
64a001edab
[tx-robot] updated from transifex
2013-12-27 01:55:35 -05:00
Jenkins for ownCloud
dbfe313a63
[tx-robot] updated from transifex
2013-12-25 01:55:35 -05:00
Thomas Müller
6523960de9
Merge pull request #6554 from owncloud/fix_5982
...
fix preview for reshared file
2013-12-24 04:03:20 -08:00
Jenkins for ownCloud
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
Georg Ehrke
c90e3e4f5b
fix preview for reshared file
2013-12-22 20:27:38 +01:00
Jenkins for ownCloud
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
Jenkins for ownCloud
cd26631a6d
[tx-robot] updated from transifex
2013-12-21 01:56:13 -05:00
Jenkins for ownCloud
371a476eb5
[tx-robot] updated from transifex
2013-12-20 01:57:49 -05:00
Björn Schießle
6a3e38266f
Merge pull request #6507 from owncloud/enc_fix_getUser
...
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
Bjoern Schiessle
517a55a437
tests added
2013-12-19 19:43:57 +01:00
Björn Schießle
f0da7b20c1
Merge pull request #6517 from owncloud/fix_6510
...
[encryption] fix rename of shared files
2013-12-19 10:19:09 -08:00
Bjoern Schiessle
552d0a6feb
check if the old owner and the old path is available
2013-12-19 18:40:40 +01:00
Bjoern Schiessle
165542f27d
fix rename of shared files
2013-12-19 17:29:38 +01:00
Vincent Petry
06dec2632f
Merge pull request #6512 from owncloud/master-failingoracletests
...
Removed numRows usage from encryption app
2013-12-19 08:22:44 -08:00
Björn Schießle
079f1a6f41
Merge pull request #6495 from owncloud/enc_fseek_fallback
...
Added fseek fallback to the encryption app
2013-12-19 07:09:07 -08:00
Bjoern Schiessle
fe7fb66ef8
we can also have a path user/cache/...
2013-12-19 15:58:10 +01:00