797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
d18b9f6ea4
use a FileInfo object of the directory when generting the filelist
2014-02-18 15:39:35 +01:00
323cc1166b
Merge pull request #7235 from DavidVentura/master
...
small change for compatibility
2014-02-17 21:16:39 +01:00
5a80339b51
Merge pull request #7211 from mattcaron/master
...
Fit shared videos to viewer, just like images. Issue #1648
2014-02-17 20:59:29 +01:00
aa1a50f5b3
Consolidate two sections, per code review. Issue #1648
2014-02-17 12:57:54 -05:00
94b3296a71
Trashbin select all now doesn't send file list
...
- Fixed "delete" and "restore" actions to not send the file list when
all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
value based on the current dir
2014-02-17 18:34:59 +01:00
a282afcbbb
small change for compatibility
2014-02-17 13:27:07 -03:00
54f9db403f
LDAP: improve wizard strings, fixes #5567
2014-02-17 17:19:48 +01:00
6778dc5a4a
don't block login forever if we are stuck in the middle of the initial encryption
2014-02-17 10:03:57 +01:00
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
2ab062193a
catch errors during initial encryption
2014-02-17 09:58:46 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
2887fb1f48
Fit shared videos to viewer, just like images. Issue #1648
2014-02-14 16:09:51 -05:00
2933668355
fileinfo is no longer a array
2014-02-14 18:05:59 +01:00
d88c6778ff
LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons
2014-02-14 15:34:22 +01:00
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
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
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
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
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
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
01dc7c5482
Gets the page title from oc_defaults in Files app
2014-02-13 10:48:01 +01:00
6e17d71a0d
remove forced lowercase from extension, fix #4747 , also coding style fixes
2014-02-13 10:39:38 +01:00
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
658af627ce
External FTP Storage should request hostname instead of URL
...
Fix issue #6277
2014-02-12 18:20:10 +01:00
d10f6e94dc
fix coding style to blizzz happy.. ;-)
2014-02-12 16:56:17 +01:00
9619459e37
Send correct path on file upload when using public app
...
Fix issue #7152
2014-02-12 15:49:09 +01:00
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
1fb5f96c37
Style fixes
2014-02-12 09:09:51 +01:00
a62b393d02
Update page title when navigating through directories
2014-02-12 00:54:35 +01:00
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
14d1abf63f
LDAP: improve debug message
2014-02-10 14:45:37 +01:00
18e1a10e96
LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image
2014-02-10 14:45:31 +01:00
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
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
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
299d37154b
LDAP: add documentation info in info.xml
2014-02-10 12:59:11 +01:00
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
e156f85bfb
Rephrase and clarify log message
2014-02-10 11:29:08 +01:00
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
e825a008c9
Wizard: disable LDAP referrals, fixes #6670
2014-02-10 11:28:55 +01:00
a908bd5695
throw an info message, when base dn test failed
2014-02-10 11:28:46 +01:00
bc17b40650
LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard
2014-02-10 11:28:38 +01:00
050e84a08f
refuse login as long as the initial encryption is running
2014-02-10 10:56:11 +01:00
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
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
828985dc60
Make google drive client secret and dropbox api secret a password field
...
Fix issue #5794
2014-02-07 18:12:01 +01:00
91254c304d
name users after test
2014-02-07 18:07:38 +01:00
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
af7366cd30
Only add files to file list when uploading to current directory
...
Fix Issue #6683
2014-02-07 13:06:50 +01:00
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
aff1cafaca
Merge pull request #7089 from owncloud/sharing-searchbymime
...
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
946fccc0dd
Remove unused template variable assignment of files_sharing/template/public.php
2014-02-06 12:26:36 +08:00
8c56e21ced
Move template variable assignment to correct place
2014-02-06 12:06:16 +08:00
b0692af29a
Merge pull request #7064 from owncloud/files-scrolltopafterupdate
...
Scroll to the top after switching dir
2014-02-05 16:13:55 +01:00
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
1e79369338
merge master into storagestatistics-reuse
2014-02-05 13:36:55 +01:00
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
9d9f360b77
Load authentication apps to get users from all backends - fixes #7019
2014-02-05 12:54:31 +01:00
6d3b61f388
Merge pull request #7011 from owncloud/jshint
...
Added .jshintrc
2014-02-04 12:11:32 -08:00
fe2a63ffd4
Scroll to the top after switching dir
...
Fixes #7061
2014-02-04 18:59:43 +01:00
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
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
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
b56dbbe0e5
fix misalignment of modified dates, shift to right
2014-02-03 17:26:49 +01:00
6d7d3c16d0
ellipsize long modified dates to make room for showing delete button, fix #7040
2014-02-03 17:24:44 +01:00
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
97921d0c25
add function to extract filename from sharekey name + tests
2014-02-03 13:39:05 +01:00
fe5f512272
added tests for the delete hooks if the trash bin is disabled
2014-02-01 20:08:23 +01:00
bef58f5361
don't expect OC_FilesystemView, this is depreciated
2014-01-31 20:39:52 +01:00
4d1086c35f
better error detection and don't use glob()
2014-01-31 20:39:11 +01:00
5610842e56
move unlink proxy to a hook which handles pre and post conditions
2014-01-31 20:38:35 +01:00
1f30bffba3
Merge pull request #7017 from owncloud/trashpreview
...
Fixed image preview in trashbin subdirs
2014-01-31 07:29:08 -08:00
5ccb395ec6
Makes Rename Icon Width 44px for touch sourfaces.
2014-01-31 12:33:00 +05:30
c5767b67b1
Fixed image preview in trashbin subdirs
2014-01-30 17:03:13 +01:00
d49c7ad4fb
Fixed double file encoding for previews
2014-01-30 16:34:37 +01:00
c5742520e1
don't urldecode get var, php does this automatically
2014-01-30 16:32:45 +01:00
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
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
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
f9d9a62e58
remove needless element tag
2014-01-30 13:34:41 +01:00
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
85e67be0aa
Rename action now appears as pencil icon
2014-01-30 10:07:08 +01:00
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
edea7781b7
make header scroll up for single shares, more view of content on small screens
2014-01-29 17:20:55 +01:00
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
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
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
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
5a869732d1
adjust file type icon placement for when no preview can be generated
2014-01-29 15:28:57 +01:00
929c930b0a
Use $storageInfo['free']
2014-01-29 21:24:31 +08:00
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
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
d310df505c
permanently show download action on mobile, only icon
2014-01-29 11:43:34 +01:00
8f81f007cd
fix horizontal scrollbar appearing when footer is too long, footer wraps now
2014-01-29 11:06:19 +01:00
13ed59c1cf
merge master into mobile-style
2014-01-29 10:55:44 +01:00
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
cf2c061f1f
Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
...
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Vincent Petry
Lukas Reschke
Robin Appelman
Jan-Christoph Borchardt
Matthew Caron
David
Arthur Schiwon
Bjoern Schiessle
Thomas Müller
icewind1991
Guillaume AMAT
Joas Schilling
root
Bart Visscher
Morris Jobke
Jörn Friedrich Dreyer
Pellaeon Lin
Georg Ehrke
raghunayyar
Tigran Mkrtchyan