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

25443 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
 2014-10-07 20:30:40 +02:00
Andreas Fischer
63bdd193e0 Merge pull request #3027 from nickvergessen/ticket/13137 
[ticket/13137] Remove schema.json from repository

* nickvergessen/ticket/13137:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
 2014-10-07 20:30:40 +02:00
PayBas
66ecbd8545 [ticket/12530] Fix captcha challange image breaking responsive layout 
PHPBB3-12530
 2014-10-07 18:30:20 +02:00
Joas Schilling
d64a515476 [ticket/13137] Create schema.json in build script 
PHPBB3-13137
 2014-10-07 17:18:00 +02:00
Joas Schilling
34a9ed3587 [ticket/13137] Improve output of create_schema_files.php 
PHPBB3-13137
 2014-10-07 17:17:59 +02:00
Joas Schilling
ba1776d6a9 [ticket/13137] Add schema.json file to .gitignore 
PHPBB3-13137
 2014-10-07 16:33:26 +02:00
Joas Schilling
4fe95d6870 [ticket/13137] Generate the schema when the schema.json file is not available 
PHPBB3-13137
 2014-10-07 14:55:08 +02:00
Joas Schilling
943f2e1a7b [ticket/13137] Remove schema.json file 
PHPBB3-13137
 2014-10-07 14:55:05 +02:00
Nils Adermann
c8c50b3c89 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13136] Update schema.json with latest changes
 2014-10-07 13:58:12 +02:00
Nils Adermann
c77d6f39f2 Merge pull request #3026 from nickvergessen/ticket/13136 
[ticket/13136] Update schema.json with latest changes
 2014-10-07 13:57:31 +02:00
Joas Schilling
7bd5c793bb [ticket/13136] Update schema.json with latest changes 
PHPBB3-13136
 2014-10-07 13:14:33 +02:00
Joas Schilling
202e43b11b Merge branch 'develop-ascraeus' into develop 2014-10-07 11:42:05 +02:00
Joas Schilling
61601a052c Merge pull request #2942 from Senky/ticket/12489 
[ticket/12489] Description for Contact link in custom profile fields
 2014-10-07 11:41:47 +02:00
Jakub Senko
0c0024497d [ticket/12489] Language correction 
PHPBB3-12489
 2014-10-07 10:24:30 +02:00
Andreas Fischer
441db59db0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12987] Cleanup the services.yml file

Conflicts:
	phpBB/config/services.yml
 2014-10-07 00:52:00 +02:00
Andreas Fischer
46a9e5657f Merge pull request #3002 from Nicofuma/ticket/12987 
[ticket/12987] Cleanup the services.yml file

* Nicofuma/ticket/12987:
  [ticket/12987] Cleanup the services.yml file
 2014-10-07 00:51:11 +02:00
Joas Schilling
1fa0c861b7 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:45:18 +02:00
Joas Schilling
4b90357d79 Merge pull request #2307 from PayBas/ticket/12408 
[ticket/12408] Add quick setting for "default guest style" to ACP
 2014-10-06 23:43:27 +02:00
Andreas Fischer
01e200d49a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13077] Move extension module to the top of the Customise tab
 2014-10-06 23:35:35 +02:00
Andreas Fischer
38ac0bcc8e Merge pull request #2991 from nickvergessen/ticket/13077 
[ticket/13077] Move extension module to the top of the Customise tab

* nickvergessen/ticket/13077:
  [ticket/13077] Move extension module to the top of the Customise tab
 2014-10-06 23:35:35 +02:00
