mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Code Issues Releases Wiki Activity
20,461 Commits 10 Branches 193 Tags
15dfa9bba2556e93c899e7266168bfe4fea9ed3b
Commit Graph

20461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
120aa3685f [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2 release-3.1.0-b2 2014-03-30 22:14:54 +02:00
Joas Schilling
d81c5437d1 [prep-release-3.1.0-b2] Prepare Changelog 2014-03-30 22:08:12 +02:00
Joas Schilling
fdbe5e2f42 [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 2014-03-30 22:08:11 +02:00
Joas Schilling
254b7739a8 [prep-release-3.1.0-b2] Update version to 3.1.0-b2 2014-03-30 22:08:10 +02:00
David King
acb4d90371 Merge remote-tracking branch 'nickvergessen/ticket/12326' into develop-ascraeus 
* nickvergessen/ticket/12326:
  [ticket/12326] Correctly format update/index.php and remove php closing tag
  [ticket/12326] Do not add deleted files to the list of changed files
 2014-03-30 16:03:11 -04:00
Joas Schilling
1a6dc6e767 Merge remote-tracking branch 'Elsensee/ticket/12330' into develop-ascraeus 
* Elsensee/ticket/12330:
  [ticket/12330] Fix create index in db tools on mssql
 2014-03-30 19:24:11 +02:00
Crizzo
fa6c1044b8 [ticket/9758] Clickable avatar in header and renamed class for avatar-img 
PHPBB3-9758
 2014-03-30 19:13:14 +02:00
Andreas Fischer
297729aa32 [ticket/12318] Use MySQL instead of MySQLi for now on HHVM. 
PHPBB3-12318
 2014-03-30 15:43:55 +02:00
Andreas Fischer
e1be4943d8 [ticket/12318] Pin HHVM version to 3.0.0~precise. 
PHPBB3-12318
 2014-03-30 15:43:55 +02:00
Andreas Fischer
d53c411d90 [ticket/12318] Always install new config file on HHVM upgrade conflict. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Andreas Fischer
a53312636a [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Andreas Fischer
672eab3a9c [ticket/12318] Upgrade to a recent stable version of HHVM. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Andreas Fischer
04707cbf8d [ticket/12318] Correctly setup HHVM for functional tests. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Oliver Schramm
55c1b49bed [ticket/12330] Fix create index in db tools on mssql 
PHPBB3-12330
 2014-03-30 15:42:04 +02:00
Andreas Fischer
570aab34f5 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
 2014-03-30 15:40:42 +02:00
Andreas Fischer
dc3cb2205b Merge remote-tracking branch 'VSEphpbb/ticket/12316' into develop-olympus 
* VSEphpbb/ticket/12316:
  [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
 2014-03-30 15:40:30 +02:00
Andreas Fischer
4346fbee4d Merge pull request #2198 from n-aleha/ticket/12321 
[ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png

* n-aleha/ticket/12321:
  [ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png
 2014-03-30 15:37:16 +02:00
Joas Schilling
badb16e68e [ticket/12326] Correctly format update/index.php and remove php closing tag 
PHPBB3-12326
 2014-03-30 15:09:35 +02:00
Joas Schilling
b8cb407da9 [ticket/12326] Do not add deleted files to the list of changed files 
PHPBB3-12326
 2014-03-30 14:57:12 +02:00
n-aleha
eefc652220 [ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png 
PHPBB3-12321
 2014-03-30 14:29:56 +03:00
Joas Schilling
3e909711d2 Merge remote-tracking branch 'Elsensee/ticket/12324' into develop-ascraeus 
* Elsensee/ticket/12324:
  [ticket/12324] Correctly create di container if config/ is missing from update/
 2014-03-30 13:22:44 +02:00
Marc Alexander
1812d3ce99 [ticket/12150] Update schema files for prune shadow topics 
PHPBB3-12150
 2014-03-30 13:06:18 +02:00
PayBas
39398dec1b [ticket/12329] Add <div> container to index blocks (stats, etc.) 
PHPBB3-12329
 2014-03-30 12:58:30 +02:00
Marc Alexander
a7c037520b Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ticket/12150 2014-03-30 12:35:40 +02:00
PayBas
b7c77952a4 [ticket/12328] Add Template Event index_body_stat_blocks_after 
PHPBB3-12328
 2014-03-30 12:07:44 +02:00
Matt Friedman
a6b988c844 [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md 
PHPBB3-12316
 2014-03-30 00:07:08 -07:00
Oliver Schramm
df5761b370 [ticket/12324] Correctly create di container if config/ is missing from update/ 
PHPBB3-12324
 2014-03-29 23:02:37 +01:00
Marc Alexander
494dd4110b [ticket/12150] Use log service instead of add_log() function 
PHPBB3-12150
 2014-03-29 22:16:25 +01:00
Marc Alexander
d83d819827 [ticket/12150] Use shorter column names for prune settings 
All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.

PHPBB3-12150
 2014-03-29 22:14:58 +01:00
Marc Alexander
5866f08919 [ticket/12150] Add functional tests for pruning shadow topics 
PHPBB3-12150
 2014-03-29 21:57:19 +01:00
Marc Alexander
76b7355b87 [ticket/12150] Add missing space to query for shadow topics 
PHPBB3-12150
 2014-03-29 21:57:09 +01:00
Marc Alexander
d97c58aeea [ticket/12150] Add missing prune settings variables in acp_forums 
PHPBB3-12150
 2014-03-29 21:57:00 +01:00
Marc Alexander
02fdae4e88 [ticket/12150] Add file and caller for pruning shadow topics 
PHPBB3-12150
 2014-03-29 21:56:53 +01:00
Marc Alexander
a7abf8218d [ticket/12150] Add prune columns to schema files and migration file 
PHPBB3-12150
 2014-03-29 21:56:14 +01:00
Nils Adermann
8442f2239d Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into develop-ascraeus 
* github-nickvergessen/ticket/11459:
  [ticket/11459] 3.0.1-RC1 should depend on 3.0.0 migration
 2014-03-29 16:53:09 -04:00
Marc Alexander
3c7ff1c417 [ticket/12150] Add options to acp 
PHPBB3-12150
 2014-03-29 21:49:31 +01:00
Joas Schilling
1497cb0b3c [ticket/11459] 3.0.1-RC1 should depend on 3.0.0 migration 
PHPBB3-11459
 2014-03-29 21:48:23 +01:00
Matt Friedman
c674de6a32 [ticket/12043] Fix order of disabled extensions in unit tests 
PHPBB3-12043
 2014-03-29 13:35:08 -07:00
Nils Adermann
308e8b0c96 Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into develop-ascraeus 
* github-nickvergessen/ticket/11459: (21 commits)
  [ticket/11459] Make 3.1.0-dev migration depend on migrations_table
  [ticket/11459] Move $supported_dbms to beginning of create schema file
  [ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index()
  [ticket/11459] Fix auth provider test
  [ticket/11459] Correctly set up the database from schema in unit tests
  [ticket/11459] Install DB schema from json file
  [ticket/11459] Clean up a little more
  [ticket/11459] Do not add table schema to database schema files
  [ticket/11459] Create schema.json from migration files
  [ticket/11459] Do not take files of extensions into account
  [ticket/11459] Pass array with migration class names to schema generator
  [ticket/11459] Refresh schema files
  [ticket/11459] Remove spaces from the end of lines in MSSQL
  [ticket/11459] Correctly handle index column length
  [ticket/11459] Add migration for migrations table
  [ticket/11459] Update doc blocks
  [ticket/11459] Remove old schema file
  [ticket/11459] Update schema files with new script
  [ticket/11459] Use new migration/schema_generator to create schema files
  [ticket/11459] Add Schema from 3.0.0
  ...
 2014-03-29 16:29:33 -04:00
Joas Schilling
8824a53b0a [ticket/11459] Make 3.1.0-dev migration depend on migrations_table 
PHPBB3-11459
 2014-03-29 21:16:23 +01:00
Joas Schilling
f426fa0295 Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeus 
* prototech/ticket/11959:
  [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
  [ticket/11959] Add unit tests.
  [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
  [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
  [ticket/11959] Simplify how the users are trimmed.
  [ticket/11959] Add function to create a string list.
  [ticket/11959] Add samples for the untrimmed strings.
  [ticket/11959] List the last user with "and" instead of a comma.
  [ticket/11959] Use the plurals system for the untrimmed language strings.
  [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
  [ticket/11959] Use plurals for the language strings.
 2014-03-29 20:39:22 +01:00
PayBas
1b922f2c64 [ticket/12322] CSS classes for postprofile-profile <dd> items 
There is no subsilver2 equivalent for this commit

PHPBB3-12322
 2014-03-29 19:15:17 +01:00
Matt Friedman
2024c5adc2 [ticket/12043] Correct try/catch exceptions for invalid extensions 
PHPBB3-12043
 2014-03-29 11:09:27 -07:00
Matt Friedman
bf2aca6f8b [ticket/12043] Sort Extensions by Display Name in ACP Extension mananger 
PHPBB3-12043
 2014-03-29 10:47:09 -07:00
Joas Schilling
3e281790e3 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
 2014-03-29 17:50:07 +01:00
Joas Schilling
1663a0a5fe Merge remote-tracking branch 'bantu/ticket/12319' into develop-olympus 
* bantu/ticket/12319:
  [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
 2014-03-29 17:49:51 +01:00
Joas Schilling
01697ab2f5 Merge remote-tracking branch 'prosk8er/ticket/12298' into develop-ascraeus 
* prosk8er/ticket/12298:
  [ticket/12298] Template Event memberlist_view_contact_before/after
 2014-03-29 17:43:03 +01:00
Cesar G
b893dae105 [ticket/11959] Move phpbb_generate_string_list() to functions_content.php. 
PHPBB3-11959
 2014-03-29 09:32:04 -07:00
Prosk8er
255fab038d [ticket/12298] Template Event memberlist_view_contact_before/after 
add template event memberlist_view_contact_before
and memberlist_view_contact_after

PHPBB3-12298
 2014-03-29 12:13:17 -04:00
Joas Schilling
f879714d35 Merge remote-tracking branch 'prosk8er/ticket/12301' into develop-ascraeus 
* prosk8er/ticket/12301:
  [ticket/12301] Template Event overall_header_body_before
 2014-03-29 16:42:10 +01:00