mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
24,040 Commits 17 Branches 190 Tags
Commit Graph

24040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
7de0e17711 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:31:55 +02:00
Joas Schilling
90771c1762 Merge pull request #3024 from marc1706/ticket/13124 
[ticket/13124] Also trim spaces in front of comments except for first line
 2014-10-15 18:31:46 +02:00
Joas Schilling
e64c2b275d Merge branch 'develop-ascraeus' into develop 2014-10-15 18:29:43 +02:00
Joas Schilling
759950c1a6 Merge pull request #3036 from prototech/ticket/13177 
[ticket/13177] Fix display of post count-based ranks in viewtopic.
 2014-10-15 18:29:23 +02:00
Cesar G
5c54e96aab [ticket/13177] Fix display of post count-based ranks in viewtopic. 
PHPBB3-13177
 2014-10-14 15:24:57 -07:00
Cesar G
f8019464c7 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage
 2014-10-14 07:33:15 -07:00
Cesar G
df75b70f3e Merge remote-tracking branch 'PayBas/ticket/13174' into develop-ascraeus 
* PayBas/ticket/13174:
  [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage
 2014-10-14 07:32:54 -07:00
PayBas
9c4ba813d4 [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage 
PHPBB3-13174
 2014-10-14 10:08:48 +02:00
Tristan Darricau
1941328629 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13161] Check whether the schema exists, before deleting it
  [ticket/13161] Avoid problems when running tests with different migrations
 2014-10-10 15:56:31 +02:00
Tristan Darricau
29b54d12cc Merge pull request #3029 from nickvergessen/ticket/13161 
Ticket/13161 PHP Warnings issued from phpbb database test case

* nickvergessen/ticket/13161:
  [ticket/13161] Check whether the schema exists, before deleting it
  [ticket/13161] Avoid problems when running tests with different migrations
 2014-10-10 15:55:03 +02:00
Joas Schilling
1a04d15d4d [ticket/13161] Check whether the schema exists, before deleting it 
PHPBB3-13161
 2014-10-10 15:26:29 +02:00
Joas Schilling
f6fc8c08a4 [ticket/13161] Avoid problems when running tests with different migrations 
PHPBB3-13161
 2014-10-10 15:26:28 +02:00
Marc Alexander
a9ed32663a [ticket/13124] Add another test case as requested 
PHPBB3-13124
 2014-10-09 13:30:10 -04:00
Joas Schilling
9d6cef2225 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-07 22:12:37 +02:00
Joas Schilling
5b186c936d Merge branch 'prep-release-3.1.0-RC5' into develop-ascraeus 2014-10-07 22:11:14 +02:00
Joas Schilling
eed4d0d30f [prep-release-3.1.0-RC5] Update phpBB Version for RC6 development 2014-10-07 22:10:45 +02:00
Joas Schilling
366451c11c [prep-release-3.1.0-RC5] Add changelog for 3.1.0-RC5 release-3.1.0-RC5 2014-10-07 21:16:34 +02:00
Joas Schilling
9d13b91f46 [prep-release-3.1.0-RC5] Prepare Changelog 2014-10-07 21:14:55 +02:00
Joas Schilling
7f692e7b28 [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5 2014-10-07 21:12:06 +02:00
Joas Schilling
7137dc387a [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5 2014-10-07 21:10:14 +02:00
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
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