makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
13518 commits 18 branches 192 tags 207 MiB
Commit graph

13518 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fyorl
03ddfbbaf1 [ticket/10963] Modified filespec::is_image() to check actual mimetype 
Modified filespec::is_image() to check the Fileinfo mimetype rather than
trusting the browser.

PHPBB3-10963
 2012-07-02 23:30:47 +01:00
Joas Schilling
fe1f21d1a5 [ticket/10942] Use ANSI SQL standard || in dbal.php 
PHPBB3-10942
 2012-07-02 23:11:21 +02:00
Joas Schilling
ad9d650659 [ticket/10942] Fix up unit tests for sql_case() 
PHPBB3-10942
 2012-07-02 11:10:58 +02:00
Joas Schilling
a8cf926566 [ticket/10942] Require same data type and do not cast expressions automatically 
PHPBB3-10942
 2012-07-02 11:10:02 +02:00
Andreas Fischer
d998ad4b15 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10773] ACP logo with registered trademark symbol
 2012-07-01 00:20:04 +02:00
Andreas Fischer
3ecc43d48c Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10773] ACP logo with registered trademark symbol
 2012-07-01 00:19:52 +02:00
Andreas Fischer
e5364088c3 Merge remote-tracking branch 'Noxwizard/ticket/10773' into prep-release-3.0.11 
* Noxwizard/ticket/10773:
  [ticket/10773] ACP logo with registered trademark symbol
 2012-07-01 00:19:32 +02:00
Patrick Webster
625333ea2e [ticket/10773] ACP logo with registered trademark symbol 
PHPBB3-10773
 2012-06-30 12:21:37 -05:00
Joas Schilling
0fd02035d8 [ticket/10942] Make unit tests for sql_case simpler 
PHPBB3-10942
 2012-06-30 13:02:50 +02:00
Andreas Fischer
2d250247f4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10850] Changed the fopen mode to wb
 2012-06-28 23:11:08 +02:00
Andreas Fischer
7fba5a0f38 Merge branch 'ticket/brunoais/10850' into develop-olympus 
* ticket/brunoais/10850:
  [ticket/10850] Changed the fopen mode to wb
 2012-06-28 23:11:01 +02:00
Bruno Ais
3baeb4276d [ticket/10850] Changed the fopen mode to wb 
Changed the fopen mode from "wt" to "wb" as requested in the PR.
The objective behind this is to prevent writting stuff like "\r\r\n" in
windows

PHPBB3-10850
 2012-06-28 23:10:12 +02:00
Andreas Fischer
85ea062a05 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10935] Limit number of PM rules per user to 5000
 2012-06-21 10:31:08 +02:00
Andreas Fischer
80180a6a20 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10935] Limit number of PM rules per user to 5000
 2012-06-21 10:30:56 +02:00
Andreas Fischer
f1414386d7 Merge remote-tracking branch 'nickvergessen/ticket/10935' into prep-release-3.0.11 
* nickvergessen/ticket/10935:
  [ticket/10935] Limit number of PM rules per user to 5000
 2012-06-21 10:30:41 +02:00
Joas Schilling
c71f604327 [ticket/10942] Add a comment why we cast to sql_case() 
PHPBB3-10942
 2012-06-20 23:30:31 +02:00
Joas Schilling
80fafdeb1a [ticket/10935] Limit number of PM rules per user to 5000 
PHPBB3-10935
 2012-06-20 14:29:48 +02:00
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
Andreas Fischer
ba21be88f5 Merge remote-tracking branch 'callumacrae/ticket/10801' into develop 
* callumacrae/ticket/10801:
  [ticket/10801] Fixed quickmod tools.
 2012-06-20 10:49:46 +02:00
Andreas Fischer
38e261c955 Merge remote-tracking branch 'imkingdavid/ticket/10938' into develop 
* imkingdavid/ticket/10938:
  [ticket/10938] Serve subforum listing on forumlist from template loop
 2012-06-20 10:44:32 +02:00
Andreas Fischer
69ef2f55cc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:35 +02:00
Andreas Fischer
3e80268249 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:23 +02:00
Andreas Fischer
155c93d71a Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11 
* Noxwizard/ticket/10925:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:08 +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
Oleg Pudeyev
820ad818dd Merge PR #844 branch 'dhruvgoel92/ticket/10936' into develop 
* dhruvgoel92/ticket/10936:
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
 2012-06-19 19:51:39 -04: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
Callum Macrae
3f7d55a053 [ticket/10801] Fixed quickmod tools. 
Fixes 10801, 10802, 10807 and 10808.

PHPBB3-10801
 2012-06-19 17:28:30 +01: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
Patrick Webster
d26606f986 [ticket/10925] Clarify installation requirements for SQLite 
PHPBB3-10925
 2012-06-19 01:20:58 -05:00
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
David King
58a3342c3e [ticket/10938] Serve subforum listing on forumlist from template loop 
Subforum listing is available both via implode()-ed PHP loop and
via template loop. The latter allows more flexibility for changing
the subforum listing per style, so that is the better option.

PHPBB3-10938
 2012-06-18 12:26:28 -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
Dhruv Goel
96cb75dedb [ticket/10936] remove PCRE and mbstring support check 
Since PCRE UTF8 support already has a global check no need for mbstring
or PCRE check here.

PHPBB3-10936
 2012-06-13 01:43:32 +05:30
Dhruv Goel
e127ba17ea [ticket/10936] fix language key 
Language key changes from INCOMPATIBLE_VERSION to INCOMPATIBLE_DATABASE to
make it more meaningfull.

PHPBB3-10936
 2012-06-12 18:40:48 +05:30
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