Thomas Müller
|
c56542c58d
|
Merge pull request #1771 from owncloud/mountconfig
JSON mount config: no pretty print
|
2013-02-18 22:15:56 -08:00 |
|
Thomas Mueller
|
0e9b9f4f5f
|
no pretty print
|
2013-02-19 00:48:38 +01:00 |
|
Jenkins for ownCloud
|
76c4dc6296
|
[tx-robot] updated from transifex
|
2013-02-19 00:06:51 +01:00 |
|
Thomas Müller
|
d9035d4fdc
|
Merge pull request #1728 from owncloud/mountconfig
Use json for new mount configuration files
|
2013-02-18 14:56:25 -08:00 |
|
Thomas Müller
|
0ab87204ec
|
Merge pull request #1759 from owncloud/redirect_fix_1737
fix redirect, use the new routing
|
2013-02-18 07:13:19 -08:00 |
Robin Appelman
|
3bf9aa408e
|
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
|
2013-02-18 15:13:25 +01:00 |
|
Robin Appelman
|
2bbb57e429
|
merge master into mountconfig
|
2013-02-18 15:12:15 +01:00 |
Björn Schießle
|
4a3374ecf8
|
fix redirect, use the new routing
|
2013-02-18 14:38:29 +01:00 |
Lukas Reschke
|
79284b8e57
|
Sanitize HTML
|
2013-02-18 08:11:59 +01:00 |
|
Thomas Müller
|
8e76a98d2f
|
Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
|
2013-02-17 11:53:51 -08:00 |
|
Thomas Mueller
|
325746ae45
|
Merge branch 'master' into fix-googledrive
|
2013-02-17 09:41:37 +01:00 |
|
Lukas Reschke
|
4708d4549d
|
Add missing requesttoken
This is a trivial fix for a regression caused by #1648
|
2013-02-16 13:28:49 +01:00 |
Jörn Friedrich Dreyer
|
cad65915a7
|
look where you are typing ...
|
2013-02-16 12:55:36 +01:00 |
|
Jörn Friedrich Dreyer
|
e1700c28fa
|
pretty print json
|
2013-02-16 12:10:54 +01:00 |
|
Robin Appelman
|
6da2c6c83e
|
Create new mountconfig files in json
|
2013-02-16 01:50:40 +01:00 |
|
Robin Appelman
|
46626915ef
|
Use a parser to read custom mount configuration instead of including the php files
|
2013-02-16 01:30:44 +01:00 |
Bart Visscher
|
6c197227d0
|
Join split translated strings
|
2013-02-15 15:58:52 +01:00 |
|
Bart Visscher
|
5616690506
|
Style cleanup files_external
|
2013-02-15 15:58:52 +01:00 |
|
Jenkins for ownCloud
|
b169073169
|
[tx-robot] updated from transifex
|
2013-02-15 00:06:50 +01:00 |
|
Bart Visscher
|
9058d398a7
|
Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
|
2013-02-14 12:54:36 -08:00 |
|
Thomas Mueller
|
6a250c877f
|
fixing javascript errors IE8 in personal settings
|
2013-02-14 16:10:52 +01:00 |
|
Bart Visscher
|
cd35d257bb
|
Fix NoSpaceAfterComma and SpaceBeforeComma
|
2013-02-14 08:36:26 +01:00 |
|
Bart Visscher
|
5c4a804ddb
|
Fix SpaceBeforeOpenBrace errors
|
2013-02-14 08:36:26 +01:00 |
Michael Gapczynski
|
808a13922c
|
Remove the leading slash from the filename for opendir
|
2013-02-11 17:55:44 -05:00 |
|
Jenkins for ownCloud
|
39d19a9274
|
[tx-robot] updated from transifex
|
2013-02-11 15:42:41 +01:00 |
|
Thomas Mueller
|
318c0b3408
|
user name and password need to be encoded as well
fixes #1652
|
2013-02-12 15:56:31 +01:00 |
|
Jenkins for ownCloud
|
8d9352a40d
|
[tx-robot] updated from transifex
|
2013-02-12 15:12:46 +01:00 |
|
Lukas Reschke
|
a9c77ebaf8
|
Check requesttoken
|
2013-02-12 11:35:16 +01:00 |
Frank Karlitschek
|
2507e0da1d
|
Merge pull request #1636 from owncloud/fixing-smb-master
Fixing smb master
|
2013-02-11 23:38:03 -08:00 |
|
Thomas Mueller
|
0c1174770d
|
use urlencode not rawurlencode
|
2013-02-11 21:25:29 +01:00 |
|
Thomas Mueller
|
392be78162
|
the path must be encoded because within the smb4pph code it's decoded again - pretty easy but still .....
|
2013-02-11 20:32:44 +01:00 |
|
Thomas Mueller
|
7776d047b2
|
[files_external] fix config gui for all users
backport of 9e05781ec2
|
2013-02-11 15:49:49 +01:00 |
|
Thomas Mueller
|
f512dea3be
|
[files_external] fixing some undefined index
|
2013-02-11 15:45:10 +01:00 |
|
Thomas Mueller
|
89bc26210a
|
[files_external] removing function as it's the same in the base class - THX Robin
Conflicts:
apps/files_external/lib/smb.php
|
2013-02-11 15:44:35 +01:00 |
|
Lukas Reschke
|
980c197fbf
|
Merge pull request #1594 from hkjolhede/master
Corrected namespace path for files_external SFTP backend
|
2013-02-10 06:47:22 -08:00 |
hkjolhede
|
513bf0b999
|
Update apps/files_external/lib/config.php
Corrected minor error
|
2013-02-10 15:37:05 +01:00 |
|
Lukas Reschke
|
6f785e211b
|
Merge pull request #1030 from hkjolhede/master
SFTP support in files_external app
|
2013-02-10 05:06:00 -08:00 |
|
Henrik Kjölhede
|
421bacc33a
|
Final changes from icewind1991
|
2013-02-10 13:11:29 +01:00 |
|
Henrik Kjölhede
|
1df8a5a774
|
Updated phpseclib from git + requested style changes
|
2013-02-10 12:35:49 +01:00 |
|
Robin Appelman
|
b44c18d164
|
Don't run external storage tests on default
|
2013-02-10 11:39:32 +01:00 |
|
Jenkins for ownCloud
|
f7d898d835
|
[tx-robot] updated from transifex
|
2013-02-10 00:10:29 +01:00 |
|
Henrik Kjölhede
|
c6622301e5
|
Security bug
|
2013-02-09 23:49:21 +01:00 |
|
Henrik Kjölhede
|
bcf98879cb
|
Just a little cleaner in touch
|
2013-02-09 23:33:01 +01:00 |
|
Henrik Kjölhede
|
9e42a36fd8
|
Update to touch
|
2013-02-09 23:29:58 +01:00 |
|
Henrik Kjölhede
|
674955d1b6
|
Spelling mistake
|
2013-02-09 20:35:48 +01:00 |
|
Henrik Kjölhede
|
71d3903cfd
|
Added unittest
|
2013-02-09 20:34:21 +01:00 |
|
Henrik Kjölhede
|
96cfe37587
|
Update to conform to API changes
|
2013-02-09 19:08:39 +01:00 |
|
Henrik Kjölhede
|
3b029d551c
|
corrected namespace
|
2013-02-09 15:57:33 +01:00 |
|
Henrik Kjölhede
|
81a281a140
|
Modified to new class structure
|
2013-02-09 14:12:17 +01:00 |
|
Henrik Kjölhede
|
2b4823d62d
|
Deleted phpseclib/tests
|
2013-02-09 14:07:18 +01:00 |