1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

13374 Commits

Author SHA1 Message Date
Joas Schilling
089e5f5c79 [ticket/10942] Rename method sql_conditional() to sql_case()
PHPBB3-10942
2012-06-20 12:57:08 +02:00
Joas Schilling
79dfdf9406 [ticket/10942] Change term string to expression to avoid confusion
PHPBB3-10942
2012-06-20 12:50:12 +02:00
Joas Schilling
c8e322d88f [ticket/10942] Fix sql_conditional for mssql, postgre and oracle
PHPBB3-10942
2012-06-20 12:41:26 +02:00
Joas Schilling
4fbbbfcebb [ticket/10942] Fix function name on order_lower_test.php
PHPBB3-10942
2012-06-20 02:12:48 +02:00
Joas Schilling
8cea7b2a51 [ticket/10942] Add unit tests for sql_concatenate
PHPBB3-10942
2012-06-20 02:10:54 +02:00
Joas Schilling
1e3272bfce [ticket/10942] Add sql_concatenate to dbal
PHPBB3-10942
2012-06-20 02:10:04 +02:00
Joas Schilling
dd0da6fffb [ticket/10942] Add unit tests for sql_conditional
PHPBB3-10942
2012-06-20 01:50:42 +02:00
Joas Schilling
71374078b9 [ticket/10942] Add sql_conditional to dbal
PHPBB3-10942
2012-06-20 01:50:00 +02:00
Nils Adermann
419d6cd035 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9551] uncomment line and change length to 255
2012-06-19 20:09:31 +02:00
Nils Adermann
08763ac99e Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-olympus
* github-dhruvgoel92/ticket/9551:
  [ticket/9551] uncomment line and change length to 255
2012-06-19 20:09:23 +02:00
Dhruv Goel
bbd3204a9c [ticket/9551] uncomment line and change length to 255
incase of partial collation change post_subject field will be changed back
to the default collation and length 255.

PHPBB3-9551
2012-06-19 20:03:57 +05:30
Oleg Pudeyev
bb3942d86b Merge PR #837 branch 'naderman/ticket/10932' into develop
* naderman/ticket/10932:
  [ticket/10932] Use included composer.phar in build process
  [ticket/10932] Adding composer.phar to the repository to version it
2012-06-18 21:24:16 -04:00
Oleg Pudeyev
e7da931d3a Merge PR #571 branch 'unknownbliss/ticket/10640' into develop
* unknownbliss/ticket/10640:
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
2012-06-18 20:55:01 -04:00
Nils Adermann
13c4db8255 Merge pull request #779 from callumacrae/ticket/10855
[ticket/10855] Modified coding guidelines to reflect JS brace changes.
2012-06-18 03:12:53 -07:00
Michael Cullum
a41f86f2f7 [ticket/10640] Change subject length in mcp in subsilver
PHPBB3-10640
2012-06-17 19:22:50 +01:00
Michael Cullum
7a6a5738db [ticket/10640] Change subject length in MCP
PHPBB3-10640
2012-06-17 19:07:21 +01:00
Joas Schilling
a259db7105 [ticket/10640] Do not change default value of truncate_string()
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.

