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

23443 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nils Adermann
dccbd573e8 [ticket/13232] Ensure prune cron job always gets run in prune test 
The cron scheduler might pick a different task but we don't want to go
through them all to find the one we need. So we just make sure cron is
run at all and then manually run the one we want.

PHPBB3-13232
 2014-10-27 19:00:23 -07:00
Nils Adermann
dbaee1a5da Merge pull request #4 from nickvergessen/naderman-ticket/13232 
[ticket/13232] Fix more issues with TTL and global cache file
 2014-10-27 16:36:39 -07:00
Joas Schilling
6380aea647 [ticket/13232] Fix more issues with TTL and global cache file 
PHPBB3-13232
 2014-10-28 00:34:51 +01:00
Nils Adermann
0cdd071230 [ticket/13232] Fix indentation 
PHPBB3-13232
 2014-10-27 15:45:24 -07:00
Nils Adermann
df5366a5ca [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks 
PHPBB3-13232
 2014-10-27 15:42:26 -07:00
Nils Adermann
d693d91e26 Merge remote-tracking branch 'github-nicofuma/ticket/13226' into prep-release-3.1.0 
* github-nicofuma/ticket/13226:
  [ticket/13226] Add functional test for group ranks
  [ticket/13226] Fix the usage of $rank_img
 2014-10-27 12:25:18 -07:00
Nils Adermann
decabb62c0 Merge pull request #3079 from nickvergessen/ticket/13230 
[ticket/13230] Add missing globals and missing request object for path helper
 2014-10-27 12:16:12 -07:00
Joas Schilling
47759eb096 [ticket/13230] Add missing globals and missing request object for path helper 
PHPBB3-13230
 2014-10-27 14:54:17 +01:00
Tristan Darricau
2e5cc62071 [ticket/13226] Add functional test for group ranks 
PHPBB3-13226
 2014-10-27 14:37:51 +01:00
Tristan Darricau
9ccb87675d [ticket/13226] Fix the usage of $rank_img 
PHPBB3-13226
 2014-10-27 10:00:24 +01: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
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
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
Nils Adermann
5cee745fc5 [prep-release-3.1.0] Add missing CHANGELOG entries for RC6 2014-10-25 18:10:30 -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
f2e9c62a97 [prep-release-3.1.0] Add 3.1.0 gold release migration 2014-10-25 17:03:50 -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
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
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
9ea08aa4d7 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
 2014-10-25 12:09:55 -07:00
Nils Adermann
4e952ad443 Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0 
* commit '078e0c1e440f7f906b670348e8da00141e245876':
  [ticket/13211] Move console migrator output handler back to console folder
  [ticket/13211] Also use log wrapper output handler for console migrations
  [ticket/13211] Move console migrator output handler to db folder
  [ticket/13211] Add log wrapper for writing database updater to log file
  [ticket/13126] Add missing use statement
  [ticket/13126] Fix tests
  [ticket/13126] Change messages verbosity levels
  [ticket/13126] Move migrator_output_handler to an interface
  [ticket/13126] Extends migrator_output_handler instead of using a closure
  [ticket/13126] Improve the feedback when running the migrations
 2014-10-25 12:09:20 -07:00
Nils Adermann
6308a442d1 Merge pull request #3060 from marc1706/ticket/13211 
[ticket/13211] Add log wrapper for writing database updater to log file
 2014-10-25 12:04:29 -07:00
Marc Alexander
078e0c1e44 [ticket/13211] Move console migrator output handler back to console folder 
PHPBB3-13211
 2014-10-25 12:03:13 -07:00
Marc Alexander
8443463006 [ticket/13211] Also use log wrapper output handler for console migrations 
PHPBB3-13211
 2014-10-25 11:55:15 -07:00
Andreas Fischer
d2e3198407 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13210] Use the correct config value
 2014-10-25 19:50:26 +02:00
Andreas Fischer
a43879fe91 Merge pull request #3061 from Elsensee/ticket/13210 
[ticket/13210] Use the correct config value

* Elsensee/ticket/13210:
  [ticket/13210] Use the correct config value
 2014-10-25 19:48:33 +02:00
Andreas Fischer
103c929ff0 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13208] Add security issues to the final changelog
  [prep-release-3.1.0] Prepare Changelog
  [prep-release-3.1.0] Update version to 3.1.0
 2014-10-25 19:39:50 +02:00
Oliver Schramm
a9a67b08a5 [ticket/13210] Use the correct config value 
PHPBB3-13210
 2014-10-25 14:28:56 +02:00
Marc Alexander
b27b9a6984 [ticket/13211] Move console migrator output handler to db folder 
PHPBB3-13211
 2014-10-24 13:33:26 -07:00
Marc Alexander
516bd9ea51 [ticket/13211] Add log wrapper for writing database updater to log file 
PHPBB3-13211
 2014-10-24 13:22:56 -07:00
Marc Alexander
14300a1475 Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211 2014-10-24 13:22:39 -07:00
Marc Alexander
6217a51920 Merge pull request #3059 from nickvergessen/ticket/13208 
[ticket/13208] Add security issues to the final changelog
 2014-10-23 08:56:01 -04:00
Joas Schilling
c814483627 [ticket/13208] Add security issues to the final changelog 
PHPBB3-13208
 2014-10-23 12:36:27 +02:00
Joas Schilling
1cd09a03e6 [prep-release-3.1.0] Prepare Changelog 2014-10-23 12:25:52 +02:00
Joas Schilling
80a9c24b6b [prep-release-3.1.0] Update version to 3.1.0 2014-10-23 12:22:02 +02:00
Joas Schilling
08f365236a Merge branch 'prep-release-3.1.0-RC6' into develop-ascraeus 2014-10-23 02:44:45 +02:00
Joas Schilling
7a90184421 [prep-release-3.1.0-RC6] Update phpBB Version for RC7 development 2014-10-23 02:44:18 +02:00
Joas Schilling
5847a50334 [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6 2014-10-23 01:57:59 +02:00
Joas Schilling
1ade9b39e4 [prep-release-3.1.0-RC6] Prepare Changelog 2014-10-23 01:55:48 +02:00
Joas Schilling
4c94e44710 [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6 2014-10-23 01:50:12 +02:00
Joas Schilling
d640a37984 [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6 2014-10-23 01:48:38 +02:00
Joas Schilling
e4c8e4905c Merge pull request #3 from phpbb/ticket/security-161 
[ticket/security-161] Add form token to styles management form.
 2014-10-23 01:38:12 +02:00
Cesar G
4d30633cd4 [ticket/security-161] Add form token to styles management form. 
SECURITY-161
 2014-10-22 15:46:00 -07:00