mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 18:11:47 +02:00
Code Issues Releases Wiki Activity
28,672 Commits 18 Branches 192 Tags
dc2777e7698fba3e015e94e0c39a3d14e088563d
Commit Graph

24267 Commits

Author SHA1 Message Date
Marc Alexander
dc2777e769 Merge branch '3.2.x' 2016-08-16 21:02:56 +02:00
Marc Alexander
723d9d8e4c Merge branch '3.1.x' into 3.2.x 2016-08-16 21:02:52 +02:00
Marc Alexander
488fd8f54c Merge pull request #4413 from wesleyfok/ticket/14745 
[ticket/14745] Removed unneeded HTML ampersand
 2016-08-16 21:02:06 +02:00
Marc Alexander
9dbe47ba8e Merge branch '3.2.x' 2016-08-16 20:49:36 +02:00
Marc Alexander
c044a41d07 Merge pull request #4404 from JoshyPHP/ticket/14740 
[ticket/14740] Added support for quoted attributes in BBCode definitions
 2016-08-16 20:49:31 +02:00
Wesley Fok
f68e98c064 [ticket/14745] Removed unneeded HTML ampersand 
Changed the HTML ampersand entity in U_NOTIFICATION_SETTINGS into a bare
ampersand character.

PHPBB3-14745
 2016-08-15 15:20:23 -04:00
Marc Alexander
0df1d39c1f Merge branch '3.2.x' 2016-08-13 23:14:11 +02:00
Oliver Schramm
758fe20f4b [ticket/14742] Further improve progress bar in db updater 
PHPBB3-14742
 2016-08-12 15:23:27 +02:00
Oliver Schramm
0d1b7b3935 Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-12 02:38:55 +02:00
Oliver Schramm
263fbe54fc [ticket/14742] Enhance measured time for migrations 
PHPBB3-14742
 2016-08-12 02:03:52 +02:00
Oliver Schramm
4a92a8efb5 [ticket/14742] Improve verbosity of migrator output 
PHPBB3-14742
 2016-08-12 02:01:01 +02:00
Oliver Schramm
03be89ebd7 [ticket/14742] Fix progress bar in database updater 
Because of the new way, schema update steps are handled, the already
misleading progress bar was even more misleading. This should fix it.

PHPBB3-14742
 2016-08-11 23:28:54 +02:00
Oliver Schramm
210310b584 Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-11 18:30:35 +02:00
Oliver Schramm
52afa74f4e [ticket/14742] Avoid loop while reverting schema 
PHPBB3-14742
 2016-08-11 18:00:10 +02:00
Oliver Schramm
b00a39b9ad [ticket/14742] Make $last_run_migration protected 
PHPBB3-14742
 2016-08-11 17:59:51 +02:00
Oliver Schramm
6078bae7f8 [ticket/14742] Fix schema update 
First make it work, then avoid a loop

PHPBB3-14742
 2016-08-11 13:31:23 +02:00
Oliver Schramm
3346609126 [ticket/14742] Display message if reverting schema is in progress 
PHPBB3-14742
 2016-08-11 01:25:45 +02:00
Oliver Schramm
4938887e5d Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-11 01:20:59 +02:00
Oliver Schramm
a277f9cf07 [ticket/14742] Small fixes to migrator 
PHPBB3-14742
 2016-08-11 01:09:11 +02:00
Oliver Schramm
8e1461ca61 [ticket/14742] Avoid loop while reverting data 
This combines reverted updata_data and revert_data into a single array.

PHPBB3-14742
 2016-08-11 01:09:11 +02:00
Oliver Schramm
9fb649793d [ticket/14742] Pause after each schema change 
It is certainly better than running them all at once

PHPBB3-14742
 2016-08-11 01:03:23 +02:00
JoshyPHP
260a0a29ad [ticket/14740] Added support for quoted attributes in BBCode definitions 
PHPBB3-14740
 2016-08-10 03:19:38 +02:00
Marc Alexander
c8bdd0a67c Merge pull request #4232 from CHItA/ticket/14542 
[ticket/14542] Move cron to controller
 2016-08-08 09:44:52 +02:00
Máté Bartus
8c137a5658 [ticket/14542] Add missing dockblocks 
PHPBB3-14542
 2016-08-07 22:03:21 +02:00
