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

19358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jörn Friedrich Dreyer
8f11019f45 mkae getRelativePath of file search results overwriteable in subclasses 2014-07-14 19:27:10 +02:00
Jörn Friedrich Dreyer
eea5c2ee0a return relative path 2014-07-14 19:12:06 +02:00
Jörn Friedrich Dreyer
3f093974f9 use fileinfo object in search results 2014-07-09 14:47:43 +02:00
Thomas Müller
404ac8bcd3 Merge pull request #9534 from owncloud/fix-9532-master 
De-double class name
 2014-07-09 13:11:58 +02:00
Arthur Schiwon
4e8d52d5d8 test class is already in preferences.php 2014-07-09 10:49:40 +02:00
Thomas Müller
44ffc7a914 De-double class name 2014-07-09 09:36:36 +02:00
Thomas Müller
63fdaacbfc Merge pull request #9510 from libasys/patch-1 
BugFix missing $item on 'file_target' Line 1911
 2014-07-09 07:58:37 +02:00
Jenkins for ownCloud
6e2e0108ee [tx-robot] updated from transifex 2014-07-09 01:55:51 -04:00
Thomas Müller
6f35e51ff3 Merge pull request #9528 from owncloud/fix-apostrop 
fix apostrophe fixes #9486
 2014-07-09 07:42:30 +02:00
Volkan Gezer
2561ef123b fix apostrophe fixes #9486 2014-07-08 21:48:29 +02:00
blizzz
51ee4fc5df Merge pull request #9385 from owncloud/fix-7052 
support for AD primary groups
 2014-07-08 21:33:50 +02:00
Arthur Schiwon
da490bdbbe support for AD primary groups 
support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing
 2014-07-08 21:32:21 +02:00
Vincent Petry
87adbf1c6e Merge pull request #9515 from owncloud/update-sharecleanupfix 
Fix update cleanup to only affect file and folders
 2014-07-08 18:09:26 +02:00
Thomas Müller
10978a80c2 Merge pull request #9507 from owncloud/fix-9302-master 
Upload abortion is now detected within the  OC_Connector_Sabre_File::put...
 2014-07-08 17:39:34 +02:00
Thomas Müller
65d9d6ad01 Merge pull request #9412 from owncloud/public-api-activity 
Public api activity
 2014-07-08 16:37:18 +02:00
Arthur Schiwon
3338a0f236 port of #9500 
don't trigger update from checkPassword, it is already  called by userExists, this is enough.

do not write to database when the value is the same

add test cases. also split test classes in a file each, looks like only the first class is being executed

also appconfig shall not write to database if the value is unchanged
 2014-07-08 16:32:01 +02:00
Robin Appelman
3e3d460729 use case insensitive LIKE when searching for files in mysql 2014-07-08 15:49:27 +02:00
Thomas Müller
c777910a8b Merge pull request #9504 from owncloud/repair-collation 
Add repair step to set MySQL collation to utf8_bin
 2014-07-08 15:13:46 +02:00
Robin Appelman
76c709d7de Add repair step to set MySQL collation to utf8_bin 
Set default collation of mysql connection to utf8_bin
Set utf_bin as default collation for new tables
 2014-07-08 15:12:07 +02:00
Vincent Petry
f4f52cf242 Fix update cleanup to only affect file and folders 
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.
 2014-07-08 14:53:31 +02:00
Thomas Müller
46ba08a0b0 Merge pull request #9509 from owncloud/ctjctj-fix_amazons3 
Fix Signiture Does Not Match when mounting Amazon S3 external storage
 2014-07-08 14:25:47 +02:00
Thomas Müller
ea269f0067 Upload abortion is now detected within the OC_Connector_Sabre_File::put() 
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()
 2014-07-08 11:09:59 +02:00
libasys
e70a7af6da BugFix missing $item on 'file_target' Line 1911 
I think this should be right!
 2014-07-08 10:51:05 +02:00
Thomas Müller
687cd7fe83 Ignore core/js/jquery.placeholder.js 2014-07-08 10:22:54 +02:00
Thomas Müller
d6e06aed93 Ignore core/js/snap.js 2014-07-08 10:21:43 +02:00
Christopher T. Johnson
599ab7a802 Fix Signiture Does Not Match when mounting Amazon S3 external storage 
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.

When we are at the top of a S3 bucket there is a need(?) to have a directory
name.  Per standard Unix the name picked was '.' (dot or period).  This
choice exercises the aws-sdk bug.

