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

30350 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wesley Fok
3038bf5eaf [ticket/14638] Rollback changes from 3.2.x version 
Mistakenly brought in the modified 3.2.x version verbatim instead of diffing
against the 3.1.x version of ucp_main.php. Removed any changes I didn't
explicitly make.

PHPBB3-14638
 2016-08-03 13:27:06 -04:00
Wesley Fok
ba13832085 Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x 2016-08-03 13:20:42 -04:00
Wesley Fok
2081a78095 [ticket/14638] New UCP hooks for subscriptions 
Adds various event hooks to the Manage subscriptions page of the User
Control Panel. core.ucp_subscribed_post_data allows us to handle
additional post data from the form that unwatches subscriptions.
core.ucp_main_subscribed_forums_modify_query,
core.ucp_main_topiclist_count_modify_query and
core.ucp_main_topiclist_modify_query all modify the queries used to get
the list of subscribed forums and subscribed/bookmarked topics.
core.ucp_main_subscribed_forum_modify_template_vars and
core.ucp_main_topiclist_topic_modify_template_vars modify the template
variable array associated with each subscribed forum and topic row.

This is a backport to 3.1.x of the code in PR #4318.

PHPBB3-14638
 2016-08-03 13:18:43 -04:00
Jakub Senko
37880af03c [ticket/10809] Reflect MSSQL removal in docs files 
PHPBB3-10809
 2016-08-02 12:07:10 +02:00
Jakub Senko
c64b8102b7 [ticket/10809] Remove MSSQL support 
PHPBB3-10809
 2016-08-02 12:06:06 +02:00
Marc Alexander
da15d435bf Merge branch '3.2.x' 2016-08-01 20:42:16 +02:00
Marc Alexander
3d4660a703 Merge branch '3.1.x' into 3.2.x 2016-08-01 20:42:13 +02:00
Marc Alexander
f68820762b Merge pull request #4397 from Elsensee/ticket/14721 
[ticket/14721] Avoid renaming deleted users
 2016-08-01 20:42:09 +02:00
Oliver Schramm
f222f8a84a [ticket/14721] Avoid renaming deleted users 
PHPBB3-14721
 2016-08-01 00:26:47 +02:00
Marc Alexander
d51c67440e [ticket/14484] Properly enable extensions in UI tests 
PHPBB3-14484
 2016-07-31 20:08:58 +02:00
Erwan Nader
0cc41be3c0 [ticket/14727] Event core.search_modify_submit_parameters 
PHPBB3-14727
 2016-07-31 16:46:20 +02:00
Marc Alexander
4cd89dcda7 Merge branch '3.2.x' 2016-07-31 15:39:10 +02:00
Marc Alexander
bd1d734dcc Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
 2016-07-31 15:38:50 +02:00
Marc Alexander
4ac2547d62 Merge pull request #4301 from 3D-I/PHPBB3-14596 
[ticket/14596] Deny installation of Ascraeus under PHP 7
 2016-07-31 15:18:35 +02:00
Marc Alexander
ef132e1531 [ticket/14484] Move facebook/webdriver back to tests dir composer.json 
This will make sure we don't try to install it to incompatible PHP 5.3.3.

PHPBB3-14484
 2016-07-31 11:23:59 +02:00
Oliver Schramm
46045eb9b0 Merge branch '3.2.x' 2016-07-30 23:23:00 +02:00
Oliver Schramm
69d2bad929 Merge pull request #4395 from CHItA/ticket/14633 
[ticket/14633] Check for XML extension support on install
 2016-07-30 23:04:44 +02:00
Máté Bartus
61a147546d [ticket/14633] Check for XML extension support on install 
PHPBB3-14633
 2016-07-30 13:04:39 +02:00
Máté Bartus
832722417a Merge pull request #4350 from marc1706/ticket/14670 
[ticket/14670] Use symfony 3.x in master branch
 2016-07-29 17:51:50 +02:00
Máté Bartus
e9f28ea22c [ticket/14584] Change all to be removed tags to 4.0 
PHPBB3-14584
 2016-07-29 17:48:26 +02:00
Máté Bartus
54e5d41359 [ticket/14548] Move deprecated globals and functions 
PHPBB3-14584
 2016-07-29 17:48:00 +02:00
Andreas Fischer
ed2c8b5bf7 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:51 +02:00
Andreas Fischer
0dc13c720c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:51 +02:00
Andreas Fischer
55223e6840 Merge pull request #4336 from Senky/ticket/14652 
Fix typos in core.index_modify_birthdays_list vars descriptions

* Senky/ticket/14652:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:50 +02:00
Marc Alexander
29d2c66922 [ticket/14484] Move facebook webdriver to main composer.json 
Also updated ui test case file to have same feature set as
the 3.2.x version.

