Commit graph

23186 commits

Author SHA1 Message Date
Oliver Schramm
c805fd2a73 [ticket/14257] Fix phpdoc in CLI command
PHPBB3-14257
2015-10-26 01:49:11 +01:00
Oliver Schramm
25e2b17837 [ticket/14257] Add text_reparser manager
PHPBB3-14257
2015-10-26 01:39:52 +01:00
Oliver Schramm
33500fd372 [ticket/14257] Use migrations instead of cron job for some reparsers
PHPBB3-14257
2015-10-25 02:30:01 +01:00
Oliver Schramm
8b0f8d7b3c [ticket/14257] Fix lock acquire in CLI command
PHPBB3-14257
2015-10-25 02:32:19 +02:00
Oliver Schramm
c7ebbcf9f2 [ticket/14257] Fix if condition
PHPBB3-14257
2015-10-24 21:24:34 +02:00
Oliver Schramm
c7ecb1310f [ticket/14257] Add reparse_lock to CLI command
PHPBB3-14257
2015-10-24 20:16:54 +02:00
Oliver Schramm
8376c6552a [ticket/14257] Add cron tasks for reparsing text
PHPBB3-14257
2015-10-24 20:01:15 +02:00
Marc Alexander
5f85f19a5e Merge branch '3.1.x' 2015-10-24 18:23:52 +02:00
Paul Sohier
9596db9b88 [ticket/14258] Add event into auth::login before session creation
Fix typo

PHPBB3-14258
2015-10-24 18:00:55 +02:00
Paul Sohier
2a218c2959 [ticket/14258] Add event into auth::login before session creation
Update comments regarding variables.

PHPBB3-14258
2015-10-24 17:47:04 +02:00
Paul Sohier
7615a5c22f [ticket/14258] Add event into auth::login before session creation
Add a new event in the login method just before the session create,
so extensions can do some additional validation during login.

PHPBB3-14258
2015-10-24 14:28:29 +02:00
Cesar G
a246cb6414 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14249] Fix online list order
2015-10-22 10:05:25 -07:00
Oliver Schramm
93208d597a [ticket/14249] Fix online list order
PHPBB3-14249
2015-10-21 21:51:43 +02:00
Mate Bartus
cc1a96a804 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13976] Fix comment typo in salted_md5.php
2015-10-21 00:32:20 +02:00
Máté Bartus
fa44e98e72 Merge pull request #3997 from CHItA/ticket/13976
[ticket/13976] Fix comment typo in salted_md5.php
2015-10-21 00:29:05 +02:00
Sumanai
6b433eab4c [ticket/13976] Fix comment typo in salted_md5.php
PHPBB3-13976
2015-10-21 00:22:42 +02:00
Tristan Darricau
5b3829aab4 Merge pull request #3794 from CHItA/ticket/14039
[ticket/14039] Refactoring the updater

* CHItA/ticket/14039:
  [ticket/14039] Use update helper to include files in container factory
  [ticket/14039] Fix inclusion logic in update helper
  [ticket/14039] Fix folder creation and deleted binary file issue
  [ticket/14039] Fix file check for deleted files
  [ticket/14039] Fix acp link
  [ticket/14039] Fix ACP link generation
  [ticket/14039] Fix constants for the updater
  [ticket/14039] Include phpBB constants on startup
  [ticket/14039] Fix migrator's language calls
  [ticket/14039] Fix misunderstandable comment in the archive file updater
  [ticket/14039] Use shared language service in the container factory
  [ticket/14039] Fix filesystem file updater's mkdir usage
  [ticket/14039] Only show log container when it has content
  [ticket/14039] Use compatibility globals from the update package
  [ticket/14039] Use http_exception instead of die()
  [ticket/14039] Fix T_TEMPLATE_PATH constant
  [ticket/14039] Fix language constants and comments
  [ticket/14039] Revamp updater
2015-10-19 14:43:48 +02:00
Tristan Darricau
9ea44abf38 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13799] Split lines in HTML files for better readability
  [ticket/13799] Add missing space before checked attribute
  [ticket/13799] Correctly urlencode category and show selected avatar
  [ticket/13799] Do not rawurlencode category in gallery avatar
2015-10-19 14:40:07 +02:00
Tristan Darricau
a6fd55db35 Merge pull request #3647 from marc1706/ticket/13799
[ticket/13799] Do not rawurlencode category in gallery avatar

* marc1706/ticket/13799:
  [ticket/13799] Split lines in HTML files for better readability
  [ticket/13799] Add missing space before checked attribute
  [ticket/13799] Correctly urlencode category and show selected avatar
  [ticket/13799] Do not rawurlencode category in gallery avatar
2015-10-19 14:39:14 +02:00
Tristan Darricau
326ba5325b Merge branch '3.1.x'
* 3.1.x:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:37:06 +02:00
Tristan Darricau
dfd5ec6835 Merge pull request #3666 from marc1706/ticket/9252
[ticket/9252] Do not try to disapprove a post that was just approved

