wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12545 commits 157 branches 562 tags 714 MiB
Commit graph

514 commits

Author SHA1 Message Date
Lukas Reschke
6552996734 Set file perms to 0640 of mount.json - fixes #2718 2013-04-06 13:21:21 +03:00
Jenkins for ownCloud
c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Jenkins for ownCloud
10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Jenkins for ownCloud
cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
Jenkins for ownCloud
5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Arthur Schiwon
599778b153 Files External: show display names instead of internal user names in Settings UI 2013-03-27 19:07:33 +01:00
Jenkins for ownCloud
0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Jenkins for ownCloud
63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Jenkins for ownCloud
63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Jenkins for ownCloud
1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
sherbrecher
ec45a8433d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/files_external/templates/settings.php
 2013-03-15 17:50:02 +01:00
sherbrecher
d2b3a9fb3b Update settings.php 
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
 2013-03-15 15:09:55 +01:00
Jenkins for ownCloud
9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud
f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Jenkins for ownCloud
569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Robin Appelman
be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Jenkins for ownCloud
308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Jenkins for ownCloud
97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Jenkins for ownCloud
c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Bernhard Posselt
10b108ed8a Merge pull request #2030 from j-ed/master 
suppress log messages like `include path for class ... starts with "apps/"`
 2013-03-04 12:59:39 -08:00
Jenkins for ownCloud
844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Lukas Reschke
d3e88e6a8c Remove uneeded sanitizeHTML 2013-03-02 12:44:53 +01:00
j-ed
2aaf38b5d3 Update app.php 
suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
 2013-03-02 12:12:33 +01:00
Jenkins for ownCloud
c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke
5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Jenkins for ownCloud
d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Jenkins for ownCloud
a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke
236507a19f [files_external] From echo to p 2013-02-27 21:31:27 +01:00
Michael Gapczynski
766a301a6b Merge pull request #1031 from owncloud/external_storage_ui_feedback 
External Storage UI Improvements
 2013-02-27 10:00:22 -08:00
Jenkins for ownCloud
fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Michael Gapczynski
f26c477433 Merge pull request #1949 from owncloud/fix-dropbox 
Fix undefined root parameter in Dropbox storage
 2013-02-26 16:14:45 -08:00
Jenkins for ownCloud
348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Michael Gapczynski
25cf18f614 Fix undefined root parameter in Dropbox storage 2013-02-26 17:52:06 -05:00
Björn Schießle
8c9d0d1f5b cleanPath needs to be public 2013-02-26 12:24:52 +01:00
Michael Gapczynski
5b50bc8c0a Fix Dropbox and Google ui 2013-02-25 19:45:01 -05:00
Michael Gapczynski
4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Robin Appelman
4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Jenkins for ownCloud
734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Jörn Friedrich Dreyer
05a8766cbc attach on() events to external storage table, dom events in the table will always bubble up here 2013-02-20 12:06:08 +01:00
Michael Gapczynski
702c27b0e6 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/settings.js
	apps/files_external/lib/smb.php
	apps/files_external/templates/settings.php
	lib/files/storage/common.php
 2013-02-19 19:12:14 -05:00
Frank Karlitschek
3878203679 Merge pull request #1731 from owncloud/unknown-freespace 
Give storage backends the option to define having no known free space
 2013-02-19 15:18:12 -08:00
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
d96146a017 Give storage backends the option to define having no known free space 
When this is the case only the configured max upload size is taking into account for uploading
 2013-02-16 03:27:50 +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
Thomas Mueller
037c3ee4ec fixing issues with UTF8 characters in translatable strings 2013-02-13 00:23:37 +01:00
Thomas Mueller
010c4c2891 adding spinner while talking to the backend 2013-02-12 23:27:31 +01:00
Thomas Mueller
a814361ca7 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 23:01:54 +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
Thomas Mueller
6b594c1eb8 fixing namespace 2013-02-12 11:05:12 +01:00
Thomas Mueller
a953786d79 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 11:01:14 +01:00
Thomas Mueller
646d60ee83 fixing namespace 2013-02-12 11:00:38 +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
Michael Gapczynski
ad6e133ca6 Replace another mount point placeholder 2013-02-11 20:35:40 -05:00
Michael Gapczynski
6eba790a75 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php
 2013-02-11 20:27:05 -05:00
