510d0b2cf3
Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter
...
Also support closing tags with no text content given
Conflicts:
lib/private/template.php
2014-10-28 11:15:58 +01:00
7466ff09bb
Merge pull request #11799 from owncloud/no-stable-etags-on-windows
...
On Windows platform we have no stable etag generation - yet
2014-10-27 22:33:14 +01:00
d6380a5395
Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
...
Make supported DBs configurable within config.php
2014-10-27 22:24:16 +01:00
79778d6a51
code cleanup during review 👍
2014-10-27 21:39:35 +01:00
233c49f4b9
Make supported DBs configurable within config.php
...
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.
To test this play around with the new configuration parameter "supportedDatabases".
2014-10-27 21:39:34 +01:00
d0ce600eec
On Windows platform we have no stable etag generation - yet
2014-10-27 20:48:47 +01:00
a00712aa65
Merge pull request #11783 from owncloud/allow_passing_driver_options
...
allow passing db driver options
2014-10-27 16:00:13 +01:00
8de287f2ef
Merge pull request #11763 from owncloud/stable-etags
...
Generate stable etags for local files
2014-10-27 15:30:30 +01:00
290e9cd5b2
Merge pull request #11787 from owncloud/fix-php-docs
...
Fix PHPDoc
2014-10-27 14:46:41 +01:00
de72aff2c1
add driver options to config samples
2014-10-27 14:43:31 +01:00
f7c393fa9f
Fix PHPDoc
...
Stop my IDE and Scrutinizer from complaining.
2014-10-27 13:38:40 +01:00
e16a58220d
allow passing driver options, fixes #11718
2014-10-27 12:30:29 +01:00
aee1edf6b5
Merge pull request #11708 from owncloud/fix-momentjs
...
Setting moment locale based on user selection
2014-10-27 10:30:47 +01:00
5d391910c5
[tx-robot] updated from transifex
2014-10-27 01:54:28 -04:00
214af9523a
[tx-robot] updated from transifex
2014-10-26 01:54:32 -04:00
acec1afe17
Merge pull request #11760 from owncloud/add-type-hints-where-sensible
...
Add type hinting to functions
2014-10-25 14:09:48 +02:00
be32e562e3
drop unneeded hint
2014-10-25 12:00:56 +02:00
3652f02e48
[tx-robot] updated from transifex
2014-10-25 01:54:35 -04:00
63f2b1f460
Merge pull request #11767 from danbartram/add_db_rollback
...
Add missing DB rollback functionality
2014-10-24 19:52:56 +02:00
9fa5483111
Merge pull request #11709 from owncloud/temp-handling
...
Cleanup handling of temporary files
2014-10-24 19:29:05 +02:00
9c1015b790
Add missing DB rollback functionality
2014-10-24 17:44:06 +01:00
283c10f010
Generate stable etags for local files
2014-10-24 16:47:58 +02:00
f901c5ff08
Fix PHPDoc and remove explicit type hint
2014-10-24 15:49:55 +02:00
25a4b5a935
Merge pull request #11735 from owncloud/mssql-migrations-master
...
disable database migration unit tests for MSSQL
2014-10-24 09:16:43 -04:00
b3a04840b5
Add type hinting to functions
...
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
77b8e1543a
Merge pull request #11752 from owncloud/use-function-outside-of-loop
...
Use function outside of loop
2014-10-24 13:54:09 +02:00
d060180140
Use function outside of loop
...
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
0b96297783
Use the TempManager to handle temporary files
2014-10-24 12:18:49 +02:00
83c74b80ad
Add \OC\TempManager to handle creating and cleaning temporary files
2014-10-24 12:18:46 +02:00
9739a25547
Merge pull request #11758 from owncloud/fix-permissions
...
Make files non executable
2014-10-24 12:15:19 +02:00
0525341a12
Merge pull request #11754 from owncloud/fix-division-null
...
Prevent division by zero
2014-10-24 11:59:29 +02:00
2d2a4741ce
Make files non executable
...
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
9babcfb9e2
[tx-robot] updated from transifex
2014-10-24 01:55:11 -04:00
4b5a3876ac
Merge pull request #7749 from owncloud/load_avatar_header_via_php
...
Load avatar in header via PHP
2014-10-24 01:27:25 +02:00
46dd59f47b
Merge pull request #11751 from owncloud/fix-unreachable-statement
...
Remove unreachable statement
2014-10-24 00:18:45 +02:00
3efac5a4f2
Prevent division by zero
...
Potentially fixes https://github.com/owncloud/core/issues/11742
2014-10-24 00:10:22 +02:00
a10b25587f
add avatardiv-shown class to bring back mobile style
2014-10-23 23:51:05 +02:00
729dffed5e
Load avatar in header via PHP
...
* fix #7484
* use UID, css, and div instead of span
2014-10-23 23:17:18 +02:00
c30b7f8197
Remove unreachable statement
2014-10-23 23:03:14 +02:00
ca5abe5744
Setting moment locale based on user selection
2014-10-23 10:32:47 -04:00
e26a16afea
Merge pull request #11549 from owncloud/add-more-localizations-master
...
implement localizations based on punic
2014-10-23 16:09:47 +02:00
5aab98c4bf
disable database migration unit tests for MSSQL
2014-10-23 14:35:44 +02:00
770f643e5c
Merge pull request #11259 from owncloud/fix-windows-max-depth-test
...
fixing windows max depth test
2014-10-23 14:34:39 +02:00
fa9a744200
Update 3rdparty submodule
2014-10-23 14:04:38 +02:00
6c1871da06
Merge pull request #10985 from owncloud/db-cleanup
...
Cleanup database handling
2014-10-23 13:48:33 +02:00
7c14a17361
Merge pull request #11721 from owncloud/fix-s3-regression
...
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
ca01530f57
Merge pull request #11726 from owncloud/s3-fixunittests
...
Fix S3 folder creation for new AWS API
2014-10-23 12:35:44 +02:00
7e266e8a79
Merge pull request #11720 from sebomoto/groupadmin-header
...
"Group admin" default label (issue #7706 )
2014-10-23 12:04:33 +02:00
b82e44b448
Merge pull request #10689 from owncloud/load_classfile_once
...
make sure class file is loaded once
2014-10-23 11:41:00 +02:00
2584ba29ea
Merge pull request #11710 from owncloud/closeSessionForAvatars
...
Close session for avatar get
2014-10-23 11:36:47 +02:00
Lukas Reschke
Thomas Müller
Morris Jobke
Robin Appelman
Jörn Friedrich Dreyer
Vincent Petry
Jenkins for ownCloud
Dan Bartram
Robin Appelman
Clark Tomlinson
kondou
Jan-Christoph Borchardt