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
Jens-Christian Fischer
0f6c607171
added function documentation
2014-01-24 14:22:42 +01:00
Jens-Christian Fischer
506393090b
Add 'mail_from_address' configuration
...
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.
This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01: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
Vincent Petry
41b6d4b702
Added OC.buidQueryString() utility function
...
Makes it possible to create query strings by passing a JavaScript hash
map and automatically encodes the keys and values.
2014-01-24 12:44:31 +01:00
Bjoern Schiessle
6bb27ea76b
disable button and input field during decryption
2014-01-24 12:15:06 +01:00
Bjoern Schiessle
2a3cb7ac5b
remove the form, it isn't needed here
2014-01-24 11:41:24 +01:00
Bjoern Schiessle
77de47858b
add expire date to link share if possible
2014-01-24 10:46:08 +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
Thomas Müller
269f24cf96
remove css files from rewrite rule - there is no need to rewrite css any more
2014-01-23 21:28:19 +01: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
Vincent Petry
5ad28f4d1f
Allow getting info or renaming part files through WebDAV
...
When mounting an ownCloud (backend OC) inside another ownCloud (frontend
OC), the frontend OC will use WebDAV to upload file, which will create
part files. These part files need to be accessible for the frontend OC
to rename them to the actual file name.
This fix leaves the file cache untouched but gives direct access to part
file info when requested.
This means that part file can be accessed only when their path and name
are known. These won't appear in file listtings.
Fixes #6068
2014-01-23 18:42:56 +01:00
Bjoern Schiessle
28b6434f46
increase size of mimetype column
2014-01-23 18:28:59 +01:00
Jan-Christoph Borchardt
5956277ed4
Merge pull request #6234 from owncloud/change-email-by-enter
...
change mail address by pressing enter - fixes #6179
2014-01-23 08:03:22 -08: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
Jan-Christoph Borchardt
25e9b7a742
add icons.css file, first step to get rid of %webroot%
2014-01-23 12:55:39 +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
Andreas Fischer
96f194c0f6
Add icons for mdb and accdb files.
2014-01-23 03:06:14 +01:00
Andreas Fischer
47ea7704ca
Fix icons for xml,ppt,dot,dotx files.
2014-01-23 02:46:05 +01:00
Andreas Fischer
689516ebd7
Remove duplicate mimetypes while keeping previous behaviour.
2014-01-23 02:23:20 +01:00
Andreas Fischer
6241655df4
Bring mimetype list into alphabetical order.
2014-01-23 02:15:42 +01: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
Robin Appelman
b578a3359e
revert accidental 3rdparty commit
2014-01-22 13:19:39 +01:00
Robin Appelman
5a5b6f187e
Use Cache->clear to cleanup the filecache for removed users
2014-01-22 13:00:45 +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
Robin Appelman
374e3475c9
Also remove the user's home storage from the storage table when deleting a user
2014-01-21 23:58:48 +01:00
Vincent Petry
9851727b0d
Merge pull request #6856 from owncloud/fixing-gallery-password-protected-access-master
...
adding password protection check to getShareByToken()
2014-01-21 11:08:58 -08: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
Jörn Friedrich Dreyer
0dd54a1250
Merge pull request #6844 from owncloud/fix-css-loading-master
...
Revert "use getAppWebPath() in here as well"
2014-01-21 08:31:22 -08:00
Thomas Müller
3a17220c9f
Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-master
...
OC_Util::setupFS($user) will create a data dir for the given string - no...
2014-01-21 07:36:30 -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