PHPBB3-10640
2012-06-17 19:07:17 +01:00
Michael Cullum
53d8464776 [ticket/10640] Change maximum subject length
PHPBB3-10640
2012-06-17 19:07:09 +01:00
Nils Adermann
e045a80d8d Merge pull request #840 from p/ticket/10829
Ticket/10829 Fix some style name/path disagreements
2012-06-11 18:10:05 -07:00
Oleg Pudeyev
2a9698a13a [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
PHPBB3-10829
2012-06-11 21:03:12 -04:00
Oleg Pudeyev
699aab8e8e [ticket/10829] $style_name -> $style_path in style class.
Here the style path is taken and the variable name should be $style_path.

PHPBB3-10829
2012-06-11 21:00:22 -04:00
Oleg Pudeyev
436ade19fc Merge PR #839 branch 'p/ticket/10743' into develop
* p/ticket/10743:
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
2012-06-11 20:33:11 -04:00
Oleg Pudeyev
1564da616b Merge PR #787 branch 'cyberalien/ticket/10799' into develop
* cyberalien/ticket/10799:
  [ticket/10799] Removing global variable from includejs
2012-06-11 20:12:59 -04:00
Oleg Pudeyev
d8946e74de Merge PR #778 branch 'cyberalien/ticket/10800' into develop
* cyberalien/ticket/10800:
  [ticket/10800] Changing html to js for includejs tests
  [ticket/10800] Changing template paths in tests
2012-06-11 20:02:35 -04:00
Vjacheslav Trushkin
71ca9b4fe6 [ticket/10743] Renaming user->theme
Renaming user->theme to user->style

PHPBB3-10743
2012-06-11 19:56:50 -04:00
Vjacheslav Trushkin
33b72ec62b [ticket/10743] Changing obtain_cfg_items
Changing obtain_cfg_items to work only with style
because other components no longer exist

PHPBB3-10743
2012-06-11 19:56:49 -04:00
Nils Adermann
f22c99ffdb Merge remote-tracking branch 'github-p/ticket/10882' into develop
* github-p/ticket/10882:
  [ticket/10882] Fix test name - oops.
  [ticket/10882] Add a test for including a nonexistent file.
  [ticket/10882] Add test for an ENDIF without IF.
  [ticket/10882] Add test for an invalid template tag.
2012-06-12 00:57:34 +02:00
Nils Adermann
db98eb67d1 Merge branch 'develop-olympus' into develop
* develop-olympus:
2012-06-12 00:56:54 +02:00
Oleg Pudeyev
241033ae88 [ticket/10882] Fix test name - oops.
PHPBB3-10882
2012-06-11 18:50:05 -04:00
Nils Adermann
4ebcb5319e Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympus
* github-p/ticket/10828:
  [ticket/10828] Connect to postgres database by default.
2012-06-12 00:44:59 +02:00
Nils Adermann
a0771b8814 Merge pull request #814 from p/ticket/10828
[ticket/10828] Connect to postgres database by default.
2012-06-11 15:42:26 -07:00
Nils Adermann
5acbf0980d Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' into develop
* github-dhruvgoel92/feature/delete-auto-logins:
  [feature-delete-auto-logins] adds module to database update
  [feature/delete-auto-logins] fixes style
  [feature/delete-auto-logins] improves styling
  [feature/delete-auto-logins] fixes language entry
  [feature/delete-auto-logins] fix language keys and styling
  [feature/delete-auto-logins] explain persistent keys in the ucp.
  [feature/delete-auto-logins] template added for subsilver2
  [feature/delete-auto-logins] improved styling and fixes language
  [feature/delete-auto-logins] using loop for errors
  [feature/delete-auto-logins] fixes css corners
  [feature/delete-auto-logins] Fixes language entries
  [feature/delete-auto-logins] checks form key
  [feature/delete-auto-logins] Fixes language entries and redirection.
  [feature/delete-auto-logins] User can view/delete auto logins.
2012-06-11 23:39:09 +02:00
Nils Adermann
3852f78bb4 Merge pull request #796 from imkingdavid/ticket/10837
[ticket/10837] Removed tearDownAfterClass() from extension_controller_test.php
2012-06-11 14:30:33 -07:00
Oleg Pudeyev
300b420e01 Merge PR #834 branch 'bantu/ticket/10931' into develop
* bantu/ticket/10931:
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10931] Make sure get_bytes() always returns either an int or a float.
  [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().
  [ticket/10931] Use strict assertSame() instead of assertEquals().
  [ticket/10931] Also test for negative values.
  [ticket/10931] Also test lower case units in test_get_bytes().
  [ticket/10931] Correctly use GNU GPL version 2.
  [ticket/10931] Make it clear that we are mocking the ini_get() function.
  [ticket/10931] Document that false is also returned if value is not well formed
  [ticket/10931] Correct method description of get_string().
  [ticket/10931] Let us try ini_get() without error suppression.
  [ticket/10931] Unit tests for phpbb_php_ini class.
  [ticket/10931] Add wrapper class for ini_get function.
2012-06-11 16:02:11 -04:00
Andreas Fischer
4468847107 [ticket/10931] Apply strtolower() correctly, i.e. not on false.
PHPBB3-10931
2012-06-11 15:46:03 +02:00
Andreas Fischer
72212077eb [ticket/10931] Also test get_bytes() and get_string() with false.
PHPBB3-10931
2012-06-11 15:46:03 +02:00
Andreas Fischer
cbff02db4f [ticket/10931] Make to_numeric function globally available.
PHPBB3-10931
2012-06-11 15:46:03 +02:00
Nils Adermann
171d661765 [ticket/10932] Use included composer.phar in build process
PHPBB3-10932
2012-06-11 15:40:32 +02:00
Andreas Fischer
09fb9a9efe [ticket/10931] Make sure get_bytes() always returns either an int or a float.
PHPBB3-10931
2012-06-11 15:15:08 +02:00
Nils Adermann
cffcef1e46 [ticket/10932] Adding composer.phar to the repository to version it
PHPBB3-10932
2012-06-11 15:08:50 +02:00
Andreas Fischer
e9348b172a [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().
PHPBB3-10931
2012-06-11 15:06:52 +02:00
Andreas Fischer
44287e57bf [ticket/10931] Use strict assertSame() instead of assertEquals().
PHPBB3-10931
2012-06-11 14:47:29 +02:00
Andreas Fischer
3872abd824 [ticket/10931] Also test for negative values.
PHPBB3-10931
2012-06-11 14:47:29 +02:00
Andreas Fischer
fb279c9677 [ticket/10931] Also test lower case units in test_get_bytes().
PHPBB3-10931
2012-06-11 14:31:09 +02:00
Andreas Fischer
80dfa53ee3 [ticket/10931] Correctly use GNU GPL version 2.
PHPBB3-10931
2012-06-11 14:24:30 +02:00
Andreas Fischer
5086366662 [ticket/10931] Make it clear that we are mocking the ini_get() function.
PHPBB3-10931
2012-06-11 14:23:09 +02:00
Andreas Fischer
7501ea825a [ticket/10931] Document that false is also returned if value is not well formed
PHPBB3-10931
2012-06-11 13:53:17 +02:00
Andreas Fischer
63b2e36492 [ticket/10931] Correct method description of get_string().
PHPBB3-10931
2012-06-11 13:45:39 +02:00
Andreas Fischer
5bea6ed946 [ticket/10931] Let us try ini_get() without error suppression.
PHPBB3-10931
2012-06-11 13:40:14 +02:00
Andreas Fischer
afd6f86892 [ticket/10931] Unit tests for phpbb_php_ini class.
PHPBB3-10931
2012-06-11 13:22:11 +02:00