This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'.  We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable.  Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().

An example where we don't process through clean key would be
	'Key' => $path.'/',

Use correct relationship operator

Per feed back use === instead of ==

use '/' instead of '<root>'
 2014-07-08 10:16:48 +02:00
Jan-Christoph Borchardt
8da44f2a5b Merge pull request #9506 from owncloud/fix-fielset-legends 
specify CSS rule for warning & update fieldsets
 2014-07-08 09:28:35 +02:00
Thomas Müller
8363f3c635 Adding new interface \OCP\Activity\IExtentsion 
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
 2014-07-08 09:04:37 +02:00
Jenkins for ownCloud
20fc4b8b53 [tx-robot] updated from transifex 2014-07-08 01:55:17 -04:00
Morris Jobke
1494b333c5 specify CSS rule for warning & update fieldsets - fixes #9491 2014-07-07 23:33:20 +02:00
Vincent Petry
5506f9dc81 Merge pull request #9495 from owncloud/remove-moved-mount 
When changing the mountpoint of an external storage, ensure the old one ...
 2014-07-07 23:23:04 +02:00
Vincent Petry
ec4cb56bd7 Merge pull request #9505 from stephane84/fix-9497 
Refocus input field after user creation
 2014-07-07 23:11:23 +02:00
Morris Jobke
45a4751f0e Merge pull request #9499 from owncloud/shares-hidetokenrecipient 
Do not show recipient for link shares in file list
 2014-07-07 20:02:59 +02:00
Morris Jobke
29bdfc0ce2 Merge pull request #9502 from owncloud/add_ocsids 
Add ocsids for shipped apps in core repo
 2014-07-07 19:58:41 +02:00
Morris Jobke
54a8dce380 Merge pull request #9415 from owncloud/external-sharedialog 
Improved external share dialog
 2014-07-07 19:51:54 +02:00
Morris Jobke
b2377129b6 Merge pull request #9494 from owncloud/issue/9490 
[issues/9490] \OC::$WEBROOT is invalid when called from cron.php
 2014-07-07 19:36:41 +02:00
Morris Jobke
ed9b9ba671 Merge pull request #9501 from owncloud/shares-listsort 
Fixed shared list sorting
 2014-07-07 19:31:32 +02:00
Stephane V
179a707e29 Fixes #9497 2014-07-07 18:32:51 +02:00
Georg Ehrke
e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Vincent Petry
4ba492f28d Fixed shared list sorting 
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
 2014-07-07 16:49:32 +02:00
Vincent Petry
8ddff52c51 Do not show recipient for link shares in file list 
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
 2014-07-07 16:33:23 +02:00
Vincent Petry
130b8018a1 Improved external share dialog 
Changed title, label and buttons.
Removed icon.
 2014-07-07 15:57:26 +02:00
Vincent Petry
71fe5d672e Fixed dialogs styling, reversed buttons 
Default dialog button is now on the right, other one on the left.
 2014-07-07 15:56:42 +02:00
Thomas Müller
268af9039a Merge pull request #9492 from owncloud/repait-innodb-master 
MySQL: adding repair step to convert MyIsam tables to InnoDB
 2014-07-07 15:50:34 +02:00
Robin Appelman
128c226063 When changing the mountpoint of an external storage, ensure the old one is removed 2014-07-07 15:40:01 +02:00
Joas Schilling
bef0934719 Add comment to overwrite* configs about CLI/cron problems 2014-07-07 15:08:46 +02:00
Joas Schilling
5d3e1bc023 Only calculate the WEBROOT from scriptName if it contains $SUBURI 
If not we are most likely in CLI mode. However to be able to still
generate valid URLs, we need to use the overwrite webroot instead.

Fix #9490
 2014-07-07 15:08:46 +02:00
Joas Schilling
e8537afd60 Only overwrite serverHost when in unit tests 
The intention of the original commit 12f7cb8767
was to fix tests. But cron should always return a valid host not localhost.
 2014-07-07 15:08:45 +02:00
Thomas Müller
b091b15f0b MySQL: adding repair step to convert MyIsam tables to InnoDB 2014-07-07 12:32:24 +02:00
Jan-Christoph Borchardt
b271e05bc9 Merge pull request #9488 from owncloud/fix-ctrl-click-app 
fix loading spinner on ctrl click a app entry- fixes #9063
 2014-07-07 11:49:14 +02:00