Joas Schilling
8d9e6653b4 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:21:35 +02:00
Joas Schilling
b300e06226 Merge branch 'develop-olympus' into develop-ascraeus 2014-10-06 23:21:19 +02:00
Joas Schilling
f3eaf6fe04 Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus 
[ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined
 2014-10-06 23:21:13 +02:00
Joas Schilling
a12a7d0b90 Merge pull request #2460 from Nicofuma/ticket/11224 
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
 2014-10-06 23:20:50 +02:00
Joas Schilling
af530b65ce Merge branch 'develop-ascraeus' into develop 2014-10-06 22:38:12 +02:00
Joas Schilling
7479c61d05 Merge pull request #2828 from brunoais/ticket/12930 
[ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
 2014-10-06 22:37:48 +02:00
Joas Schilling
a3221e21bf Merge branch 'develop-ascraeus' into develop 2014-10-06 22:25:57 +02:00
Joas Schilling
3c91fbeaa6 Merge pull request #2827 from brunoais/ticket/12929 
[ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
 2014-10-06 22:25:08 +02:00
Joas Schilling
1ed3eb7b0b Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2014-10-06 22:22:05 +02:00
Joas Schilling
2f2a306994 Merge pull request #3019 from Senky/ticket/13025 
[ticket/13025] Add template events for buttons on viewforum and viewtopic
 2014-10-06 22:20:16 +02:00
Joas Schilling
084adc61bc Merge branch 'develop-ascraeus' into develop 2014-10-06 22:12:38 +02:00
Joas Schilling
6c284060d7 Merge pull request #3025 from rxu/ticket/13134 
[ticket/13134] Add core event to the root of the function display_forums()
 2014-10-06 22:10:33 +02:00
rxu
1e8735eac1 [ticket/13134] Add core event to the root of the function display_forums() 
PHPBB3-13134
 2014-10-07 01:47:01 +08:00
Marc Alexander
7bcf6a621f [ticket/13124] Fix tests for event exporter 
PHPBB3-13124
 2014-10-06 16:53:41 +02:00
Marc Alexander
825af557ae [ticket/13124] Also trim spaces in front of comments except for first line 
PHPBB3-13124
 2014-10-06 16:09:56 +02:00
Nils Adermann
b354afdeb4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
 2014-10-06 02:08:39 +02:00
Nils Adermann
5e86c89989 Merge pull request #3017 from nickvergessen/ticket/13033 
[ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
 2014-10-06 02:07:52 +02:00
Andreas Fischer
d37f196d33 Merge pull request #3020 from Nicofuma/ticket/13130 
[ticket/13130] Updates dependencies to Symfony 2.5

* Nicofuma/ticket/13130:
  [ticket/13130] Fix tests
  [ticket/13130] Updates dependencies to Symfony 2.5
 2014-10-05 23:39:14 +02:00
Tristan Darricau
a712d8a3b3 [ticket/13130] Fix tests 
PHPBB3-13130
 2014-10-05 19:18:19 +02:00
Marc Alexander
f1d37b52fb Merge branch 'develop-ascraeus' into develop 2014-10-05 15:25:13 +02:00
Marc Alexander
ce4cb9c917 Merge pull request #3022 from Nicofuma/ticket/12368 
[ticket/12368] Always clean the cache prior to run the migrations
 2014-10-05 15:00:40 +02:00
Tristan Darricau
bda6879305 [ticket/12368] Always clean the cache prior to run the migrations 
PHPBB3-12368
 2014-10-05 12:25:14 +02:00
Tristan Darricau
03a1c7ed2e [ticket/13130] Updates dependencies to Symfony 2.5 
PHPBB3-13130
 2014-10-04 21:16:12 +02:00
Jakub Senko
608d3f4d8d [ticket/13025] Correct events in subsilver2 viewforum_body 
PHPBB3-13025
 2014-10-04 11:38:21 +02:00
Jakub Senko
51ece03612 [ticket/13025] Make RC uppercase 
PHPBB3-13025
 2014-10-04 10:36:45 +02:00
Andreas Fischer
c8a1826823 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13125] $user->browser to $browser
 2014-10-04 00:41:25 +02:00
Andreas Fischer
682527f509 Merge pull request #3018 from Senky/ticket/13125 
[ticket/13125] Uploaded avatars are not displayed

* Senky/ticket/13125:
  [ticket/13125] $user->browser to $browser
 2014-10-04 00:41:25 +02:00
Tristan Darricau
5354c46e01 [ticket/11224] Updates tests 
PHPBB3-11224
 2014-10-03 23:51:16 +02:00
Tristan Darricau
8e638dbf6d [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224" 
This reverts commit 40cd7570e6.
 2014-10-03 23:50:24 +02:00
Jakub Senko
a0673f8e10 [ticket/13025] rc4 -> rc5 
PHPBB3-13025
 2014-10-03 13:18:41 +02:00