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

16815 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jan-Christoph Borchardt
6de572c6e6 replace personalblock fieldset with section class in files apps 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
bf77c580c1 general styles for the content area 2014-03-27 17:00:47 +01:00
Vincent Petry
1f6259d9c2 Merge pull request #7875 from Xenopathic/files_external_smb_auto 
SMB/CIFS mounts using ownCloud login, fixes #7843
 2014-03-27 12:18:51 +01:00
Vincent Petry
1469ce7b38 Merge pull request #7898 from owncloud/ext-swiftmtime 
Fixed mtime reading from OpenStack API
 2014-03-27 09:31:37 +01:00
Vincent Petry
c9ccacb9ea Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix 
Use the correct resolve method to resolve file storage (x-sendfile)
 2014-03-27 09:31:17 +01:00
Jenkins for ownCloud
ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04:00
Vincent Petry
b48510c978 Use the correct resolve method to resolve file storage 
When detecting whether the file to be downloaded is on external storage,
the correct path needs to be used.

It turns out that \OC\Files\View is needed to resolve the path correctly
relative to the user's home.
 2014-03-26 18:14:35 +01:00
Vincent Petry
fa00a18677 Fixed mtime reading from OpenStack API 
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
 2014-03-26 17:20:40 +01:00
Thomas Müller
10e62bfd68 Merge pull request #7893 from owncloud/no-routed-link-for-css-files 
css files are not to be routed through index.php anymore
 2014-03-26 16:48:54 +01:00
Thomas Müller
be78cd53f9 Merge pull request #7896 from Xenopathic/misc_text_fixes 
Miscellaneous text fixes for core apps
 2014-03-26 16:47:24 +01:00
Robin McCorkell
50dba97bde Miscellaneous text fixes for core apps 2014-03-26 15:43:03 +00:00
Robin McCorkell
a1dca821f9 Use braces on single line if statements 2014-03-26 15:11:09 +00:00
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
Jenkins for ownCloud
75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04: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
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
Robin Appelman
d75c3d5f9a Fix routes getting lost when loading app routes twice 2014-03-25 14:28:30 +01:00
Robin Appelman
e1d3d0e948 fix incorect array 2014-03-25 14:04:18 +01:00
Robin Appelman
c17f415356 Only load core routes for ocs and settings 2014-03-25 13:42:47 +01:00
Thomas Müller
36c9d91f86 Merge pull request #7867 from owncloud/upload-dontclosesessionforencryption 
Fix public upload to not close session when encryption is on
 2014-03-25 12:43:26 +01:00
Thomas Müller
531c9564b3 Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master 
idn have to be converted before being used
 2014-03-25 12:38:32 +01:00
Jenkins for ownCloud
b92dad992f [tx-robot] updated from transifex 2014-03-25 01:55:34 -04:00
Vincent Petry
e72b2e6e3b Fix public upload to not close session when encryption is on 
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
 2014-03-24 17:34:37 +01:00
Robin Appelman
9e89ad07c6 Only load core routes when matching a core route 2014-03-24 16:38:01 +01:00
Robin Appelman
0e1cb001b6 Cache generated urls for routes 2014-03-24 15:42:21 +01:00
Robin Appelman
f17674fef2 Only load routes from the apps we need 2014-03-24 15:41:46 +01:00
Thomas Müller
3eb5898f7b use \OC_Mail::validateAddress() to validate the email address - fixes #7862 2014-03-24 15:35:07 +01:00
Robin Appelman
0d0aac6fff Load the routes when matching or generating a route instead of when creating the router 2014-03-24 14:55:03 +01:00
Thomas Müller
fb7f3008d3 idn have to be converted before being used 2014-03-24 13:46:31 +01:00
icewind1991
d87001a093 Merge pull request #7768 from owncloud/trashempty-nocache 
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
 2014-03-24 13:34:30 +01:00