Georg Ehrke
cf76933b76
add phpdoc
2014-09-15 15:10:03 +02:00
Georg Ehrke
3157d307f7
add y to with-aspect naming schema
2014-09-15 15:10:03 +02:00
Morris Jobke
5357c91520
Merge pull request #11026 from owncloud/apps-styles-update
...
Apps styles update
2014-09-15 14:45:23 +02:00
Lukas Reschke
07b14bcd4f
Merge pull request #10960 from owncloud/use-intl-module-master
...
use intl's native normalizer_normalize() in case the module is available
2014-09-15 14:13:30 +02:00
Andreas Fischer
31898aa635
Merge pull request #11021 from owncloud/do-not-double-decode
...
Do not double decode values
* owncloud/do-not-double-decode:
Do not double decode values
2014-09-15 07:58:45 +02:00
Jenkins for ownCloud
8d647fa267
[tx-robot] updated from transifex
2014-09-15 01:54:26 -04:00
Lukas Reschke
90e91a9d10
Merge pull request #11050 from owncloud/enc-flockfix
...
Remove passing by reference to allow for proper GC
2014-09-15 00:31:10 +02:00
Jenkins for ownCloud
d8c7a52979
[tx-robot] updated from transifex
2014-09-14 01:54:35 -04:00
Thomas Müller
05fa947b6b
Merge pull request #11054 from owncloud/fix-unit-tests-11041-master
...
content size checks are not valid for LOCK
2014-09-13 20:00:46 +02:00
Jenkins for ownCloud
518ed10c77
[tx-robot] updated from transifex
2014-09-13 05:17:34 -04:00
Thomas Müller
6dfd1733bb
Don't terminate the script if the pgsql database could not be deleted
2014-09-12 22:41:22 +02:00
Thomas Müller
cfa2eb7d32
content size checks are not valid for LOCK
2014-09-12 22:02:42 +02:00
Raghu Nayyar
1145529584
Merge pull request #11041 from owncloud/no-size-check-on-lock-master
...
content size checks are not valid for LOCK
2014-09-13 00:48:52 +05:30
Vincent Petry
da9f9ae9b3
Remove passing by reference to allow for proper GC
...
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.
This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
2014-09-12 19:51:47 +02:00
Bernhard Posselt
d48b672791
Merge pull request #10974 from owncloud/fix-app-content-overflow
...
This fixes the double scrollbars issue
2014-09-12 18:41:43 +02:00
Thomas Müller
d3fc5de4c2
remove 'set -e' - causes issues during ci execution
2014-09-12 15:42:50 +02:00
Clark Tomlinson
cfd8b3f976
Merge pull request #11043 from owncloud/test-againstNull
...
Return false in case the passed values are not of type string
2014-09-12 09:42:42 -04:00
Lukas Reschke
5ff999d69d
Return false in case one of the values is null
2014-09-12 13:34:45 +02:00
Thomas Müller
27cd30aa94
content size checks are not valid for LOCK
2014-09-12 09:42:32 +02:00
Jenkins for ownCloud
d6834b6389
[tx-robot] updated from transifex
2014-09-12 03:28:56 -04:00
Jan-Christoph Borchardt
7afca08255
Merge pull request #11024 from owncloud/fix-nojavascript
...
fix nojavascript message alignment
2014-09-11 23:06:17 +02:00
Jan-Christoph Borchardt
dc2e4dc7b9
Merge pull request #11022 from owncloud/icons-fix
...
Fix icons
2014-09-11 16:58:32 +02:00
Jan-Christoph Borchardt
0afd7b5de4
use same shade of grey for active navigation items and hovering
2014-09-11 16:34:29 +02:00
Jan-Christoph Borchardt
179f06d94f
remove icon styles from apps.css as they are in icons.css
2014-09-11 16:30:24 +02:00
Jan-Christoph Borchardt
94402b5cc7
fix nojavascript message alignment
2014-09-11 16:12:43 +02:00
Lukas Reschke
712addac68
Merge pull request #11018 from owncloud/fix-notification-layer
...
fix notification visibility, fix #11016
2014-09-11 16:07:23 +02:00
Jan-Christoph Borchardt
fd4eb9d460
fix folder icon alignment, fix #10866
2014-09-11 15:52:12 +02:00
Jan-Christoph Borchardt
73e09ecb5e
fix svg of calendar filetype icon
2014-09-11 15:51:24 +02:00
Jan-Christoph Borchardt
8ac648bf1e
fix size of toggle icon, make container square
2014-09-11 15:39:01 +02:00
Jan-Christoph Borchardt
a344b097e5
improve style of checkmark icon, less bold, fitting ownCloud style
2014-09-11 15:38:39 +02:00
Lukas Reschke
99e9e762d1
Do not double decode values
...
Fixes https://github.com/owncloud/core/issues/11012
2014-09-11 15:34:57 +02:00
Thomas Müller
4878f7a416
Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys
...
Add custom hex2bin implementation for 5.3
2014-09-11 15:05:36 +02:00
Jan-Christoph Borchardt
4602436bce
fix notification visibility, fix #11016
2014-09-11 14:12:29 +02:00
Thomas Müller
9737ba74ce
Merge pull request #11007 from owncloud/replaces-10850
...
Add X-UA-Compatible to all templates
2014-09-11 12:34:44 +02:00
Lukas Reschke
8d7926543b
Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over
...
Refresh if maintenance mode is over
2014-09-11 11:34:39 +02:00
Lukas Reschke
bce5c2dae9
Add X-UA-Compatible to all templates
...
Replaces https://github.com/owncloud/core/pull/10850
2014-09-11 10:28:52 +02:00
Thomas Müller
59209e0f2b
use intl's native normalizer_normalize() in case the module is available
2014-09-11 10:24:31 +02:00
Lukas Reschke
bfebbe47de
Merge pull request #10962 from owncloud/repair_search_lucene
...
repair search lucene before installing
2014-09-11 10:09:43 +02:00
Lukas Reschke
1973275adc
Add custom hex2bin implementation for 5.3
...
Fixes https://github.com/owncloud/core/issues/11004
2014-09-11 09:51:45 +02:00
Thomas Müller
e6af67d5ea
Merge pull request #9698 from owncloud/fix-9666
...
Load apps in tests, fixes #9666
2014-09-11 08:05:00 +02:00
Jenkins for ownCloud
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
Robin McCorkell
45b02f8f47
Merge pull request #10992 from oparoz/patch-3
...
Create .user.ini for PHP-FPM
2014-09-10 18:05:28 +01:00
Robin Appelman
0878f722db
Fix contructor in test
2014-09-10 17:59:32 +02:00
Robin McCorkell
08e38a1072
Fix mkdir error in mountconfig.php
2014-09-10 17:28:25 +02:00
Robin McCorkell
b754a8261a
Load apps in test situations
2014-09-10 17:28:25 +02:00
Thomas Müller
2a382a87d5
Merge pull request #10988 from owncloud/usetransactions-wrong-name
...
Fix method name useTransactions
2014-09-10 17:27:23 +02:00
Olivier Paroz
59facd769f
Create .user.ini for PHP-FPM
...
PHP-FPM can't read .htaccess PHP settings unless a PECL extension is installed.
From version 5.3+ of PHP, settings can be set in .user.ini files
This is a .user.ini file mirroring what is included in the .htaccess file
TODO: Update the documentation if there are sections documenting how to change some PHP limits
2014-09-10 16:08:40 +02:00
Lukas Reschke
1d639161b6
Merge pull request #10990 from owncloud/fix-testCallRegister-master
...
requesttoken has now a length of 30 chars
2014-09-10 16:04:44 +02:00
Robin Appelman
fa2b385d33
Fix method name
2014-09-10 15:59:24 +02:00
Thomas Müller
007802121c
requesttoken has now a length of 30 chars
2014-09-10 15:35:21 +02:00