PHPBB3-14484
 2016-07-27 19:41:42 +02:00
Marc Alexander
224b0bb8d2 [ticket/14670] Set shared flag instead of defining prototype scope 
The prototype scope was deprecated in symfony 2.8 and removed in 3.0.

PHPBB3-14670
 2016-07-24 21:52:05 +02:00
Marc Alexander
402292cb07 [ticket/14670] Do not backup static attributes 
This seems to cause issues with the UI tests as the backed up
static web driver does not seem to be properly initialized.

PHPBB3-14670
 2016-07-24 19:30:02 +02:00
Marc Alexander
6d2a9805db Merge branch '3.2.x' 2016-07-24 19:15:53 +02:00
Marc Alexander
88db46946e Merge branch '3.1.x' into 3.2.x 2016-07-24 19:15:50 +02:00
Marc Alexander
941be83395 Merge pull request #4391 from VSEphpbb/ticket/14720 
[ticket/14720] Add "phpbb" as allowed global to jshintrc
 2016-07-24 19:15:48 +02:00
rxu
8e8e25cc1f [ticket/14703] Fix the docblock 
PHPBB3-14703
 2016-07-24 23:35:20 +07:00
Erwan Nader
e7289fa019 [ticket/14592] Fixed docblock from unit tests 
PHPBB3-14592
 2016-07-24 18:25:20 +02:00
Erwan Nader
5b501e594c [ticket/14592] Fixed syntax errors from unit tests 
PHPBB3-14592
 2016-07-24 18:10:45 +02:00
Erwan Nader
4eecc95a42 [ticket/14592] [PHP] core.search_backend_search_after 
PHPBB3-14592
 2016-07-24 17:46:23 +02:00
rxu
5eb493fa86 [ticket/14703] Fix existance checking if multiple parent module_langname found 
PHPBB3-14703
 2016-07-24 21:22:37 +07:00
Matt Friedman
43e0283fb1 [ticket/14720] Add "phpbb" as allowed global to jshintrc 
PHPBB3-14720
 2016-07-23 19:14:30 -07:00
rxu
8cf2790d55 [ticket/14703] Add test for the case multiple parent module_langname found 
PHPBB3-14703
 2016-07-24 02:31:44 +07:00
Marc Alexander
e1f9c946ef [ticket/14670] Modify service definition for RouterListener 
PHPBB3-14670
 2016-07-23 17:54:45 +02:00
Marc Alexander
d66e8cba23 [ticket/14670] Fix typo in .travis.yml 
PHPBB3-14670
 2016-07-23 17:13:54 +02:00
Marc Alexander
74abce31bc [ticket/14670] Remove usage of prototype scope in tests 
In this specific case, the mock container builder is used which does not
even support setting the scope.

PHPBB3-14670
 2016-07-23 17:13:54 +02:00
Marc Alexander
b93bdfb1c3 [ticket/14670] Add new travis builds and PHP 5.5 requirement 
PHPBB3-14670
 2016-07-23 17:13:54 +02:00
Marc Alexander
42b6dc38c5 [ticket/14670] Fix incompatibilities with container definitions 
PHPBB3-14670
 2016-07-23 17:13:54 +02:00
Marc Alexander
59a228f7cd [ticket/14670] Use symfony 3.1 in master branch 
Removed sami as it doesn't have a version compatible
with symfony 3.x.

PHPBB3-14670
 2016-07-23 17:13:54 +02:00
Máté Bartus
96617e8e46 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14717] Quote strings beginning with @ or % in yaml definitions
 2016-07-23 16:57:56 +02:00
Máté Bartus
4ad0c3e903 Merge pull request #4390 from marc1706/ticket/14717 
[ticket/14717] Quote strings beginning with @ or % in yaml definitions
 2016-07-23 16:56:45 +02:00
rxu
eaafb758ce [ticket/14703] Select the parent module id from the several found 
PHPBB3-14703
 2016-07-23 21:34:05 +07:00
Marc Alexander
89461d982c [ticket/14717] Quote strings beginning with @ or % in yaml definitions 
This type of use was deprecated in symfony 2.8 and will be dropped in 3.x.
Also see: https://github.com/symfony/symfony/pull/16285

PHPBB3-14717
 2016-07-23 16:23:42 +02:00
kasimi
33cd613406 [ticket/14715] Converted tabs to spaces 
PHPBB3-14715
 2016-07-22 12:17:15 +02:00
Marc Alexander
0628735f57 Merge branch '3.2.x' 2016-07-21 22:05:23 +02:00
Marc Alexander
4554c030c0 Merge pull request #4388 from JoshyPHP/ticket/14700 
[ticket/14700] Prevent an exception on duplicate smilies in text_formatter
 2016-07-21 22:05:19 +02:00