Marc Alexander
5acb831f19 Merge pull request #4282 from CHItA/ticket/14584 
[ticket/14548] Move deprecated globals and functions
 2016-08-07 21:02:17 +02:00
Máté Bartus
6eecc26e31 [ticket/14542] Move cron to controller 
PHPBB3-14542
 2016-08-05 22:50:54 +02:00
Máté Bartus
6ca10fc85a Merge branch '3.2.x' 2016-08-05 21:29:27 +02:00
Marc Alexander
dd01de03bf [ticket/14735] Update composer dependencies to latest versions 
This will update Symfony to 2.8.9, fast-image-size to 1.1.1, and
text-formatter to 0.6.1.

PHPBB3-14735
 2016-08-05 20:26:58 +02:00
Marc Alexander
e2207c65e7 Merge branch '3.2.x' 2016-08-05 20:18:54 +02:00
JoshyPHP
9225a0fdff [ticket/14734] Use SVG emoji 
PHPBB3-14734
 2016-08-05 16:27:13 +02:00
Marc Alexander
81f0d912b0 Merge branch '3.2.x' 2016-08-03 22:21:47 +02:00
Marc Alexander
6cc4d78ebf Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
 2016-08-03 22:21:25 +02:00
Marc Alexander
5330ea0f09 Merge pull request #4324 from Senky/ticket/14516 
[ticket/14516] Add memberlist_email_before event
 2016-08-03 22:20:48 +02:00
Marc Alexander
94e6479c93 Merge branch '3.2.x' 2016-08-03 21:54:38 +02:00
Wesley Fok
8a9cf32b1d [ticket/14729] Make reports take config base class 
Make the report controller and helper classes accept the more generic
phpbb/config/config base class in their constructors, instead of the
specific database implementation phpbb/config/db.

PHPBB3-14729
 2016-08-03 13:42:36 -04:00
Marc Alexander
da15d435bf Merge branch '3.2.x' 2016-08-01 20:42:16 +02:00
Marc Alexander
3d4660a703 Merge branch '3.1.x' into 3.2.x 2016-08-01 20:42:13 +02:00
Oliver Schramm
f222f8a84a [ticket/14721] Avoid renaming deleted users 
PHPBB3-14721
 2016-08-01 00:26:47 +02:00
Marc Alexander
4ac2547d62 Merge pull request #4301 from 3D-I/PHPBB3-14596 
[ticket/14596] Deny installation of Ascraeus under PHP 7
 2016-07-31 15:18:35 +02:00
Oliver Schramm
46045eb9b0 Merge branch '3.2.x' 2016-07-30 23:23:00 +02:00
Máté Bartus
61a147546d [ticket/14633] Check for XML extension support on install 
PHPBB3-14633
 2016-07-30 13:04:39 +02:00
Máté Bartus
832722417a Merge pull request #4350 from marc1706/ticket/14670 
[ticket/14670] Use symfony 3.x in master branch
 2016-07-29 17:51:50 +02:00
Máté Bartus
e9f28ea22c [ticket/14584] Change all to be removed tags to 4.0 
PHPBB3-14584
 2016-07-29 17:48:26 +02:00
Máté Bartus
54e5d41359 [ticket/14548] Move deprecated globals and functions 
PHPBB3-14584
 2016-07-29 17:48:00 +02:00
Andreas Fischer
ed2c8b5bf7 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:51 +02:00
Andreas Fischer
0dc13c720c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:51 +02:00
Andreas Fischer
55223e6840 Merge pull request #4336 from Senky/ticket/14652 
Fix typos in core.index_modify_birthdays_list vars descriptions

* Senky/ticket/14652:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:50 +02:00
Marc Alexander
e1f9c946ef [ticket/14670] Modify service definition for RouterListener 
PHPBB3-14670
 2016-07-23 17:54:45 +02:00
Marc Alexander
59a228f7cd [ticket/14670] Use symfony 3.1 in master branch 
Removed sami as it doesn't have a version compatible
with symfony 3.x.

PHPBB3-14670
 2016-07-23 17:13:54 +02:00
Máté Bartus
96617e8e46 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14717] Quote strings beginning with @ or % in yaml definitions
 2016-07-23 16:57:56 +02:00