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

1894 commits

Author SHA1 Message Date
Marc Alexander
a08b078440 Merge branch '3.2.x' 2016-08-28 15:54:33 +02:00
Marc Alexander
a2838ad0b1 Merge branch '3.1.x' into 3.2.x 2016-08-28 15:54:11 +02:00
Marc Alexander
a019a86bfc Merge pull request #4338 from Senky/ticket/14469 
Add viewforum_body_topicrow_before template event
 2016-08-28 15:53:30 +02:00
Marc Alexander
a78a334a0d Merge branch '3.2.x' 2016-08-28 15:45:10 +02:00
Marc Alexander
7c79e7844c Merge branch '3.1.x' into 3.2.x 2016-08-28 15:44:49 +02:00
Marc Alexander
71a70500ea Merge pull request #4389 from kasimi/ticket/14715-3.1.x 
[ticket/14715] Add template events in posting_topic_review & mcp_topic
 2016-08-28 15:41:59 +02:00
Jakub Senko
317f3e848f [ticket/14469] Add viewforum_body_topicrow_before template event 
PHPBB3-14469
 2016-08-11 10:25:51 +02:00
Marc Alexander
81f0d912b0 Merge branch '3.2.x' 2016-08-03 22:21:47 +02:00
Marc Alexander
6cc4d78ebf Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
 2016-08-03 22:21:25 +02:00
Marc Alexander
5330ea0f09 Merge pull request #4324 from Senky/ticket/14516 
[ticket/14516] Add memberlist_email_before event
 2016-08-03 22:20:48 +02:00
kasimi
33cd613406 [ticket/14715] Converted tabs to spaces 
PHPBB3-14715
 2016-07-22 12:17:15 +02:00
kasimi
20e08aa2a0 [ticket/14715] Fixed typos in events.md 
PHPBB3-14715
 2016-07-21 17:49:35 +02:00
kasimi
da7c41f167 [ticket/14715] Add template events in posting_topic_review & mcp_topic 
The events will allow adding content before and after the post details
in topic review and topic moderation.

PHPBB3-14715
 2016-07-21 17:48:42 +02:00
Jakub Senko
775df0eb8a [ticket/14516] Add memberlist_email_before event 
PHPBB3-14516
 2016-07-17 20:43:40 +02:00
Marc Alexander
cff33d6c39 Merge branch '3.2.x' 2016-07-17 17:52:09 +02:00
Marc Alexander
4e480d46f5 Merge pull request #4311 from Crizz0/ticket/14620 
[ticket/14620] Change docs/ and files to 3.2.x
 2016-07-17 17:52:05 +02:00
Crizzo
95124db4c9 Merge branch '3.2.x' 2016-07-16 23:45:54 +02:00
Marc Alexander
6f1b635992 [ticket/14506] Remove subsilver2 from docs/events.md 
PHPBB3-14506
 2016-07-16 22:50:37 +02:00
Marc Alexander
1c20bc33a5 Merge branch '3.2.x' 2016-07-16 21:25:53 +02:00
Marc Alexander
019e85d064 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_move.html
 2016-07-16 21:25:17 +02:00
Marc Alexander
b54aa81cdd Merge pull request #4337 from Senky/ticket/14506 
Add mcp_move_before template event
 2016-07-16 21:24:33 +02:00
Crizzo
c9cfde7837 [ticket/14620] Adds link to Translations forum 
PHPBB3-14620
 2016-07-14 20:23:46 +02:00
Marc Alexander
113738fce9 Merge branch '3.2.x' 2016-07-07 19:20:42 +02:00
Marc Alexander
45ba2e9770 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
 2016-07-07 19:19:40 +02:00
Marc Alexander
55b854906d Merge pull request #4342 from Senky/ticket/14654 
[ticket/14654] Change Imagemagick to ImageMagick
 2016-07-07 19:15:33 +02:00
