1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00

23758 Commits

Author SHA1 Message Date
brunoais
b3bcc1b501 [ticket/13146] Missing delete post test mock
PHPBB3-13146
2015-01-02 19:26:05 +00:00
brunoais
8376a027a1 [ticket/13146] Setup mocks for tests with dispatcher
PHPBB3-13146
2015-01-02 11:46:03 +00:00
brunoais
abc5dbcd71 [ticket/13146] Realign variables and descriptions in event
PHPBB3-13146
2014-12-29 08:42:13 +00:00
brunoais
59ab09273f [ticket/13146] Improved $get_forums_visibility_sql_overwrite's clarity
PHPBB3-13146
2014-12-29 08:40:23 +00:00
brunoais
bfecae1d60 [ticket/13146] Forgot delete_post_test.php
PHPBB3-13146
2014-12-03 15:43:27 +00:00
brunoais
1c02f7e032 [ticket/13146] Adding required tests modifications for the new constructor
PHPBB3-13146
2014-12-03 15:10:32 +00:00
brunoais
f045744606 [ticket/13146] FIxed wrong order in config/content.yml
PHPBB3-13146
2014-12-03 14:26:25 +00:00
brunoais
10a4f79135 [ticket/13146] Fixed variable name for the override
PHPBB3-13146
2014-12-03 14:00:00 +00:00
brunoais
4159bb1340 [ticket/13146] Wrong usage of tabs in .yml
PHPBB3-13146
2014-12-03 13:56:50 +00:00
brunoais
ac8a4b05b4 [ticket/13146] Fixing what merging broke
Merging added content I didn't expect it to add. This fixes back to what it is supposed to be.

PHPBB3-13146
2014-12-03 13:55:53 +00:00
brunoais
80a7f6930c [ticket/13146] Adding eventDispatcher to the list
PHPBB3-13146
2014-12-03 13:55:53 +00:00
brunoais
614f975e68 [ticket/13146] $contentReplaced -> $content_replaced
PHPBB3-13146
2014-12-03 13:55:52 +00:00
brunoais
df3447b725 [ticket/13146] Extra line for clarity
Added an extra line after the "if ($contentReplaced)"  to help reading the code

PHPBB3-13146
2014-12-03 13:55:52 +00:00
brunoais
e9cb9baedb [ticket/13146] $phpbb_dispatcher was missing
Added $phpbb_dispatcher to the globals list for this function.

PHPBB3-13146
2014-12-03 13:55:51 +00:00
brunoais
e279a779fc [ticket/13146] Typo on the returning variable
PHPBB3-13146
2014-12-03 13:55:50 +00:00
brunoais
e596d0b6ce [ticket/13147] Adding $approve_forums to the list of the event's variables
PHPBB3-13147
2014-12-03 13:55:50 +00:00
brunoais
0388d82504 [ticket/13146] Adding $content_replaced to allow even more flexibility
PHPBB3-13146
2014-12-03 13:55:49 +00:00
brunoais
909bb523bf [ticket/13146] Allow changing the result of calling get_forums_visibility_sql
PHPBB3-13146
2014-12-03 13:55:48 +00:00
Tristan Darricau
70483d6088 Merge pull request #3204 from rxu/ticket/13405
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php

