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

18773 commits

This branch
This branch
All branches
Author SHA1 Message Date
macjohnny
ede2aa236e Update manager.php 
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
 2014-06-12 09:41:23 +02:00
Vincent Petry
5def2a72dd Merge pull request #8991 from owncloud/fix-php53-arraycombine 
Fixed array_combine for PHP 5.3
 2014-06-12 09:08:50 +02:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
josh4trunks
1b02991a1d Fixes based on suggestions 
I use the term socket for any extension, either unix socket, or internet socket (port).

I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.

By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.

I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks
 2014-06-11 21:47:45 -07:00
Vincent Petry
4e4c2b04c8 Fixed array_combine for PHP 5.3 2014-06-11 19:13:49 +02:00
Vincent Petry
452b45ed1d Merge pull request #8986 from owncloud/disable_tests 
disable failing tests
 2014-06-11 18:34:35 +02:00
Vincent Petry
75a53b3c49 Merge pull request #8901 from owncloud/permissions-update-cache 
Save the permissions in the filecache if it's not saved yet
 2014-06-11 18:28:55 +02:00
Vincent Petry
67413e3ada Use assertNotSame when checking etags 
Sometimes etags contain a "e" character which makes PHP believe it's a
number and make the tests fail
 2014-06-11 17:28:18 +02:00
Bjoern Schiessle
4cef7f9d4b disable failing tests 2014-06-11 17:21:57 +02:00
Vincent Petry
2facfe9984 Merge pull request #8985 from owncloud/share-grouporderfix 
Added ORDER BY to enforce share entry order
 2014-06-11 17:20:22 +02:00
Vincent Petry
65b3d293ce Added ORDER BY to enforce share entry order 
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.

This fix adds an ORDER BY clause to force the order by id.
 2014-06-11 14:28:30 +02:00
Frank Karlitschek
7742791bc2 increase to 7.0 alpha 1 2014-06-11 10:54:45 +02:00
Vincent Petry
491c96eaa9 Merge pull request #8966 from owncloud/fix_failing_tests_on_master 
Fix failing tests on master
 2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Bernhard Posselt
93169eca1e also handle lowercase headers 2014-06-11 01:20:09 +02:00
Morris Jobke
e89f1784a3 Merge pull request #8972 from owncloud/use_imagettftext_take2 
make text preview backend use imagettftext, fixes #8087
 2014-06-11 01:07:32 +02:00
Bernhard Posselt
0252d39bb6 fix indention 2014-06-11 00:57:00 +02:00
Bernhard Posselt
1002281dae handle http accept headers more gracefully 2014-06-11 00:54:25 +02:00
Georg Ehrke
7396e5f455 movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756 2014-06-10 22:08:27 +02:00
jbtbnl
077a542d59 Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9 
Disable snapper init for IE <= 9
 2014-06-10 21:59:55 +02:00
Georg Ehrke
e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Vincent Petry
015c5062e5 Disable snapper init for IE <= 9 
Snapper doesn't work at all for IE8 and IE9 and messes up with the main
container layout when enabled.

This commits disables snapper for these browsers.
 2014-06-10 17:14:49 +02:00
Robin Appelman
6b1d8a56bb remove unused argument 2014-06-10 15:42:37 +02:00
Robin Appelman
054083b9cd add some comments 2014-06-10 15:37:43 +02:00
Robin Appelman
21cfd1014a Repair broken parent link in the scanner 2014-06-10 15:26:18 +02:00
Bjoern Schiessle
9dc0befcca call self::getNumericStorageId() to get the numeric ID 2014-06-10 14:48:19 +02:00
Bjoern Schiessle
f4a183e753 wwe no longer have a versions table 2014-06-10 14:47:32 +02:00
Bjoern Schiessle
1d9b4aadbf no need to prepare a statement twice 2014-06-10 14:46:47 +02:00
Morris Jobke
ecc41fe0c3 Merge pull request #8908 from owncloud/fix-placeholders 
fix split translations. fix for the discussion in the description
 2014-06-10 10:47:23 +02:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
jbtbnl
b2c86b7a07 Merge pull request #8928 from owncloud/too-long-filename-fix-v2 
Ellipcises too long filenames
 2014-06-09 13:09:18 +02:00
Robin Appelman
a978607011 Use &= 2014-06-09 12:47:00 +02:00
Thomas Müller
961e4e5c7c adjust unit test assert values 2014-06-09 12:44:40 +02:00
Thomas Müller
aa38bd2b31 adding PHPDoc 2014-06-09 12:34:35 +02:00
Robin Appelman
41d2354191 Save the permissions in the filecache if it's not saved yet 2014-06-09 12:34:35 +02:00
Morris Jobke
3239d1099c Merge pull request #8948 from owncloud/fix-logger-race-condition 
set logger before registrate to an error handler
 2014-06-09 11:07:10 +02:00
Morris Jobke
63c5c7bd21 set logger before registrate to an error handler 2014-06-09 10:02:23 +02:00
Jenkins for ownCloud
e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Morris Jobke
e769ef9bbb Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix 
Added hacky fix for long path cleanup routine
 2014-06-08 20:46:00 +02:00
Morris Jobke
e3429b63a2 improve ellipsis of filename for different screen sizes 2014-06-08 17:48:53 +02:00
Morris Jobke
1037533a9e Merge pull request #8937 from owncloud/design-sizing 
Layout fixes
 2014-06-08 12:31:24 +02:00
raghunayyar
f3a605230a @jancborchardt's commit for cross browser compatibility of extension. 2014-06-08 15:06:01 +05:30
Jenkins for ownCloud
1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Volkan Gezer
bcbebe8dd2 Merge pull request #8942 from owncloud/fix-user-search-field 
fix hidden user group search field
 2014-06-08 03:11:54 +02:00
Volkan Gezer
e34a8bb9d6 fix hidden user group search field 2014-06-07 21:12:12 +02:00
raghunayyar
09206f8a49 Adds class name to span element inside filename. 2014-06-07 23:54:21 +05:30
Jan-Christoph Borchardt
c0973fe7e8 display empty content message a bit higher up so it's easier to see 2014-06-07 12:08:12 +02:00
Jan-Christoph Borchardt
49e15f0130 app settings: only display text fields at full width, not buttons 2014-06-07 12:07:50 +02:00
raghunayyar
d71bb7dbe4 Adds multiple media queries for filename. 2014-06-07 14:23:49 +05:30
Jenkins for ownCloud
e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00