* marc1706/ticket/9252:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:36:51 +02:00
Mate Bartus
d45f146814 [ticket/14039] Use update helper to include files in container factory
PHPBB3-14039
2015-10-19 09:12:26 +02:00
Mate Bartus
de729110c8 [ticket/14039] Fix inclusion logic in update helper
PHPBB3-14039
2015-10-19 01:19:31 +02:00
Mate Bartus
2f8ef80d92 [ticket/14039] Fix folder creation and deleted binary file issue
PHPBB3-14039
2015-10-18 23:11:20 +02:00
Mate Bartus
4b447c71de [ticket/14039] Fix file check for deleted files
PHPBB3-14039
2015-10-18 23:04:53 +02:00
Mate Bartus
0ce72f94a2 [ticket/14039] Fix acp link
PHPBB3-14039
2015-10-18 22:33:31 +02:00
Mate Bartus
ed442198d1 [ticket/14039] Fix ACP link generation
PHPBB3-14039
2015-10-18 19:27:50 +02:00
Mate Bartus
56093d1c82 [ticket/14039] Fix constants for the updater
PHPBB3-14039
2015-10-18 19:18:53 +02:00
Mate Bartus
d4dd112edf [ticket/14039] Include phpBB constants on startup
PHPBB3-14039
2015-10-18 18:56:11 +02:00
Mate Bartus
94bd35fd3b [ticket/14039] Fix migrator's language calls
PHPBB3-14039
2015-10-18 18:28:12 +02:00
Mate Bartus
3b593c5d52 [ticket/14039] Fix misunderstandable comment in the archive file updater
PHPBB3-14039
2015-10-18 18:17:28 +02:00
Mate Bartus
29908e54bc [ticket/14039] Use shared language service in the container factory
PHPBB3-14039
2015-10-18 17:31:12 +02:00
Mate Bartus
dd85806327 [ticket/14039] Fix filesystem file updater's mkdir usage
PHPBB3-14039
2015-10-18 14:00:53 +02:00
Mate Bartus
74ae7d2a8d [ticket/14039] Only show log container when it has content
PHPBB3-14039
2015-10-18 11:33:49 +02:00
Mate Bartus
6b561b9eae [ticket/14039] Use compatibility globals from the update package
PHPBB3-14039
2015-10-18 11:30:09 +02:00
Mate Bartus
100bb8f27c [ticket/14039] Use http_exception instead of die()
PHPBB3-14039
2015-10-18 11:26:41 +02:00
Mate Bartus
afe91fa7d3 [ticket/14039] Fix T_TEMPLATE_PATH constant
PHPBB3-14039
2015-10-18 11:22:19 +02:00
Mate Bartus
85eb6a0bc0 [ticket/14039] Fix language constants and comments
PHPBB3-14039
2015-10-18 11:21:56 +02:00
Marc Alexander
b17fc98043 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_team.html
2015-10-18 10:33:05 +02:00
DavidIQ
da9a5c70d5 [ticket/10343] Add inactive indicator to subsilver2 memberlist
PHPBB3-10343
2015-10-17 18:39:14 -04:00
DavidIQ
9a8393c912 [ticket/10343] Show clearer indication an account is inactive in memberlist
PHPBB3-10343
2015-10-17 18:38:53 -04:00
Cesar G
31350fb116 [ticket/14174] Refine wording of error descriptions in new installer.
PHPBB3-14174
2015-10-17 15:22:58 -07:00
Mate Bartus
8f5a0ad6f7 [ticket/14039] Revamp updater
PHPBB3-14039
2015-10-17 23:05:57 +02:00
Tristan Darricau
59d39dce3b Merge pull request #3986 from CHItA/ticket/14240
[ticket/14240] Fix packaging script for 3.2

* CHItA/ticket/14240:
  [ticket/14240] Fix packaging script for 3.2
2015-10-17 15:40:43 +02:00
Mate Bartus
22b9f35bdf [ticket/13371] Add language files to the service as well
PHPBB3-13371
2015-10-17 15:02:09 +02:00
Mate Bartus
fb434adf88 [ticket/13371] Use user selected language in old installer
PHPBB3-13371
2015-10-17 14:55:14 +02:00
Mate Bartus
2efbf59f97 [ticket/13371] Fix language loading for the old installer
PHPBB3-13371
2015-10-17 14:51:40 +02:00
Marc Alexander
7d4bbeef3f Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/notification/type/bookmark.php
	phpBB/phpbb/notification/type/post.php
	phpBB/phpbb/notification/type/quote.php
2015-10-17 12:13:32 +02:00
Marc Alexander
3a5336452c Merge pull request #3985 from prototech/ticket/13892
[ticket/13892] Respect "Someone reports a post" notification setting.
2015-10-17 12:06:27 +02:00
Marc Alexander
3f4abbd5ce Merge branch '3.1.x' 2015-10-17 12:02:14 +02:00