Tristan Darricau
f9d251943b
Merge branch '3.2.x' 
* 3.2.x:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
 2016-06-27 21:56:21 +02:00
Tristan Darricau
dbf02b4514
Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x 
* upstream/prep-release-3.2.0-RC1:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
 2016-06-27 21:54:41 +02:00
Crizzo
63b902c2f9 [ticket/14620] Changes specific update-support to general: <=beta to >=RC1 
PHPBB3-14620
 2016-06-21 20:18:15 +02:00
Marc Alexander
155d24107a Merge branch '3.2.x' 
Conflicts:
	phpBB/composer.lock
 2016-06-20 21:24:46 +02:00
Marc Alexander
597e7163c0 Merge pull request #4233 from VSEphpbb/ticket/14547 
[ticket/14547] Add Vagrant support to phpBB
 2016-06-20 21:22:34 +02:00
Matt Friedman
d5e342db3a [ticket/14547] Fix Docs and increase PHP memory limit 
PHPBB3-14547
 2016-06-19 09:40:51 -07:00
Marc Alexander
a6863249a1 Merge branch '3.2.x' 2016-06-19 18:07:55 +02:00
Marc Alexander
450e5b36b8 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html
 2016-06-19 18:07:29 +02:00
Tristan Darricau
e8c6a3aa0a
[prep-release-3.2.0-RC1] Update changelog 2016-06-19 18:01:48 +02:00
Richard McGirr
e9cbb45435 [ticket/14672] Change event name add to events.md 
PHPBB3-14672
 2016-06-13 06:26:55 -04:00
Jakub Senko
7dc1af25bc [ticket/14654] Change Imagemagick to ImageMagick 
PHPBB3-14654
 2016-06-11 21:32:16 +02:00
Crizzo
25ae8876b6 [ticket/14620] Adds section update from 3.0/3.1 to 3.2 
PHPBB3-14620
 2016-06-08 22:06:01 +02:00
Crizzo
797565dfa7 [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2date 
PHPBB3-14620
 2016-06-08 21:45:52 +02:00
Crizzo
800b7be873 [ticket/14620] Updates section 4.i. Full package to 3.2.0 
PHPBB3-14620
 2016-06-08 20:29:17 +02:00
Jakub Senko
6350798e97 [ticket/14506] Add mcp_move_before template event 
PHPBB3-14506
 2016-05-29 11:41:54 +02:00
Crizzo
85fdff8230 [ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.html 
PHPBB3-14620
 2016-05-24 22:44:07 +02:00
Tristan Darricau
ddcd458167
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14595] Added smtp_port where places where smtp_host exists. PHPBB3-14595
  [ticket/14595] Added SMTP port to getConfigTreeBuilder PHPBB3-14595
 2016-05-15 10:20:38 +02:00
Derek Held
9c34594bc3 [ticket/14595] Added smtp_port where places where smtp_host exists. 
PHPBB3-14595
 2016-05-14 09:19:26 -07:00
Crizzo
96973a7cec [ticket/14620] Changes 3.1 to 3.2 links in FAQ.html 
PHPBB3-14620
 2016-05-14 15:26:05 +02:00
Crizzo
42053efb51 [ticket/14620] Readme.html installing phpBB, 2.i, 3.i, 5. and issues 
PHPBB3-14620
 2016-05-14 15:13:14 +02:00
Crizzo
2ca49e02b4 [ticket/14620] Start to change install.html to 3.2.0 usage. 
PHPBB3-14620
 2016-05-02 22:41:44 +02:00
Tristan Darricau
c43fabf502
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea
 2016-05-02 21:19:58 +02:00
Crizzo
e9b7cb1324 [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea 
PHPBB3-14619
 2016-05-01 22:31:39 +02:00
Tristan Darricau
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:58:16 +02:00
Tristan Darricau
6949ee162d
erge branch 'prep-release-3.2.0-b2' 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:51:23 +02:00