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

17158 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
d57bb70b03 Merge pull request #7889 from owncloud/routing-warning 
Fix undefined index warning in router
 2014-03-26 15:52:31 +01:00
Robin McCorkell
cd5ebac7c4 Fix error in $isPersonal setting 2014-03-26 14:37:29 +00:00
Thomas Müller
93b984ecf8 css files are not to be routed through index.php anymore 2014-03-26 15:36:55 +01:00
Robin McCorkell
b077528087 Perform proper checking for share availability 
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.

The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
 2014-03-26 14:36:45 +00:00
Robin McCorkell
cac4aaa8c4 Rename SMB_Auto to SMB_OC and change visible name 
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
 2014-03-26 14:35:07 +00:00
Robin McCorkell
86aa6104e6 Revoke sharable permission on automatic SMB shares 
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
 2014-03-26 14:35:07 +00:00
Robin McCorkell
3445c062ec Use loginname instead of display name 
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
 2014-03-26 14:35:07 +00:00
Robin McCorkell
ba63e46b5e SMB/CIFS mount using OwnCloud logon credentials 
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.

Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
 2014-03-26 14:35:07 +00:00
Vincent Petry
b656c68ede Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig 
Fix merging of external storage configurations
 2014-03-26 14:30:35 +01:00
Vincent Petry
028973cbea Merge pull request #7885 from owncloud/extstorage-prettyprintjson 
Pretty print mount.json when possible
 2014-03-26 13:34:31 +01:00
Robin Appelman
9b2bb7c6ab fix undefined index warning in router 2014-03-26 13:02:11 +01:00
Vincent Petry
e002b7242c Fix merging of external storage configurations 
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.

Fixed merging logic to make sure that class, mount point and options are
the same before merging them.

Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
 2014-03-26 12:41:25 +01:00
Vincent Petry
8d95c0d013 Pretty print mount.json when possible 2014-03-26 11:32:03 +01:00
Thomas Müller
83b4bcfdbf idn_to_ascii is only used if available 2014-03-26 11:17:23 +01:00
Vincent Petry
e76be308eb Remove unused setUserVars utility method 
That method was moved to the external storage recently so
isn't needed here any more.
 2014-03-26 09:39:09 +01:00
Vincent Petry
cbfd16089b Fixed share upgrade cleanup tests to use the correct ids 2014-03-26 09:29:28 +01:00
Jenkins for ownCloud
75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04:00
Thomas Müller
8958b9147b adding ellipsis on file names to public file list as well 2014-03-26 00:14:38 +01:00
Thomas Müller
d0f84e936f adding proper notification area for multi line messages 2014-03-26 00:04:11 +01:00
Thomas Müller
e6392163a4 adding ellipsis on file names 2014-03-25 23:40:40 +01:00
Thomas Müller
a54260b517 use minimum-scale=1.0 2014-03-25 23:35:55 +01:00
Thomas Müller
743ca4581d Merge pull request #7748 from owncloud/postgresversionwarning 
Added PostgreSQL version warning on upgrade
 2014-03-25 23:17:18 +01:00
Thomas Müller
6bfeb342db fixing code style 2014-03-25 23:17:00 +01:00
Thomas Müller
1816f43722 Merge pull request #7864 from owncloud/routing-performance 
Routing performance
 2014-03-25 23:00:36 +01:00
Thomas Müller
4900ad9119 update type hint in PHPDoc 2014-03-25 22:59:42 +01:00
Thomas Müller
ed97d872af Merge pull request #7325 from owncloud/recursive-mkdir-local 
Recursive mkdir fixes #7047
 2014-03-25 22:45:14 +01:00
Thomas Müller
1ae10b9da3 Merge pull request #7420 from owncloud/cachehooks-first 
Manually triger the filecache update hooks before any other hook
 2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259 Merge pull request #7477 from owncloud/foldersize-reuse 
Allow re-using already known fileinfo when calculating folder sizes
 2014-03-25 22:33:24 +01:00
Vincent Petry
ec9260647a Fixed share updater unit test 
Now using \OC_DB::insertId() to retrieve the generated ids because
Oracle ignores the passed values.
 2014-03-25 20:18:58 +01:00
VicDeo
86356db044 Merge pull request #7772 from owncloud/filter_more_jsconsole 
Also replace console.time/timeEnd when not in DEBUG mode
 2014-03-25 20:29:26 +02:00
Vincent Petry
5111fad006 Merge pull request #7689 from owncloud/last_cron_log 
Log last cron execution
 2014-03-25 19:17:36 +01:00
Bjoern Schiessle
31681a3a27 finally fix the paths for the OCS Share API 2014-03-25 17:52:45 +01:00
Bjoern Schiessle
3653a51af2 fix path creation for re-shares, issue #7662 2014-03-25 17:48:50 +01:00
Bjoern Schiessle
2d8607fae9 don't assign variables in if condition 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
5db3b049fd add todo 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
bc0292c16d always return an array 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
154277ab11 seperate formatResults() 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
ecde48fce8 don't assign variables in if conditions 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
078fafdc5a use variable 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
3a459db358 seperate transformDBResults 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
6607f7cb5e seperate creation of select statement 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
6afd496d9b remove prepFileTarget() seems that it is no longer in use 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
b602662578 add a "helper" and a "hooks" class. Move constants needed by multiple classes 
to a "constants" class
 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
8b6d1d3bf2 added private share api 2014-03-25 17:47:24 +01:00
Thomas Müller
8b86b94d47 call OC_App::loadApps(); to load all commands of all apps and related functionality 2014-03-25 17:46:05 +01:00
Thomas Müller
f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Tanghus
0b4d879619 Fix copy/paste error :P 2014-03-25 15:38:11 +01:00
Robin Appelman
d75c3d5f9a Fix routes getting lost when loading app routes twice 2014-03-25 14:28:30 +01:00
Thomas Tanghus
aa5bba2bcc 'ID' => 'id' and check existence of EMAIL 2014-03-25 14:22:39 +01:00
Robin Appelman
e1d3d0e948 fix incorect array 2014-03-25 14:04:18 +01:00