Oleg Pudeyev
d9fd0cce0a
Merge PR #759 branch 'nickvergessen/ticket/10811' into develop
...
* nickvergessen/ticket/10811:
[ticket/10811] Make toogle_subscribe more generic so it can toogle all links
[ticket/10811] Make it easier for MODs/Extensions to define the alt-text
[ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
[ticket/10811] Fix AJAX callback alt_text so it can be repeated.
2012-07-05 10:44:48 -04:00
Andreas Fischer
c54d74ec0e
Merge remote-tracking branch 'Fyorl/ticket/10963' into develop
...
* Fyorl/ticket/10963:
[ticket/10963] filespec::get_mimetype now used
[ticket/10963] Removed superfluous ternary statement and strpos now stricter
[ticket/10963] Modified filespec::is_image() to check actual mimetype
2012-07-05 02:00:31 +02:00
Joas Schilling
f1056a9b2f
[ticket/10811] Make toogle_subscribe more generic so it can toogle all links
...
PHPBB3-10811
2012-07-05 01:03:19 +02:00
Fyorl
4fbcf4eaad
[ticket/10963] filespec::get_mimetype now used
...
filespec::get_mimetype now uses the finfo class in order to detect the
mimetype of a given filename. filespec::is_image() now uses this method.
PHPBB3-10963
2012-07-04 13:27:55 +01:00
Andreas Fischer
2c12f31cdf
[ticket/10937] Update documentation to say which comment styles are removed.
...
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Andreas Fischer
81d5327e44
[ticket/10937] Comment removal functions: Restore backward compatibility
...
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Fyorl
f208b59c59
[ticket/10963] Removed superfluous ternary statement and strpos now stricter
...
PHPBB3-10963
2012-07-02 23:49:40 +01:00
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
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
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
80fafdeb1a
[ticket/10935] Limit number of PM rules per user to 5000
...
PHPBB3-10935
2012-06-20 14:29:48 +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
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
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
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