Michael Gapczynski
6f08b1f829 Change wordings 2013-02-11 18:04:54 -05:00
Michael Gapczynski
808a13922c Remove the leading slash from the filename for opendir 2013-02-11 17:55:44 -05: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
Jenkins for ownCloud
39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +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
Henrik Kjölhede
41fa65e7be Merge branch 'master' of https://github.com/owncloud/core 
Conflicts:
	apps/files_external/appinfo/app.php
 2013-02-09 14:05:33 +01:00
Jenkins for ownCloud
98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Müller
04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on 
replace live() with on() in core js
 2013-02-03 21:55:54 -08:00
Jenkins for ownCloud
da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Jenkins for ownCloud
2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Thomas Mueller
b1da1db0eb Merge branch 'master' into from_live_to_on 
Conflicts:
	apps/files_external/js/google.js
 2013-01-31 23:34:12 +01:00
Jenkins for ownCloud
209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Robin Appelman
54d46fe43c remove outdated line 2013-01-31 15:00:48 +01:00
Jenkins for ownCloud
00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Jörn Friedrich Dreyer
22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Robin Appelman
7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Robin Appelman
bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Henrik Kjölhede
b1b2eafa50 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/files_external/lib/config.php
 2013-01-26 21:51:18 +01:00
hkjolhede
a26d50640f Update apps/files_external/lib/sftp.php 
Added cleaning the root path
 2013-01-26 19:46:23 +01:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Thomas Mueller
ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Jenkins for ownCloud
c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Michael Gapczynski
e666ce3622 Fix external storage UI for new storage namespaces 2013-01-21 23:57:26 -05:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Jenkins for ownCloud
d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Michael Gapczynski
464dafd7d2 Make Google Drive storage id unique, before it was anonymousanonymous 2013-01-09 22:17:39 -05:00
Michael Gapczynski
fbcf62389c Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/lib/webdav.php
 2013-01-09 21:49:21 -05:00
Michael Gapczynski
78043d73e8 Set status to waiting for Dropbox and Google Drive while authenticating 2013-01-09 21:47:24 -05:00
Jenkins for ownCloud
912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Björn Schießle
43415386a8 Upstream merged my patch to add additional ssl root certificates to the webdav client. 
This means that OC_Connector_Sabre_Client is no longer needed
 2013-01-08 17:44:28 +01:00
Jenkins for ownCloud
b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Thomas Mueller
4a345fd911 removing undefined $response 2013-01-06 23:28:58 +01:00
Michael Gapczynski
1137723b2a Remove unnecessary length parameter from last commit 2013-01-03 12:13:45 -05:00
Michael Gapczynski
38876fc98a Update old storage classes names to the new namespace during mounting 2013-01-03 12:07:04 -05:00
Robin Appelman
e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Jenkins for ownCloud
3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Michael Gapczynski
7f218c4dc0 Remove accidentally included file 2013-01-02 13:20:44 -05:00
Michael Gapczynski
db90f2c296 Listen to checkbox changes as well 2013-01-02 12:13:59 -05:00
Michael Gapczynski
d65cb7ae09 Fix 'Grant Access' button for multiple Google Drive mount points and prevent multiple scripts being added 2013-01-02 11:59:17 -05:00
Michael Gapczynski
a69de3a8f1 Turn off async for saving mount points, improve input detection for Google and Dropbox 'Grant Access' buttons 2013-01-01 16:19:40 -05:00
Jenkins for ownCloud
c6064a542c [tx-robot] updated from transifex 2013-01-01 00:04:42 +01:00
Jenkins for ownCloud
329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Michael Gapczynski
d275725e23 No longer need to create folders locally for external storage mount points 2012-12-29 13:43:44 -05:00
Jenkins for ownCloud
9aefbea074 [tx-robot] updated from transifex 2012-12-29 00:08:28 +01:00
Michael Gapczynski
442a045ef6 Fix problems with chosen multiselect 2012-12-28 17:38:24 -05:00