Commit graph

25179 commits

Author SHA1 Message Date
Mate Bartus
98cb70f5d2 [ticket/13961] Move service_collection to di/service_collection namespace
PHPBB3-13961
2015-06-23 14:31:18 +02:00
javiexin
bd40f2f619 [ticket/13960] Profile field validation breaks ACP
Make sure new step is calculated only if no error has been identified
during validation.  Also, cleanup redundant code in acp_profile.php.

PHPBB3-13960
2015-06-23 11:02:08 +02:00
Andreas Fischer
8213f24b35 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13952] Fix docblocks
  [ticket/13952] Inject dispatcher dependency to the tidy search cron task
2015-06-22 00:45:42 +02:00
Andreas Fischer
d43da6cee9 Merge pull request #3721 from rxu/ticket/13952
[ticket/13952] Inject event dispatcher dependency to the tidy search cron task

* rxu/ticket/13952:
  [ticket/13952] Fix docblocks
  [ticket/13952] Inject dispatcher dependency to the tidy search cron task
2015-06-22 00:45:42 +02:00
Andreas Fischer
759eb29215 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13948] Correctly forwarding to the RIR for whois feature
2015-06-21 21:53:03 +02:00
rxu
bcac964cd0 [ticket/13948] Correctly forwarding to the RIR for whois feature
Allow any space count in the ReferralServer string for whois services response.

PHPBB3-13948
2015-06-21 15:48:28 +07:00
Stanislav Atanasov
c0449d31d6 [ticket/13817] Add read-only notes to events
PHPBB3-13817
2015-06-20 23:46:38 +03:00
Stanislav Atanasov
de947d31f6 [ticket/13817] Fix missing var names
Var names in doc block

PHPBB3-13817
2015-06-20 23:46:38 +03:00
Stanislav Atanasov
7d24510d68 [ticket/13817] Add _after
As requested events are named *_after

core.session_start_after is moved after
USERS_TABLE update to prevent returning
session data from extensions

PHPBB3-13817
2015-06-20 23:46:37 +03:00
Stanislav Atanasov
afa4c07a13 [ticket/13817] Change trgger_event to dispatch
Fix no event parameters

PHPBB3-13817
2015-06-20 23:46:37 +03:00
Stanislav Atanasov
57fa7435ad [ticket/13817] Fix empty event
Try adding event with no parameters

PHPBB3-13817
2015-06-20 23:46:37 +03:00
Stanislav Atanasov
af7f62505e [ticket/13817] Fix empty vars array
PHPBB3-13817
2015-06-20 23:46:37 +03:00
Stanislav Atanasov
76f7175fc4 [ticket/13817] Fix missing phpbb_dispatcher
Fix missing phpbb_dispatcher and add event to session_create

PHPBB3-13817
2015-06-20 23:46:36 +03:00
Stanislav Atanasov
bbbf122d05 [ticket/13817] Add session_kill and session_gc
Ticket was changed to add few more session related events

core.session_kill - send user_id and session_id
core.session_gc - just triger event

PHPBB3-13817
2015-06-20 23:46:36 +03:00
Stanislav Atanasov
798490bf1d [ticket/13817] Change since
As requested by nickvergessen

PHPBB3-13817
2015-06-20 23:46:36 +03:00
Stanislav Atanasov
4a1f617473 [ticket/13817] Add core.update_session event
Add core.update_session event in \phpbb\session.php

PHPBB3-13817
2015-06-20 23:46:36 +03:00
rxu
e0476d4f53 [ticket/13952] Fix docblocks
PHPBB3-13952
2015-06-20 23:41:53 +07:00
rxu
a8fe3926dc [ticket/13952] Inject dispatcher dependency to the tidy search cron task
PHPBB3-13952
2015-06-20 21:39:06 +07:00
javiexin
5e39a7ab72 [ticket/13748] Wrong tooltip after poll vote change
Store the "voted" tooltip in an extra attribute in HTML, and use it
with the JS that refreshes after poll vote.

PHPBB3-13748
2015-06-19 11:33:37 +02:00
Marc Alexander
4aba193131 Merge branch '3.1.x' 2015-06-19 10:39:40 +02:00
Raphaël M
c083a4adda [ticket/13949] Replace colon with colon lang key in memberlist search page
[ticket/13949] Replace colon with colon lang key in memberlist search
page

