Commit graph

25837 commits

Author SHA1 Message Date
Mate Bartus
f991e484da [ticket/14044] Add config as global in notify user
PHPBB3-14044
2015-11-03 02:16:23 +01:00
Andreas Fischer
996886de17 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Andreas Fischer
afbeda7cfd Merge pull request #3983 from prototech/ticket/13831
[ticket/13831] Store provided reason when deleting from Mod. Queue module.

* prototech/ticket/13831:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Richard McGirr
5d7f67105b [ticket/12649] Change sort & display options in footers to dropdown menu
PHPBB3-12649
2015-11-01 06:51:03 -05:00
Richard McGirr
22d234a345 [ticket/14228] Vertical align of numbers in polls
PHPBB3-14228
2015-11-01 05:39:07 -05:00
Oliver Schramm
081424a6c4 [ticket/14257] Fix CLI error message
PHPBB3-14257
2015-11-01 03:31:09 +01:00
Oliver Schramm
ec4bdf5438 [ticket/14265] Make all tables available in container
PHPBB3-14265
2015-11-01 03:16:44 +01:00
RMcGirr83
21aa6cc120 [ticket/14242] Revert some changes
PHPBB3-14242
2015-10-30 13:09:55 -04:00
Mate Bartus
719f42c54a [ticket/14044] Fix language selection data loss
PHPBB3-14044
2015-10-30 15:46:39 +01:00
Mate Bartus
0990894cf8 [ticket/14044] Patch language::set_fallback_array()
PHPBB3-14044
2015-10-30 15:25:27 +01:00
Oliver Schramm
257f5f8b24 Merge pull request #3971 from VSEphpbb/ticket/14237
[ticket/14237] Use $language class for notifications
2015-10-29 14:46:02 +01:00
Mate Bartus
71ec5185e1 [ticket/14044] Fix wrong descriptions in install
PHPBB3-14044
2015-10-28 14:17:29 +01:00
Mate Bartus
3ac10ef544 [ticket/14044] Solve missing email template error
PHPBB3-14044
2015-10-28 14:14:49 +01:00
Zoddo
fbacd1df16 [ticket/14261] Fix tests by removing old code.
This will obselete GH-4007

PHPBB3-14261
PHPBB3-13202
2015-10-28 12:32:24 +01:00
Mate Bartus
33db26d0cf [ticket/14044] global $table_prefix in constants.php
PHPBB3-14044
2015-10-28 01:12:52 +01:00
Mate Bartus
369024b56f [ticket/14044] Try to fix missing table prefix
PHPBB3-14044
2015-10-28 00:58:34 +01:00
Mate Bartus
a761a4080d [ticket/14044] Use the correct language file version
PHPBB3-14044
2015-10-28 00:36:05 +01:00
Zoddo
88dd8a4849 [ticket/14261] Move the update of session informations to page_footer()
Currently, the unique way to disable the update of session_page is to pass
"false" to the parameter of session_begin(). This method is directly
called in app.php, so pages served from the routing system can't disable
the update of session informations.

By moving the update to page_footer, we can allow controllers to tell to
the session manager that we don't want to update the session infos.

PHPBB3-14261
2015-10-27 17:26:18 +01:00
Richard McGirr
c1d47d9e16 [ticket/14242] Fix u_sort_posts to use correct sort key
PHPBB3-14242
2015-10-26 06:42:33 -04:00
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
Marc Alexander
df53d40922 [ticket/14044] Automatically trigger rollback on insert in transaction
This will cause the sqlite3 driver to automatically rollback transactions
if an insert fails during a transaction. Other dbms trigger a rollback
inside the sql_error() function with a rollback command. However,
this manual rollback command might fail on sqlite3 due to ongoing queries.

With this change, sqlite3 itself will abort any ongoing queries and
initiate the rollback automatically. Since manually triggered rollbacks
will fail after the rollback was started automatically, we catch
exceptions output by the exec() command during rollback and any exception
that might be thrown by fetchArray() due to aborted queries.

PHPBB3-14044
2015-10-23 20:47:56 +02:00
Mate Bartus
d34d6378bc [ticket/14044] Use empty instead of !count
PHPBB3-14044
2015-10-23 13:25:00 +02:00
Marc Alexander
e0d06ee83e [ticket/14044] Fix Sqlite error in tests
PHPBB3-14044
2015-10-23 11:46:03 +02:00
Mate Bartus
597297b169 [ticket/14044] Deduplicate the installers
PHPBB3-14044
2015-10-22 21:29:52 +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
RMcGirr83
b23c0f1442 [ticket/14242] Fix memberlist sort method
PHPBB3-14242
2015-10-19 09:53:43 -04: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