* rxu/ticket/13405:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
2014-11-30 19:07:14 +01:00
rxu
499c1467df [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
PHPBB3-13405
2014-11-30 11:27:47 +07:00
Joas Schilling
ac8b07ddd9 Merge pull request #3192 from Elsensee/ticket/13393
[ticket/13393] Call user->lang function directly
2014-11-29 09:08:51 +01:00
Joas Schilling
8f1a1874a9 Merge pull request #3194 from Nicofuma/ticket/13381
[ticket/13381] Allow ' *' in the doc blocks (especially the header files)
2014-11-28 19:58:56 +01:00
Tristan Darricau
79ce924bc1 [ticket/13381] Allow ' *' in the doc blocks (especially the header files)
PHPBB3-13381
2014-11-27 11:20:26 +01:00
Tristan Darricau
d43e8c94f5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:39:11 +01:00
Tristan Darricau
b54dbe0df6 Merge pull request #3188 from marc1706/ticket/11613
[ticket/11613] Allow cookies for domains without dots

* marc1706/ticket/11613:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:38:45 +01:00
Cesar G
79a1495f66 Merge remote-tracking branch 'Prosk8er/ticket/13391' into develop-ascraeus
* Prosk8er/ticket/13391:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
2014-11-26 18:43:24 -08:00
Oliver Schramm
893e4b3067 [ticket/13393] Call user->lang function directly
PHPBB3-13393
2014-11-27 00:55:01 +01:00
Prosk8er
a5a18fb6dd [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
PHPBB3-13391
2014-11-26 14:09:07 -05:00
Jakub Senko
b67b67f2df [ticket/11613] Allow cookies to work on netbios domains
PHPBB3-11613
2014-11-26 14:58:33 +01:00
Marc Alexander
ee90d227c2 Merge pull request #3187 from Nicofuma/ticket/13362
[ticket/13362] Fix cache paths in .gitignore
2014-11-26 13:37:02 +01:00
Marc Alexander
51f46a8f91 Merge pull request #3185 from Nicofuma/ticket/13389
[ticket/13389] Replace pattern with path
2014-11-26 13:30:03 +01:00
Marc Alexander
6ac088ea2f Merge pull request #3075 from Senky/ticket/11613
[ticket/11613] Cookies do not work for netbios domain
2014-11-26 13:20:36 +01:00
Tristan Darricau
6a4179cef5 [ticket/13362] Fix cache paths in .gitignore
PHPBB3-13362
2014-11-26 12:38:02 +01:00
Tristan Darricau
90012c86e8 [ticket/13389] Replace pattern with path
PHPBB3-13389
2014-11-26 12:24:50 +01:00
Marc Alexander
aa3a46a35f Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeus 2014-11-25 23:15:03 +01:00
Joas Schilling
2e7ae40d49 Merge pull request #3183 from Nicofuma/ticket/13362
[ticket/13362] Ignore the whole cache directory in git
2014-11-25 22:45:23 +01:00
Joas Schilling
eb83bd5797 [ticket/13381] Fix header intendation of v312.php
PHPBB3-13381
2014-11-25 22:42:52 +01:00
Tristan Darricau
f46057ca02 [ticket/13362] Ignore the whole cache directory in git
PHPBB3-13362
2014-11-25 18:00:07 +01:00
Joas Schilling
f4898b9258 Merge branch 'prep-release-3.1.2' into develop-ascraeus 2014-11-25 16:44:57 +01:00
Joas Schilling
9c9623e47f [prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev 2014-11-25 16:43:43 +01:00
Joas Schilling
1ad0dd28f1 Merge branch 'develop-olympus' into prep-release-3.1.2 release-3.1.2 2014-11-25 16:36:32 +01:00
Joas Schilling
ff9b541070 Merge pull request #3180 from naderman/ticket/13376
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
2014-11-25 16:36:18 +01:00
Nils Adermann
965042d015 [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
Also introduce a clear cookie message hardcoded just in case.

PHPBB3-13376
2014-11-25 15:57:12 +01:00
Joas Schilling
9264d7c758 [prep-release-3.1.2] Update Changelog with 13376 2014-11-25 15:44:39 +01:00
Joas Schilling
0fbe8e8e69 [prep-release-3.1.2] Add migration to update version to 3.1.2 2014-11-24 21:32:17 +01:00
Joas Schilling
3862b60094 [prep-release-3.1.2] Increase version number to 3.1.2 2014-11-24 21:31:49 +01:00
Joas Schilling
5f3dffa820 [prep-release-3.1.2] Add changelog for 3.1.2-RC1 release-3.1.2-RC1 2014-11-22 19:35:24 +01:00
Joas Schilling
18d5ca9ce5 [prep-release-3.1.2] Prepare Changelog 2014-11-22 19:32:36 +01:00
Joas Schilling
dcd0f200d6 [prep-release-3.1.2] Add migration for 3.1.2-RC1 2014-11-22 19:27:34 +01:00
Joas Schilling
a5b3393bb0 [prep-release-3.1.2] Update version to 3.1.2-RC1 2014-11-22 19:22:40 +01:00