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

24346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Darricau
9ccb87675d [ticket/13226] Fix the usage of $rank_img 
PHPBB3-13226
 2014-10-27 10:00:24 +01:00
Dhruv
c6cca9d0d2 [ticket/12962] Functional tests run for php <5.3.19 
PHPBB3-12962
 2014-10-26 21:30:31 -07:00
Dhruv
98554475be [ticket/12962] Clean up composer.json 
PHPBB3-12962
 2014-10-26 20:58:21 -07:00
Marc Alexander
6cc5160d60 [ticket/13225] Use passwords manager instead of phpbb_hash in migration 
PHPBB3-13225
 2014-10-26 17:14:34 -07:00
Marc Alexander
cb65cd363a [ticket/12703] Only query database for subscription types once 
PHPBB3-12703
 2014-10-26 13:56:34 -07:00
Nils Adermann
741bac5b2e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes
 2014-10-26 12:54:09 -07:00
Nils Adermann
222bec0204 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes
 2014-10-26 12:54:02 -07:00
Nils Adermann
51251293ab [prep-release-3.1.0] Update CHANGELOG with last minute changes 2014-10-26 12:53:45 -07:00
Nils Adermann
10251b43db Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13223] Fix USERNAME email template variable in notification
 2014-10-26 12:48:35 -07:00
Nils Adermann
78aa120089 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13223] Fix USERNAME email template variable in notification
 2014-10-26 12:48:25 -07:00
Nils Adermann
d5022d87e7 Merge branch 'ticket/13223' into prep-release-3.1.0 
* ticket/13223:
  [ticket/13223] Fix USERNAME email template variable in notification
 2014-10-26 12:48:16 -07:00
rxu
5431aa6391 [ticket/13223] Fix USERNAME email template variable in notification 
admin_activate_user.php notification type is assigning usernames to email
template variables using user_loader->get_username() in 'no_profile' mode,
which in its turn calls get_username_string() function in 'no_profile' mode.
This causes HTML markup in emails for username colour.

PHPBB3-13223
 2014-10-26 12:47:57 -07:00
Nils Adermann
a686ed3df0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13221] Add bot_update as a dependency to gold
  [ticket/13221] Perform bot updates after user table changes
 2014-10-26 12:43:33 -07:00
Nils Adermann
c19ab58420 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13221] Add bot_update as a dependency to gold
  [ticket/13221] Perform bot updates after user table changes
 2014-10-26 12:43:17 -07:00
Nils Adermann
7f347a290c Merge pull request #3073 from nickvergessen/ticket/13221 
[ticket/13221] Perform bot updates after user table changes
 2014-10-26 12:42:28 -07:00
Joas Schilling
0d1d836a89 [ticket/13221] Add bot_update as a dependency to gold 
PHPBB3-13221
 2014-10-26 20:03:46 +01:00
Joas Schilling
79d782c1d5 [ticket/13221] Perform bot updates after user table changes 
PHPBB3-13221
 2014-10-26 19:57:08 +01:00
Andreas Fischer
e4277525a0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
 2014-10-26 14:20:34 +01:00
Andreas Fischer
69cf5782d4 Merge pull request #3054 from Senky/ticket/13193 
[ticket/13193] Post count in PMs not a link

* Senky/ticket/13193:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
 2014-10-26 14:20:33 +01:00
Jakub Senko
79274e904c [ticket/13193] Swap ternary condition members 
PHPBB3-13193
 2014-10-26 08:44:21 +01:00
Nils Adermann
5b42bcfe62 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13216] Use gmdate() instead of date() in datetime tests
 2014-10-25 21:27:02 -07:00
Nils Adermann
5441a4ea13 Merge pull request #3067 from marc1706/ticket/13216 
[ticket/13216] Use gmdate() instead of date() in datetime tests
 2014-10-25 21:26:38 -07:00
Nils Adermann
85e3b135f8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13207] Use assert_checkbox_is_checked for registration test
 2014-10-25 21:01:58 -07:00
Nils Adermann
5c1ef45488 Merge remote-tracking branch 'github-marc1706/ticket/13207' into develop-ascraeus 
* github-marc1706/ticket/13207:
  [ticket/13207] Use assert_checkbox_is_checked for registration test
 2014-10-25 21:01:51 -07:00
Nils Adermann
ad25f2b182 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [develop-ascraeus] Update version number to 3.1.1-RC1-dev
 2014-10-25 20:30:39 -07:00