PHPBB3-13949
2015-06-19 09:52:33 +02:00
Marc Alexander
783a156bd2 [ticket/13951] Make sure the page number is an integer
PHPBB3-13951
2015-06-18 09:22:07 +02:00
Marc Alexander
1b354ae468 Merge branch '3.1.x' 2015-06-17 16:02:47 +02:00
Marc Alexander
a259d61f57 Merge pull request #3649 from callumacrae/ticket/13879
[ticket/13879] Replaced px with em where appropriate.
2015-06-17 16:02:41 +02:00
Marc Alexander
ef890e3363 Merge branch '3.1.x' 2015-06-17 15:39:12 +02:00
Marc Alexander
9f17e224c4 Merge pull request #3708 from s9e/ticket/13946
[ticket/13946] Increase the CSS margin around [code] and [list]
2015-06-17 15:32:29 +02:00
Tristan Darricau
ceed27fe27 Merge pull request #3661 from marc1706/ticket/6466
[ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
2015-06-17 10:07:12 +02:00
Matt Friedman
4f05364eb9 [ticket/13882] Add lazy load avatars to phpbb wrappers
PHPBB3-13882
2015-06-16 11:58:31 -07:00
Andreas Fischer
9296c75738 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13903] Replacing regexp path naming for container by md5.

Conflicts:
	phpBB/phpbb/di/container_builder.php
2015-06-16 20:06:28 +02:00
Wardormeur
08a6f663de [ticket/13903] Replacing regexp path naming for container by md5.
Replacement of the path creation based on a blacklist by a md5 filename to
support broader configurations

PHPBB3-13903
2015-06-16 18:29:41 +02:00
JoshyPHP
4be0730898 [ticket/13946] Changed [list] margin to match [code]
PHPBB3-13946
2015-06-16 17:20:14 +02:00
Andreas Fischer
beb830df71 Merge pull request #3675 from s9e/ticket/13906
[ticket/13906] Fixed old signatures in post preview

* s9e/ticket/13906:
  [ticket/13906] Renamed test
  [ticket/13906] Added test
  [ticket/13906] Fixed old signatures in post preview
2015-06-16 14:34:44 +02:00
Andreas Fischer
65fef50869 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13931] Wrong order in docs/events.md

Conflicts:
	phpBB/docs/events.md
2015-06-16 14:32:01 +02:00
Andreas Fischer
e8769fd561 Merge pull request #3695 from javiexin/ticket/13931
[ticket/13931] Wrong order in docs/events.md

* javiexin/ticket/13931:
  [ticket/13931] Wrong order in docs/events.md

Conflicts:
	phpBB/docs/events.md
2015-06-16 14:29:18 +02:00
Marc Alexander
80768b526b Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/user_loader.php
2015-06-16 12:35:51 +02:00
Marc Alexander
dc9245dd7a Merge pull request #3653 from callumacrae/ticket/13882
[ticket/13882] Lazy load the notification avatars.
2015-06-16 12:33:17 +02:00
CHItA
d5414592f1 Merge branch '3.1.x' 2015-06-16 01:20:22 +02:00
Joas Schilling
002f08ba35 [ticket/13947] Add CHItA to the list of developers
PHPBB3-13947
2015-06-16 00:17:00 +02:00
JoshyPHP
08c7afedfa [ticket/13946] Increase the CSS margin around [code] and [list]
PHPBB3-13946
2015-06-14 19:06:36 +02:00
Joas Schilling
2a662c5e07 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/phpbb/user.php
2015-06-14 17:40:18 +02:00
Joas Schilling
7ccb19fa00 Merge branch 'prep-release-3.1.5' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-06-14 17:38:04 +02:00
Joas Schilling
8f5d761112 [prep-release-3.1.5] Add migration for 3.1.5 2015-06-14 16:14:07 +02:00
Joas Schilling
38a1442d40 [prep-release-3.1.5] Update version for final 3.1.5 release 2015-06-14 16:11:22 +02:00
cyberalien
e6407907e2 [ticket/13938] Fix inconsistencies between <link> tags
PHPBB3-13938
2015-06-14 07:43:19 +02:00
cyberalien
8eb4ec29ee [ticket/13938] Remove type and / from <link> elements
PHPBB3-13938
2015-06-14 07:43:02 +02:00
cyberalien
338abf77e3 [ticket/13938] Change web font code in simple_header
Apply ticket 13876 to simple_header.html

PHPBB3-13938
2015-06-14 07:42:37 +02:00
cyberalien
f9c50a8db3 [ticket/13938] Remove link to print.css in simple_header.html
Remaining fixes for ticket 13873: remove link to print.css and
remove type and media from other links.

PHPBB3-13938
2015-06-14 07:42:23 +02:00
Marc Alexander
714533d12e [ticket/13942] Check if path to language file contains language path
PHPBB3-13942
2015-06-13 17:15:28 +02:00
Andreas Fischer
2eceaaddf6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/10711] Duplicate key error on forum_tracks_table
2015-06-13 16:27:44 +02:00
Andreas Fischer
89f7fc63e8 Merge pull request #3703 from javiexin/ticket/10711
[ticket/10711] Duplicate key error on forum_tracks_table

* javiexin/ticket/10711:
  [ticket/10711] Duplicate key error on forum_tracks_table
2015-06-13 16:27:44 +02:00