Nils Adermann
7a4b404af7 [develop-ascraeus] Update version number to 3.1.1-RC1-dev 2014-10-25 20:28:46 -07:00
Marc Alexander
1046ada9fc [ticket/13216] Use gmdate() instead of date() in datetime tests 
PHPBB3-13216
 2014-10-25 20:25:57 -07:00
Marc Alexander
cafd3b79fd [ticket/13207] Use assert_checkbox_is_checked for registration test 
PHPBB3-13207
 2014-10-25 20:05:25 -07:00
Nils Adermann
d70d2cfcd1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
 2014-10-25 18:11:09 -07:00
Nils Adermann
a5830fe0d5 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
 2014-10-25 18:11:03 -07:00
Nils Adermann
5cee745fc5 [prep-release-3.1.0] Add missing CHANGELOG entries for RC6 2014-10-25 18:10:30 -07:00
Dhruv
1c88a2cb25 [ticket/12962] Fix Line Endings in bootstrap 
PHPBB3-12962
 2014-10-25 17:33:47 -07:00
Nils Adermann
cfe1a7d6d1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Add CHANGELOG for 3.1.0
 2014-10-25 17:12:42 -07:00
Nils Adermann
9c95831f35 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [prep-release-3.1.0] Add CHANGELOG for 3.1.0
 2014-10-25 17:12:34 -07:00
Nils Adermann
c789acc091 [prep-release-3.1.0] Add CHANGELOG for 3.1.0 2014-10-25 17:12:14 -07:00
Nils Adermann
76cdc2d891 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Add 3.1.0 gold release migration
 2014-10-25 17:05:13 -07:00
Nils Adermann
8de93bee95 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [prep-release-3.1.0] Add 3.1.0 gold release migration
 2014-10-25 17:05:07 -07:00
Nils Adermann
f2e9c62a97 [prep-release-3.1.0] Add 3.1.0 gold release migration 2014-10-25 17:03:50 -07:00
Nils Adermann
33d0872a18 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13207] Add notification manager mock to user_add method in tests
  [ticket/13207] Move default user notifications settings to user_add()
  [ticket/13207] Add default subscription options for newly registered users
 2014-10-25 16:56:26 -07:00
Nils Adermann
26d4483d36 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13207] Add notification manager mock to user_add method in tests
  [ticket/13207] Move default user notifications settings to user_add()
  [ticket/13207] Add default subscription options for newly registered users
 2014-10-25 16:56:05 -07:00
Nils Adermann
4859cec0c5 Merge remote-tracking branch 'github-marc1706/ticket/13207' into prep-release-3.1.0 
* github-marc1706/ticket/13207:
  [ticket/13207] Add notification manager mock to user_add method in tests
  [ticket/13207] Move default user notifications settings to user_add()
  [ticket/13207] Add default subscription options for newly registered users
 2014-10-25 16:55:29 -07:00
Marc Alexander
0dcb874c09 [ticket/13207] Add notification manager mock to user_add method in tests 
PHPBB3-13207
 2014-10-25 16:16:25 -07:00
Dhruv
e78210dc96 [ticket/12962] Load composer test dependencies for php >= 5.3.19 
PHPBB3-12962
 2014-10-25 15:34:39 -07:00
Marc Alexander
81ad381263 [ticket/13207] Move default user notifications settings to user_add() 
PHPBB3-13207
 2014-10-25 14:57:01 -07:00
Marc Alexander
18f24a2270 [ticket/13207] Add default subscription options for newly registered users 
PHPBB3-13207
 2014-10-25 14:50:01 -07:00
Nils Adermann
12f7275c8e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13215] Update Symfony components to v2.3.21.

Conflicts:
	phpBB/composer.lock
 2014-10-25 14:04:18 -07:00
Nils Adermann
f22cd2d734 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13215] Update Symfony components to v2.3.21.
 2014-10-25 14:01:54 -07:00
Nils Adermann
07e7cde560 Merge pull request #3062 from bantu/ticket/13215 
[ticket/13215] Update Symfony components to v2.3.21.
 2014-10-25 14:01:13 -07:00
Andreas Fischer
ad06f6dd71 [ticket/13215] Update Symfony components to v2.3.21. 
PHPBB3-13215
 2014-10-25 21:29:45 +02:00
Nils Adermann
3b821d383f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
 2014-10-25 12:10:00 -07:00