1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-08 07:10:51 +02:00

Compare commits

...

4486 Commits

Author SHA1 Message Date
Tristan Darricau
67f43b1a06 [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1 2015-11-09 20:24:46 +01:00
Tristan Darricau
2144f35e9d [prep-release-3.2.0-a1] Add migration for 3.2.0-a1 2015-11-09 20:20:26 +01:00
Tristan Darricau
f8236cc907 [prep-release-3.2.0-a1] Update version to 3.2.0-a1 2015-11-09 20:20:26 +01:00
Máté Bartus
024ec86181 Merge pull request #4024 from marc1706/ticket/14278
[ticket/14278] Check if user_id is set and fall back to ANONYMOUS
2015-11-09 18:24:18 +01:00
Marc Alexander
d77455309b [ticket/14278] Check if user_id is set and fall back to ANONYMOUS
PHPBB3-14278
2015-11-09 18:23:38 +01:00
Marc Alexander
5739317567 Merge pull request #4023 from CHItA/ticket/14277
[ticket/14277] Fix undefined index error in migrations
2015-11-09 14:32:24 +01:00
Mate Bartus
671598656c [ticket/14277] Fix CS
PHPBB3-14277
2015-11-09 09:15:17 +01:00
Mate Bartus
d04c7687c0 [ticket/14277] Use user_id if available
PHPBB3-14277
2015-11-09 09:11:03 +01:00
Mate Bartus
e02432ec82 [ticket/14277] Fix undefined index error in migrations
PHPBB3-14277
2015-11-08 22:11:14 +01:00
Marc Alexander
d8760568b6 Merge pull request #4019 from prototech/ticket/14273
[ticket/14273] Remove unused core.root_path dependency in files.upload service
2015-11-06 21:47:05 +01:00
Oliver Schramm
022c271caf Merge pull request #4020 from VSEphpbb/ticket/14274
[ticket/14274] Include user functions during installer
2015-11-06 18:36:17 +01:00
Oliver Schramm
fbb9f8859a Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_captcha.php
2015-11-06 13:28:24 +01:00
Oliver Schramm
854ee0b04d Merge pull request #3975 from prototech/ticket/11971
[ticket/11971] Validate "Spambot countermeasures" settings before saving
2015-11-06 12:06:47 +01:00
Matt Friedman
50d102c975 [ticket/14274] Include user functions during installer
PHPBB3-14274
2015-11-05 16:32:19 -08:00
Cesar G
a92083169a [ticket/14273] Remove unused core.root_path dependency in files.upload service
PHPBB3-14273
2015-11-05 13:52:04 -08:00
Máté Bartus
402f36e42d Merge pull request #4010 from Elsensee/ticket/14264
[ticket/14264] Don't use constants as return values
2015-11-05 21:43:00 +01:00
Oliver Schramm
ed02365868 [ticket/14264] Fix tests calling removed method
PHPBB3-14264
2015-11-05 20:52:37 +01:00
Tristan Darricau
c783c37c73 Merge pull request #3995 from CHItA/ticket/14044
[ticket/14044] Deduplicate the installers

* CHItA/ticket/14044:
  [ticket/14044] Add config as global in notify user
  [ticket/14044] Fix language selection data loss
  [ticket/14044] Patch language::set_fallback_array()
  [ticket/14044] Fix tests
  [ticket/14044] Fix wrong descriptions in install
  [ticket/14044] Solve missing email template error
  [ticket/14044] global $table_prefix in constants.php
  [ticket/14044] Try to fix missing table prefix
  [ticket/14044] Use the correct language file version
  [ticket/14044] Automatically trigger rollback on insert in transaction
  [ticket/14044] Use empty instead of !count
  [ticket/14044] Fix Sqlite error in tests
  [ticket/14044] Deduplicate the installers
2015-11-03 20:35:24 +01:00
Oliver Schramm
3c43865a15 [ticket/14264] Fix textreparser tests
PHPBB3-14264
2015-11-03 16:45:57 +01:00
Oliver Schramm
2016550a32 [ticket/14264] Don't use constants as return values
This will prevent BC breaking in the future if we decide to
get rid of constants.

PHPBB3-14264
2015-11-03 16:35:53 +01:00
Marc Alexander
8b7f711a18 Merge branch '3.1.x' 2015-11-03 09:36:43 +01:00
Marc Alexander
8dbf3976fd Merge pull request #4012 from RMcGirr83/ticket_14228
[ticket/14228] Vertical align of numbers in polls
2015-11-03 09:36:14 +01:00
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
Andreas Fischer
8c2fe55caf Merge pull request #4011 from Elsensee/ticket/14265
[ticket/14265] Make all tables available in container

* Elsensee/ticket/14265:
  [ticket/14265] Make all tables available in container
2015-11-02 21:17:55 +01:00
Richard McGirr
22d234a345 [ticket/14228] Vertical align of numbers in polls
PHPBB3-14228
2015-11-01 05:39:07 -05:00
Oliver Schramm
ec4bdf5438 [ticket/14265] Make all tables available in container
PHPBB3-14265
2015-11-01 03:16:44 +01: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
Mate Bartus
a910c86997 [ticket/14044] Fix tests
PHPBB3-14044
2015-10-30 14:58:53 +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
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
Marc Alexander
5f85f19a5e Merge branch '3.1.x' 2015-10-24 18:23:52 +02:00
Marc Alexander
6a7567459d Merge pull request #4004 from paul999/ticket/14258
[ticket/14258] Add event into auth::login before session creation
2015-10-24 18:23:49 +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
Andreas Fischer
7338c5d845 Merge pull request #4003 from Elsensee/ticket/14256
[ticket/14256] Remove PHP7 from the allowed failures

* Elsensee/ticket/14256:
  [ticket/14256] Remove PHP7 from the allowed failures
2015-10-24 11:42:22 +02:00
Oliver Schramm
c4d7b6321b [ticket/14256] Remove PHP7 from the allowed failures
PHPBB3-14256
2015-10-23 22:49:21 +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
Cesar G
5576c9f3b9 Merge pull request #3998 from Elsensee/ticket/14249
[ticket/14249] Fix online list order
2015-10-22 10:05:01 -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
Marc Alexander
9ccb596a06 Merge pull request #3993 from DavidIQ/ticket/10343
[ticket/10343] Show clearer indication an account is inactive in memberlist
2015-10-18 10:32:41 +02:00
Máté Bartus
9781a55711 Merge pull request #3994 from prototech/ticket/14174
[ticket/14174] Refine wording of error descriptions in new installer.
2015-10-18 10:02:03 +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
Máté Bartus
f1047ac854 Merge pull request #3992 from Nicofuma/ticket/14243
[ticket/14243] Exclude every .git directory from the pakages
2015-10-17 18:55:45 +02:00
Tristan Darricau
d64accd72c [ticket/14243] Exclude every .git directory from the pakages
PHPBB3-14243
2015-10-17 18:50:14 +02:00
Máté Bartus
24e8a30993 Merge pull request #3991 from Nicofuma/ticket/14243
[ticket/14243] Exclude every .git directory from the pakages
2015-10-17 18:05:59 +02:00
Tristan Darricau
e9f262611d [ticket/14243] Exclude every .git directory from the pakages
PHPBB3-14243
2015-10-17 18:04:06 +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
Tristan Darricau
a928b109d3 Merge pull request #3990 from CHItA/ticket/13371
[ticket/13371] Fix language loading for the old installer

* CHItA/ticket/13371:
  [ticket/13371] Add language files to the service as well
  [ticket/13371] Use user selected language in old installer
  [ticket/13371] Fix language loading for the old installer
2015-10-17 15:36:19 +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
Marc Alexander
6fba5613f8 Merge pull request #3987 from prototech/ticket/13945
[ticket/13945] Send reactivation requests to admins using notifications system.
2015-10-17 12:02:10 +02:00
Cesar G
c7d7967a91 [ticket/13945] Send reactivation requests to admins using notifications system.
PHPBB3-13945
2015-10-15 22:26:14 -07:00
Mate Bartus
f6171f0391 [ticket/14240] Fix packaging script for 3.2
PHPBB3-14240
2015-10-15 18:24:41 +02:00
Cesar G
aaca64e13e [ticket/13892] Replace other uses of self with static.
PHPBB3-13892
2015-10-15 02:39:55 -07:00
Cesar G
9de5668b80 [ticket/13892] Respect "Someone reports a post" notification setting.
report_post inherits from post_in_queue, therefore using self:: instead of
static:: results in the incorrect notification type being used to determine
which users to exclude from the notification.

PHPBB3-13892
2015-10-15 02:28:55 -07:00
Marc Alexander
2974353101 Merge branch '3.1.x' 2015-10-15 11:02:02 +02:00
Marc Alexander
bc6a4c4583 Merge pull request #3984 from prototech/ticket/12616
[ticket/12616] Remove report notifications when post is deleted/disapproved.
2015-10-15 11:01:59 +02:00
Marc Alexander
16ff320340 Merge pull request #3970 from prototech/ticket/13789
[ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
2015-10-15 08:59:34 +02:00
Cesar G
e634d2902d [ticket/12616] Remove report notifications when post is deleted/disapproved.
PHPBB3-12616
2015-10-14 22:50:50 -07:00
Cesar G
f657680311 [ticket/13831] Store provided reason when deleting from Mod. Queue module.
PHPBB3-13831
2015-10-14 19:41:44 -07:00
Cesar G
86d1b35a00 [ticket/13789] Update composer.lock.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Cesar G
90038e32cd [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Cesar G
2781623185 Merge pull request #3982 from Nicofuma/ticket/13652
[ticket/13652] Fix coding style
2015-10-14 09:10:08 -07:00
Tristan Darricau
84150d0d44 [ticket/13652] Fix coding style
PHPBB3-13652
2015-10-14 17:15:09 +02:00
Tristan Darricau
d26fcdda8d Merge pull request #3981 from ErnadoO/ticket/14235
[ticket/14235] Font Awesome in simple_header.html

* ErnadoO/ticket/14235:
  [ticket/14235] Font Awesome in simple_header.html
2015-10-14 17:12:38 +02:00
Erwan Nader
7dec0a6707 [ticket/14235] Font Awesome in simple_header.html
PHPBB3-14235
2015-10-14 16:58:35 +02:00
Tristan Darricau
886fb7c3f4 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14159] Hide version info on ACP if we don't have the permission
2015-10-14 16:56:44 +02:00
Tristan Darricau
240d07d0cf Merge pull request #3900 from Zoddo/ticket/14159
[ticket/14159] Hide version info on ACP if we don't have the permission

* Zoddo/ticket/14159:
  [ticket/14159] Hide version info on ACP if we don't have the permission
2015-10-14 16:40:06 +02:00
Tristan Darricau
9ac79453e1 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14192] Add core.memberlist_memberrow_before event
2015-10-14 16:36:52 +02:00
Tristan Darricau
f6776c1017 Merge pull request #3926 from Senky/ticket/14192
[ticket/14192] Add core.memberlist_memberrow_before event

* Senky/ticket/14192:
  [ticket/14192] Add core.memberlist_memberrow_before event
2015-10-14 16:35:24 +02:00
Tristan Darricau
df723c388a Merge branch '3.1.x'
* 3.1.x:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
2015-10-14 16:32:37 +02:00
Tristan Darricau
bab85da820 Merge pull request #3935 from Zoddo/ticket/10343
[ticket/10343] Allows a_user to show inactive accounts in memberlist

* Zoddo/ticket/10343:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
2015-10-14 16:32:33 +02:00
Tristan Darricau
1e36c6d16c Merge branch '3.1.x'
* 3.1.x:
  [ticket/13851] Fix ignore flood limit check
2015-10-14 16:27:02 +02:00
Tristan Darricau
bc11e648af Merge pull request #3978 from RMcGirr83/ticket_13851
[ticket/13851] Fix ignore flood limit check

* RMcGirr83/ticket_13851:
  [ticket/13851] Fix ignore flood limit check
2015-10-14 16:26:54 +02:00
Tristan Darricau
e94f9d7830 Merge branch '3.1.x'
* 3.1.x:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
2015-10-14 16:25:15 +02:00
Tristan Darricau
669618b5a0 Merge pull request #3979 from prototech/ticket/9153
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's

* prototech/ticket/9153:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
2015-10-14 16:25:08 +02:00
Tristan Darricau
cd114a68e9 Merge pull request #3441 from brunoais/feature/sql-bool-builder
[feature/sql-bool-builder] Extending DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Improved tests output to show the SQL error.
  [feature/sql-bool-builder] Adding the IS operator to predicted operators
  [feature/sql-bool-builder] test_single_not_like
  [feature/sql-bool-builder] test_single_like
  [feature/sql-bool-builder] test_single_not_in
  [feature/sql-bool-builder] test_single_in
  [feature/sql-bool-builder] test_and_of_or_of_and
  [feature/sql-bool-builder] test_triple_and_with_in
  [feature/sql-bool-builder] test_double_and_with_not_of_and
  [feature/sql-bool-builder] test_triple_and_with_is_null
  [feature/sql-bool-builder] Prepare testing class
  [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations
  [feature/sql-bool-builder] Explain better the code in the first
  [feature/sql-bool-builder] Also use parenthesis for the NOT operator
  [feature/sql-bool-builder] AS keyword must be lowercase;
  [feature/sql-bool-builder] Added code to use this feature for the WHERE clause
  [feature/sql-bool-builder] Removed non-necessary spaces
  [feature/sql-bool-builder] First working version
2015-10-14 16:18:46 +02:00
Máté Bartus
4682b5abdd Merge pull request #3980 from marc1706/ticket/10572
[ticket/10572] Remove excessive new line
2015-10-14 15:53:55 +02:00
Marc Alexander
bf72a27c5f [ticket/10572] Remove excessive new line
PHPBB3-10572
2015-10-14 15:50:15 +02:00
Cesar G
9ec8faff32 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13684] Prevent horizontal resize of attach comment textarea
2015-10-14 04:29:50 -07:00
Cesar G
50bf3411d4 Merge pull request #3959 from marc1706/ticket/13684
[ticket/13684] Prevent horizontal resize of attach comment textarea
2015-10-14 04:28:34 -07:00
Richard McGirr
a49a3091f9 [ticket/13851] Fix ignore flood limit check
PHPBB3-13851
2015-10-14 07:25:35 -04:00
Cesar G
5d8e900483 [ticket/11971] Validate "Spambot countermeasures" settings before saving.
PHPBB3-11971
2015-10-14 03:31:34 -07:00
Cesar G
fb3073029f [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the
error message within the UCP template. Otherwise it could be removed as
compose_pm() will check the appropriate permission pertaining to the attempted
action.

PHPBB3-9153
2015-10-14 03:09:06 -07:00
Marc Alexander
57a2e63300 Merge branch '3.1.x'
Conflicts:
	.travis.yml
2015-10-14 12:04:58 +02:00
Marc Alexander
3367f0036a Merge pull request #3977 from Nicofuma/ticket/14236
[ticket/14236] Don't dump Opcache config in Travis
2015-10-14 12:04:12 +02:00
Tristan Darricau
69b57eab5e [ticket/14236] Don't dump Opcache config in Travis
PHPBB3-14236
2015-10-14 11:46:47 +02:00
Marc Alexander
6bcec956ba [ticket/13684] Prevent horizontal resize of attach comment textarea
PHPBB3-13684
2015-10-14 11:13:15 +02:00
Marc Alexander
fd0ddd6b76 Merge pull request #3974 from Nicofuma/ticket/14238
[ticket/14238] Updates Symfony
2015-10-14 10:57:00 +02:00
Marc Alexander
9ebbf2099b Merge branch '3.1.x'
Conflicts:
	.travis.yml
2015-10-14 10:42:57 +02:00
Marc Alexander
ccb3d0ac78 Merge pull request #3973 from Nicofuma/ticket/14236
[ticket/14236] Disable Opcache on Travis when running the tests
2015-10-14 10:41:06 +02:00
Tristan Darricau
83969053c0 [ticket/14238] Updates Symfony
PHPBB3-14238
2015-10-14 10:25:52 +02:00
Tristan Darricau
e0fb680dbb Merge branch '3.1.x'
* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
2015-10-14 10:17:04 +02:00
Tristan Darricau
6572164754 Merge pull request #3542 from RMcGirr83/ticket/10572
[ticket/10572] Unguarded includes in acp files

* RMcGirr83/ticket/10572:
  [ticket/10572] Unguarded includes in acp files
2015-10-14 10:09:36 +02:00
Matt Friedman
28cc98a7ac [ticket/14237] Consistent references to classes in docblocks
PHPBB3-14237
2015-10-14 01:05:34 -07:00
Tristan Darricau
345e8ad822 [ticket/14236] Disable Opcache on Travis when running the tests
PHPBB3-14236
2015-10-14 09:45:11 +02:00
Tristan Darricau
1d6e173259 Merge pull request #3965 from marc1706/ticket/14234
[ticket/14234] Use replacement variables instead of references in events

* marc1706/ticket/14234:
  [ticket/14234] Fix event doc blocks
  [ticket/14234] Get rid of undefined variables
  [ticket/14234] Fix change version and remove more references
  [ticket/14234] Replace more references with variables
  [ticket/14234] Use replacement variables instead of references in events
2015-10-14 08:59:17 +02:00
Matt Friedman
b64a37d451 [ticket/14237] Use $language class for notifications
PHPBB3-14237
2015-10-13 23:40:52 -07:00
Tristan Darricau
cac090b659 Merge pull request #3913 from marc1706/ticket/14168
[ticket/14168] Refactor attachment management functions into classes

* marc1706/ticket/14168: (36 commits)
  [ticket/14168] Correctly state return type of upload and upload_attachment
  [ticket/14168] Use attachment manager instead of separate classes
  [ticket/14168] Fix docblock in manager
  [ticket/14168] Add more test cases for attachment manager
  [ticket/14168] Add new test method and more tests
  [ticket/14168] Fix tabs in manager and add test file
  [ticket/14168] Fix tests after rebase
  [ticket/14168] Add attachment manager service
  [ticket/14168] Use correct docblock
  [ticket/14168] Add services_attachment.yml to services.yml
  [ticket/14168] Minor coding style fixes
  [ticket/14168] Move attachment service definitions to services_attachment
  [ticket/14168] Improve code coverage in upload class
  [ticket/14168] Move image check and don't use trigger_error()
  [ticket/14168] Add tests for init_error() during upload
  [ticket/14168] Add basic test file for attachments upload
  [ticket/14168] Fix CS issue
  [ticket/14168] No longer use deprecated functions in core files
  [ticket/14168] Move phpbb_unlink() into attachment delete class
  [ticket/14168] Reset sequence before tests in delete tests
  ...
2015-10-14 08:40:01 +02:00
Tristan Darricau
359ef56e35 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
2015-10-14 08:38:32 +02:00
Tristan Darricau
bdf69817be Merge pull request #3968 from prototech/ticket/13835
[ticket/13835] Normalize filename for attachments uploaded in chunks.

* prototech/ticket/13835:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
2015-10-14 08:38:15 +02:00
Andreas Fischer
a0f1365953 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14114] Update 3.0.x version references in INSTALL.html.
2015-10-14 08:33:36 +02:00
Andreas Fischer
9ebc369d74 Merge pull request #3969 from prototech/ticket/14114
[ticket/14114] Update 3.0.x version references in INSTALL.html.

* prototech/ticket/14114:
  [ticket/14114] Update 3.0.x version references in INSTALL.html.
2015-10-14 08:33:35 +02:00
Cesar G
14966a2962 [ticket/14114] Update 3.0.x version references in INSTALL.html.
PHPBB3-14114
2015-10-13 21:05:04 -07:00
Cesar G
655f244c4f [ticket/13835] Normalize filename for attachments uploaded in chunks.
PHPBB3-13835
2015-10-13 20:17:26 -07:00
Richard McGirr
d003b53922 [ticket/10572] Unguarded includes in acp files
PHPBB3-10572
2015-10-13 11:52:52 -04:00
Marc Alexander
102d737d81 [ticket/14234] Fix event doc blocks
PHPBB3-14234
2015-10-12 22:20:52 +02:00
Marc Alexander
75e5e2471e [ticket/14234] Get rid of undefined variables
PHPBB3-14234
2015-10-12 21:56:09 +02:00
Marc Alexander
578ee077c1 [ticket/14234] Fix change version and remove more references
PHPBB3-14234
2015-10-12 19:41:17 +02:00
Marc Alexander
f3e2bd9273 [ticket/14234] Replace more references with variables
PHPBB3-14234
2015-10-12 18:50:14 +02:00
Marc Alexander
f90b16df0d [ticket/14234] Use replacement variables instead of references in events
PHPBB3-14234
2015-10-12 18:39:29 +02:00
Zoddo
c5752be50c [ticket/10343] Add a distinction for inactive users on memberlist
PHPBB3-10343
2015-10-12 17:11:22 +02:00
Jakub Senko
66ee80c9e2 [ticket/14192] Add core.memberlist_memberrow_before event
PHPBB3-14192
2015-10-12 16:40:45 +02:00
Tristan Darricau
a5ab2eb564 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14098] Add core events to the search backends
2015-10-12 13:38:42 +02:00
Tristan Darricau
1164cc38a2 Merge pull request #3830 from rxu/ticket/14098
[ticket/14098] Add core events to the search backends

* rxu/ticket/14098:
  [ticket/14098] Add core events to the search backends
2015-10-12 13:38:42 +02:00
Marc Alexander
bb2634b5e5 [ticket/14168] Correctly state return type of upload and upload_attachment
PHPBB3-14168
2015-10-12 12:11:26 +02:00
Tristan Darricau
b7fe324ed7 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14144] Add quickreply_editor_subject_before event
2015-10-12 12:05:07 +02:00
Tristan Darricau
e87209742b Merge pull request #3887 from Senky/ticket/14144
[ticket/14144] Add quickreply_editor_subject_before event

* Senky/ticket/14144:
  [ticket/14144] Add quickreply_editor_subject_before event
2015-10-12 12:03:17 +02:00
Tristan Darricau
7bbce946de Merge branch '3.1.x'
* 3.1.x:
  [ticket/14163] Properly fix select all for code tag in Edge
2015-10-12 11:52:18 +02:00
Tristan Darricau
d92baaa2f7 Merge pull request #3908 from marc1706/ticket/14163
[ticket/14163] Properly fix select all for code tag in Edge

* marc1706/ticket/14163:
  [ticket/14163] Properly fix select all for code tag in Edge
2015-10-12 11:52:18 +02:00
Tristan Darricau
17dbe4c17a Merge branch '3.1.x'
* 3.1.x:
  [ticket/14164] Add instructions to use the CLI for database updates
2015-10-12 11:45:37 +02:00
Tristan Darricau
bc34217c14 Merge pull request #3906 from Zoddo/ticket/14164
[ticket/14164] Add instructions to use the CLI for database updates

* Zoddo/ticket/14164:
  [ticket/14164] Add instructions to use the CLI for database updates
2015-10-12 11:45:36 +02:00
Marc Alexander
49312f05f8 [ticket/14168] Use attachment manager instead of separate classes
PHPBB3-14168
2015-10-12 11:34:11 +02:00
Tristan Darricau
af1597ae25 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14191] Add core.get_gravatar_url_after event
2015-10-12 11:32:05 +02:00
Tristan Darricau
65b13938db Merge pull request #3925 from Senky/ticket/14191
[ticket/14191] Add core.get_gravatar_url_after event

* Senky/ticket/14191:
  [ticket/14191] Add core.get_gravatar_url_after event
2015-10-12 11:32:05 +02:00
Tristan Darricau
93b88393f6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14187] Add acp_styles_list_before event
2015-10-12 11:23:10 +02:00
Tristan Darricau
8c3aa1458c Merge pull request #3921 from Senky/ticket/14187
[ticket/14187] Add acp_styles_list_before event

* Senky/ticket/14187:
  [ticket/14187] Add acp_styles_list_before event
2015-10-12 11:23:10 +02:00
Tristan Darricau
16e731d735 Merge remote-tracking branch 'upstream/3.1.x'
* upstream/3.1.x:
  [ticket/14188] Add core.acp_styles_action_before event
2015-10-12 11:18:14 +02:00
Tristan Darricau
d9a4146113 Merge pull request #3922 from Senky/ticket/14188
[ticket/14188] Add core.acp_styles_action_before event

* Senky/ticket/14188:
  [ticket/14188] Add core.acp_styles_action_before event
2015-10-12 11:06:46 +02:00
Tristan Darricau
1baa8adfe3 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14212] Fix version number
  [ticket/14212] Adding event after users have been removed to a group
2015-10-12 10:27:13 +02:00
Tristan Darricau
e603fa56db Merge pull request #3944 from Wardormeur/ticket/14212
[ticket/14212] Adding event after users have been removed to a group

* Wardormeur/ticket/14212:
  [ticket/14212] Fix version number
  [ticket/14212] Adding event after users have been removed to a group
2015-10-12 10:27:13 +02:00
Tristan Darricau
ce45813e2c Merge branch '3.1.x'
* 3.1.x:
  [ticket/13591] Change SQL query into array to allow
2015-10-12 10:20:32 +02:00
Tristan Darricau
2668fa42ad Merge pull request #3946 from RMcGirr83/ticket_13591
[ticket/13591] Change SQL query into array to allow

* RMcGirr83/ticket_13591:
  [ticket/13591] Change SQL query into array to allow
2015-10-12 10:20:16 +02:00
Jakub Senko
fcf6c20291 [ticket/14144] Add quickreply_editor_subject_before event
PHPBB3-14144
2015-10-12 09:40:08 +02:00
Tristan Darricau
fcf797c3f2 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14200] Allow hidden users to see himself on viewonline
2015-10-12 09:20:13 +02:00
Tristan Darricau
5f8fb38b52 Merge pull request #3957 from Zoddo/ticket/14200
[ticket/14200] Allow hidden users to see himself on viewonline

* Zoddo/ticket/14200:
  [ticket/14200] Allow hidden users to see himself on viewonline
2015-10-12 09:19:24 +02:00
Tristan Darricau
766fc3a394 Merge pull request #3964 from prototech/ticket/13993
[ticket/13993] Do not parse signatures as posts when editing them.

* prototech/ticket/13993:
  [ticket/13993] Do not parse signatures as posts when editing them.
2015-10-12 08:54:33 +02:00
Cesar G
45501e50c9 Merge remote-tracking branch 'marc1706/ticket/14230'
* marc1706/ticket/14230:
  [ticket/14230] Show unread post icon in different color
2015-10-11 16:03:13 -07:00
Cesar G
0a93db705b [ticket/13993] Do not parse signatures as posts when editing them.
The implementation of PHPBB3-12516 changed the manual use of the message parser
to using generate_text_for_storage(). The function does not support
parse_message::parse()'s mode parameter, thus all the error checks on the sig
are invalid.

PHPBB3-13993
2015-10-11 15:46:43 -07:00
Marc Alexander
87b9cede4b Merge pull request #3962 from hanakin/ticket/14231
[ticket/14231]Fix double icon issue
2015-10-11 20:31:44 +02:00
Marc Alexander
fe175fbcb8 Merge branch '3.1.x' 2015-10-11 20:27:47 +02:00
Marc Alexander
5f05a8a8f8 Merge pull request #3902 from Zoddo/ticket/14161
[ticket/14161] Wrong var name for core.download_file_send_to_browser_before
2015-10-11 20:27:14 +02:00
Zoddo
97118a897a [ticket/14161] Wrong var name for core.download_file_send_to_browser_before
`extension` must be `extensions`

Introduced in fix of PHPBB3-14101 (PR GH-3831)

PHPBB3-14161
2015-10-11 14:20:11 +02:00
Michael Miday
07b2f4db08 [ticket/14231]Fix double icon issue
PHPBB3-14231
2015-10-11 14:09:34 +02:00
Marc Alexander
2fd3d9d1c9 [ticket/14230] Show unread post icon in different color
PHPBB3-14230
2015-10-11 14:01:44 +02:00
Marc Alexander
03cb2a7b0c Merge pull request #3931 from hanakin/ticket/14194
[Ticket/14194] Responsive Quick Links Menu Broken
2015-10-11 13:24:13 +02:00
Michael Miday
8acbb20891 [ticket14194]Remove double inline-block
PHPBB3-14194
2015-10-11 11:43:36 +02:00
Marc Alexander
8c3fdfe4e1 Merge branch '3.1.x' 2015-10-11 10:48:53 +02:00
Marc Alexander
f6c8338358 Merge pull request #3864 from Zoddo/ticket/8920
[ticket/8920] Add a MCP PM reports view permission
2015-10-11 10:47:44 +02:00
Michael Miday
9f651e2777 [ticket/14194]Fix search and quicklinks
PHPBB3-14194
2015-10-11 10:43:49 +02:00
Michael Miday
148d7d9b79 [ticket/14194]Patch dropdown small-icon
PHPBB3-14194
2015-10-11 10:41:18 +02:00
Michael Miday
a5017c7488 [ticket/14194] Fix quick-links responsive menu
PHPBB3-14194
2015-10-11 10:41:08 +02:00
Marc Alexander
f6f796770a Merge pull request #3903 from Zoddo/ticket/13101
[ticket/13101] Remove MSN/WLM custom profile field
2015-10-10 20:52:52 +02:00
Marc Alexander
d1b7101fed Merge pull request #3896 from Zoddo/ticket/14157
[ticket/14157] Allow to set the alt/title attribute on post icons
2015-10-10 16:43:15 +02:00
Zoddo
8eb9ce50b0 [ticket/14200] Allow hidden users to see himself on viewonline
PHPBB3-14200
2015-10-10 16:33:40 +02:00
Zoddo
3937f1f4ae [ticket/14157] Allow to set the alt/title attribute on post icons
PHPBB3-14157
2015-10-10 15:29:31 +02:00
Zoddo
21201aa1ab [ticket/13101] Remove existing MSN/WLM custom profile field
PHPBB3-13101
2015-10-10 15:24:22 +02:00
rxu
d75750fd99 [ticket/14098] Add core events to the search backends
PHPBB3-14098
2015-10-09 23:06:16 +07:00
Marc Alexander
6ebadee5d0 Merge branch '3.1.x' 2015-10-09 16:51:35 +02:00
Marc Alexander
def21f27a2 Merge pull request #3893 from VSEphpbb/ticket/14155
[ticket/14155] Row highlighting for extension/styles management

Conflicts:
	phpBB/adm/style/acp_ext_list.html
2015-10-09 16:51:00 +02:00
Marc Alexander
b2e7de0379 Merge branch '3.1.x' 2015-10-09 16:45:07 +02:00
Marc Alexander
8683824ed3 Merge pull request #3934 from Zoddo/ticket/14181
[ticket/14181] Fix empty denial reason if the reason isn't translated
2015-10-09 16:43:53 +02:00
Marc Alexander
c664bbdf9c Merge pull request #3912 from hanakin/ticket/14175
[ticket/14175] Refactor responsive implementation for easier manipulation
2015-10-09 15:51:31 +02:00
Marc Alexander
a0167ad410 [ticket/14168] Fix docblock in manager
PHPBB3-14168
2015-10-09 14:35:40 +02:00
Marc Alexander
52dccd3dba [ticket/14168] Add more test cases for attachment manager
PHPBB3-14168
2015-10-09 14:33:12 +02:00
Marc Alexander
b90783a296 [ticket/14168] Add new test method and more tests
One test method to rule them all.

PHPBB3-14168
2015-10-09 12:29:00 +02:00
Marc Alexander
53008c8782 [ticket/14168] Fix tabs in manager and add test file
PHPBB3-14168
2015-10-09 12:14:19 +02:00
Marc Alexander
88033feb85 [ticket/14168] Fix tests after rebase
PHPBB3-14168
2015-10-09 11:15:21 +02:00
Tristan Darricau
415a9daa6a Merge branch '3.1.x'
* 3.1.x:
  [ticket/8800] Add "mark topics read" link to "View unread posts"
2015-10-09 11:00:39 +02:00
Tristan Darricau
b04b5dea36 Merge pull request #3869 from Zoddo/ticket/8800
[ticket/8800] Add "mark topics read" link to "View unread posts"

* Zoddo/ticket/8800:
  [ticket/8800] Add "mark topics read" link to "View unread posts"
2015-10-09 11:00:09 +02:00
Marc Alexander
c78dbd2eea [ticket/14168] Add attachment manager service
PHPBB3-14168
2015-10-09 10:20:30 +02:00
Marc Alexander
22b36d9d0e [ticket/14168] Use correct docblock
PHPBB3-14168
2015-10-09 10:20:30 +02:00
Marc Alexander
ca1308ba5f [ticket/14168] Add services_attachment.yml to services.yml
PHPBB3-14168
2015-10-09 10:20:30 +02:00
Marc Alexander
80e3c79f38 [ticket/14168] Minor coding style fixes
PHPBB3-14168
2015-10-09 10:20:29 +02:00
Marc Alexander
11475283eb [ticket/14168] Move attachment service definitions to services_attachment
PHPBB3-14168
2015-10-09 10:20:27 +02:00
Marc Alexander
1f1e708815 [ticket/14168] Improve code coverage in upload class
PHPBB3-14168
2015-10-09 10:18:41 +02:00
Marc Alexander
36ea105236 [ticket/14168] Move image check and don't use trigger_error()
PHPBB3-14168
2015-10-09 10:18:41 +02:00
Marc Alexander
6c80fd92c6 [ticket/14168] Add tests for init_error() during upload
PHPBB3-14168
2015-10-09 10:18:40 +02:00
Marc Alexander
8a6224bf8a [ticket/14168] Add basic test file for attachments upload
PHPBB3-14168
2015-10-09 10:18:40 +02:00
Marc Alexander
b7238bca0e [ticket/14168] Fix CS issue
PHPBB3-14168
2015-10-09 10:18:40 +02:00
Marc Alexander
98ebbbdca2 [ticket/14168] No longer use deprecated functions in core files
PHPBB3-14168
2015-10-09 10:18:40 +02:00
Marc Alexander
0478631389 [ticket/14168] Move phpbb_unlink() into attachment delete class
PHPBB3-14168
2015-10-09 10:18:31 +02:00
Marc Alexander
8d03b9e001 [ticket/14168] Reset sequence before tests in delete tests
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
c6f9e3a966 [ticket/14168] Fix resync tests on sqlite3
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
b00c7511f0 [ticket/14168] Add tests for attachment delete class
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
583f42a2aa [ticket/14168] Add tests for attachment resync class
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
cebc064f4c [ticket/14168] Coding guidelines fixes
PHPBB3-14168
2015-10-09 10:15:40 +02:00
Marc Alexander
e158db5daa [ticket/14168] Minor coding style fixes
PHPBB3-14168
2015-10-09 10:15:39 +02:00
Marc Alexander
40117c7730 [ticket/14168] Add attachment resync class
PHPBB3-14168
2015-10-09 10:15:38 +02:00
Marc Alexander
ebfdd69525 [ticket/14168] Further split up attachment delete class
PHPBB3-14168
2015-10-09 09:58:18 +02:00
Marc Alexander
4709c8a128 [ticket/14168] Unset prototype classes after use
PHPBB3-14168
2015-10-09 09:53:07 +02:00
Marc Alexander
2ce73a22e7 [ticket/14168] Fix tests after adding attachment delete class
PHPBB3-14168
2015-10-09 09:53:07 +02:00
Marc Alexander
d1030450f5 [ticket/14168] Move function for attachment deletion into class
PHPBB3-14168
2015-10-09 09:53:05 +02:00
Marc Alexander
16d5208d9a [ticket/14168] Use attachment upload class in message_parser
PHPBB3-14168
2015-10-09 09:46:11 +02:00
Marc Alexander
a60beb6f2f [ticket/14168] Further split up attachment upload class
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
e10aa45470 [ticket/14168] Further split up attachment upload class
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
6c1cd26b7a [ticket/14168] Split thumbnail creation to separate method
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
07c8e21e80 [ticket/14168] Use language class and fix incorrect docblock
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Marc Alexander
e50718008a [ticket/14168] Add attachment upload class
PHPBB3-14168
2015-10-09 09:46:10 +02:00
Michael Miday
4c1f7e1134 [ticket/14175]Remove styles in 700 for lastpost
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
b671aae1ec [ticket/14175]Remove "only screen and"
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
ab3af7984a [ticket/14175]Include responsive.css same as rest
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
bb9bfec624 [ticket/14175]Remove max-device width
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
6a17cc5560 [ticket/14175] Fix online overlap issues
PHPBB3-14175
2015-10-09 06:40:08 +02:00
Michael Miday
8062c2a18a [ticket/14175] Refactor the file
PHPBB3-14175
2015-10-09 06:40:07 +02:00
Máté Bartus
73fd3d1df8 Merge pull request #3955 from Nicofuma/ticket/14225
[ticket/14225] Inject the loader resolver when using the delegating loader
2015-10-08 23:23:57 +02:00
Tristan Darricau
0799a4808d [ticket/14225] Inject the loader resolver when using the delegating loader
PHPBB3-14225
2015-10-08 23:19:09 +02:00
RMcGirr83
8a52ccc938 [ticket/13591] Change SQL query into array to allow
extension authors to modify SQL query

PHPBB3-13591
2015-10-08 14:18:45 -04:00
Marc Alexander
8f10212f38 Merge branch '3.1.x' 2015-10-08 17:21:57 +02:00
Marc Alexander
a0dafbfb5f Merge pull request #3953 from rxu/ticket/14073-fix-whitespaces
[ticket/14073] Fix trailing whitespaces
2015-10-08 17:21:51 +02:00
rxu
70b5ffc41d [ticket/14073] Fix trailing whitespaces
PHPBB3-14073
2015-10-08 22:19:44 +07:00
Marc Alexander
0af9ee869d Merge branch '3.1.x' 2015-10-08 17:08:21 +02:00
Marc Alexander
e63ef0b28f Merge pull request #3814 from rxu/ticket/14073
[ticket/14073] Add several core events to the functions_admin.php
2015-10-08 17:08:15 +02:00
Marc Alexander
5f117bcb5e Merge branch '3.1.x' 2015-10-08 16:53:14 +02:00
Marc Alexander
6360d748db Merge pull request #3844 from rxu/ticket/14113
[ticket/14113] Add core events for customizing members search
2015-10-08 16:53:08 +02:00
rxu
e5b895de7b [ticket/14113] Add core events for customizing members search
Add core events to the memberlist.php for customizing members search.

PHPBB3-14113
2015-10-08 20:57:10 +07:00
rxu
3469cdce76 [ticket/14073] Add several core events to the functions_admin.php
Add core events to the functions move_posts(), delete_posts(),
delete_attachments().

PHPBB3-14073
2015-10-08 20:53:54 +07:00
Tristan Darricau
0c0e43e110 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14219] Add email to inactive user listing
2015-10-08 15:49:45 +02:00
Tristan Darricau
7a60cdd1d3 Merge pull request #3951 from RMcGirr83/ticket_14219
[ticket/14219] Add email to inactive user listing

* RMcGirr83/ticket_14219:
  [ticket/14219] Add email to inactive user listing
2015-10-08 15:49:39 +02:00
Tristan Darricau
73f9e7936a Merge branch '3.1.x'
* 3.1.x:
  [ticket/13934] Add enctype clause for profile fields
2015-10-08 15:45:46 +02:00
Tristan Darricau
5b7b0894e0 Merge pull request #3733 from javiexin/ticket/13934
[ticket/13934] Add enctype clause for profile fields

* javiexin/ticket/13934:
  [ticket/13934] Add enctype clause for profile fields
2015-10-08 15:45:34 +02:00
Tristan Darricau
6e90311550 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13960] Profile field validation breaks ACP
2015-10-08 15:42:55 +02:00
Tristan Darricau
542498e457 Merge pull request #3724 from javiexin/ticket/13960
[ticket/13960] Profile field validation breaks ACP

* javiexin/ticket/13960:
  [ticket/13960] Profile field validation breaks ACP
2015-10-08 15:42:33 +02:00
Marc Alexander
4f356661c5 Merge branch '3.1.x' 2015-10-08 15:11:35 +02:00
Marc Alexander
c38a128663 Merge pull request #3824 from rxu/ticket/14088
[ticket/14088] Add more core events to the search.php
2015-10-08 15:11:12 +02:00
Máté Bartus
ce2caf248c Merge pull request #3948 from Nicofuma/ticket/14220
[ticket/14220] Move route loading to services
2015-10-08 14:55:23 +02:00
Marc Alexander
a0ba6b7dc6 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-10-08 14:44:58 +02:00
Marc Alexander
c05a27396d Merge pull request #3820 from rxu/ticket/14080
[ticket/14080] Add template events around the topic row in viewforum_body.html
2015-10-08 14:43:12 +02:00
Tristan Darricau
403c647b9e [ticket/14220] Move route loading to services
PHPBB3-14220
2015-10-08 14:15:44 +02:00
Richard McGirr
4830b3eacd [ticket/14219] Add email to inactive user listing
in ACP.  May help in spotting spam accounts quickly

PHPBB3-14219
2015-10-08 06:10:49 -04:00
Marc Alexander
82743c7922 Merge pull request #3949 from hanakin/ticket/14221
[ticket/14221]Fix the header
2015-10-08 12:02:56 +02:00
Tristan Darricau
fdc9c06209 Merge pull request #3950 from marc1706/ticket/14222
[ticket/14222] Use request class instead of request_var in acp_users

* marc1706/ticket/14222:
  [ticket/14222] Use request class instead of request_var in acp_users
2015-10-08 10:59:01 +02:00
Marc Alexander
a679380f09 [ticket/14222] Use request class instead of request_var in acp_users
PHPBB3-14222
2015-10-08 10:52:00 +02:00
Michael Miday
78babc09fc [ticket/14221]Fix the header
PHPBB3-14221
2015-10-08 08:08:10 +02:00
Marc Alexander
b13393078c Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_users.php
2015-10-07 16:55:57 +02:00
Marc Alexander
cf62b303a6 Merge pull request #3440 from CHItA/ticket/13636
[ticket/13636] Deleting inactive user in acp_users gives unexpected link
2015-10-07 16:54:50 +02:00
Marc Alexander
f3ea34b311 Merge branch '3.1.x' 2015-10-07 16:50:43 +02:00
Marc Alexander
e5b2dc922f Merge pull request #3615 from rxu/ticket/13846
[ticket/13846] Fix softdelete feature workflow in viewtopic
2015-10-07 16:50:35 +02:00
Marc Alexander
3c448f889f Merge pull request #3871 from Zoddo/ticket/10165
[ticket/10165] Add a "Send test email" feature
2015-10-07 15:08:08 +02:00
Marc Alexander
da4d6dfa28 Merge pull request #3857 from Nicofuma/ticket/14124
[ticket/14124] Automatically translate exceptions in CLI
2015-10-07 14:47:23 +02:00
Marc Alexander
d7109fb130 Merge pull request #3947 from marc1706/ticket/14199
[ticket/14199] Correctly resolve merge conflicts
2015-10-07 14:41:30 +02:00
Marc Alexander
5e2ccb2dd7 [ticket/14199] Correctly resolve merge conflicts
PHPBB3-14199
2015-10-07 14:38:26 +02:00
Marc Alexander
ebb3169d56 Merge branch '3.1.x' 2015-10-07 14:18:50 +02:00
Marc Alexander
3fd1fa5492 Merge pull request #3716 from javiexin/ticket/13748
[ticket/13748] Wrong tooltip after poll vote change
2015-10-07 14:11:16 +02:00
Marc Alexander
64641f9b1f Merge pull request #3904 from Zoddo/ticket/14162
[ticket/14162] Add CLI commands to manage migrations
2015-10-07 14:03:02 +02:00
Marc Alexander
f68d5a59e6 Merge pull request #3927 from hanakin/ticket/14199
[ticket/14199] Fix screen reader compatability

Conflicts:
	phpBB/styles/prosilver/template/mcp_topic.html
	phpBB/styles/prosilver/template/overall_header.html
	phpBB/styles/prosilver/template/pagination.html
	phpBB/styles/prosilver/template/posting_buttons.html
	phpBB/styles/prosilver/template/posting_topic_review.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/ucp_pm_history.html
	phpBB/styles/prosilver/template/ucp_pm_message_header.html
	phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/prosilver/template/viewtopic_topic_tools.html
2015-10-07 12:05:38 +02:00
Marc Alexander
2695950a61 Merge pull request #3940 from hanakin/ticket/14206
[Ticket/14206]Fix jumpbox UI consistency
2015-10-07 11:52:08 +02:00
Marc Alexander
7bda33b525 Merge pull request #3932 from hanakin/ticket/14193
[ticket/14193]Fix secondary buttons
2015-10-07 11:48:56 +02:00
Wardormeur
bf0596d0a1 [ticket/14212] Fix version number
for core.group_delete_user_after event

PHPBB-14212
2015-10-06 08:54:48 +02:00
Tristan Darricau
617df4aa0e Merge pull request #3945 from marc1706/ticket/14216
[ticket/14216] Do not run thumbnail test if gd is disabled

* marc1706/ticket/14216:
  [ticket/14216] Do not run thumbnail test if gd is disabled
2015-10-04 22:28:13 +02:00
Marc Alexander
664119ec6b [ticket/14216] Do not run thumbnail test if gd is disabled
PHPBB3-14216
2015-10-04 21:15:46 +02:00
Marc Alexander
4437d0c794 Merge pull request #3939 from Nicofuma/ticket/14205
[ticket/14205] Bump PHP requirement to PHP 5.4
2015-10-04 20:27:43 +02:00
Wardormeur
a11d97cb36 [ticket/14212] Adding event after users have been removed to a group
The idea is to be able to map with others CMS by exposing most commons user configuration & changes.
Difference between the event before and after group belonging removal is that
users belongs to multiple groups, so that the belonging into a group also
depends on the others groups (and not only the deleted one), which is not
reflected before as the user is not yet deleted

PHPBB-14212
2015-10-04 19:33:54 +02:00
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4
PHPBB3-14205
2015-10-04 16:19:48 +02:00
Michael Miday
8907a66156 [ticket/14193]Minor cleanups
PHPBB3-14193
2015-10-03 05:16:08 +02:00
Michael Miday
6b7fa249f1 [ticket/14193]Fix posting buttons
PHPBB3-14193
2015-10-03 05:15:16 +02:00
Michael Miday
9da14c9b24 [ticket/14199]Add aria-hidden to all icons
PHPBB3-14199
2015-10-01 20:21:38 +02:00
Marc Alexander
8451272d69 Merge pull request #3933 from hanakin/ticket/14202
[ticket/14202]Add missing sr-only classes
2015-10-01 13:48:45 +02:00
Marc Alexander
c35c9a9d9c Merge pull request #3941 from hanakin/ticket/14195
[ticket/14195]Fix pupload & polls hiding
2015-10-01 11:42:54 +02:00
Michael Miday
f74743fb65 [ticket/14195]Revert hidden class
PHPBB3-14195
2015-09-28 22:06:43 +02:00
Michael Miday
0244be6d75 [ticket/14202]Remove blank line
PHPBB3-14202
2015-09-28 18:24:38 +02:00
Michael Miday
d50801a056 [ticket/14202]Add missing sr-only classes
PHPBB3-14202
2015-09-28 18:24:24 +02:00
Michael Miday
7806a2f1fd [ticket/14206]Fix button UI
PHPBB3-14206
2015-09-28 17:55:27 +02:00
Michael Miday
a19660ad4c [ticket/14206]Fix arrow placement
PHPBB3-14206
2015-09-28 17:54:26 +02:00
Zoddo
0947bda39d [ticket/10343] Allows a_user to show inactive accounts in memberlist
PHPBB3-10343
2015-09-27 17:55:49 +02:00
HB
66397ae0e4 [ticket/14181] Fix empty denial reason if the reason isn't translated
PHPBB3-14181
2015-09-27 17:23:49 +02:00
Zoddo
43d9657130 [ticket/13101] Remove MSN/WLM custom profile field from new installs
PHPBB3-13101
2015-09-27 12:55:57 +02:00
Lady_G
cb71a7b8d2 [ticket/14164] Add instructions to use the CLI for database updates
PHPBB3-14164
2015-09-27 12:40:57 +02:00
Andreas Fischer
a342517dfb Merge pull request #3919 from hanakin/ticket/12554
[ticket/12554] Fix blockquote overflow in lists

* hanakin/ticket/12554:
  [ticket/12554]Remove left margin when li
  [ticket/12554]Overide blockquote overflow in lists
2015-09-24 14:21:55 +02:00
Jakub Senko
d5f625382b [ticket/14191] Add core.get_gravatar_url_after event
PHPBB3-14191
2015-09-23 18:45:15 +02:00
Jakub Senko
20c0b57421 [ticket/14188] Add core.acp_styles_action_before event
PHPBB3-14188
2015-09-23 11:26:35 +02:00
Jakub Senko
65997eb577 [ticket/14187] Add acp_styles_list_before event
PHPBB3-14187
2015-09-23 11:03:42 +02:00
Michael Miday
d477d79dc8 [ticket/12554]Remove left margin when li 2015-09-23 06:29:30 +02:00
Andreas Fischer
4972141a14 Merge pull request #3916 from Nicofuma/ticket/12633
[ticket/12633] Doesn't use DEBUG to debug templates events

* Nicofuma/ticket/12633:
  [ticket/12633] Doesn't use DEBUG to debug templates events
2015-09-22 19:29:07 +02:00
Andreas Fischer
7e379c4cea Merge pull request #3920 from marc1706/ticket/14186
[ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()

* marc1706/ticket/14186:
  [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
2015-09-22 19:14:34 +02:00
Andreas Fischer
85718e63f1 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
2015-09-22 19:14:34 +02:00
Marc Alexander
d62b03e0de [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
PHPBB3-14186
2015-09-22 09:50:17 +02:00
Michael Miday
494c9047c7 [ticket/12554]Overide blockquote overflow in lists 2015-09-22 06:50:08 +02:00
Marc Alexander
692db1ad2b Merge pull request #3917 from Nicofuma/ticket/14182
[ticket/14182] Move v310\notifications_board migration to v320\...
2015-09-21 11:41:36 +02:00
Tristan Darricau
a7ba640ea7 [ticket/14182] Move v310\notifications_board migration to v320\...
PHPBB3-14182
2015-09-21 10:47:20 +02:00
Marc Alexander
db600d840d Merge pull request #3911 from Nicofuma/ticket/12577
[ticket/12577] Lazy initialize the password manager
2015-09-20 14:18:51 +02:00
Marc Alexander
20982df71e Merge pull request #3851 from hanakin/ticket/12769
[ticket/12769] Font-Awesome Integration & Icon overhaul
2015-09-20 14:16:01 +02:00
Tristan Darricau
26f6f6208b Merge pull request #3915 from marc1706/ticket/14180
[ticket/14180] Use unix line endings in type_foo

* marc1706/ticket/14180:
  [ticket/14180] Use unix line endings in type_foo
2015-09-20 12:47:49 +02:00
Zoddo
60099cf97c [ticket/14162] Add CLI command db:list
This command lists all installed and uninstalled migrations.

Note: The class is named `list_command`, because `list` is a reserved word
and can't be used as class name in PHP.

PHPBB3-14162
2015-09-20 12:29:33 +02:00
Zoddo
2596fba487 [ticket/14162] Add CLI command db:revert
This command allow to revert a migration from the CLI

PHPBB3-14162
2015-09-20 12:26:46 +02:00
Marc Alexander
7f3dfde163 [ticket/14180] Use unix line endings in type_foo
PHPBB3-14180
2015-09-20 10:05:23 +02:00
Marc Alexander
9df76ac987 Merge pull request #3914 from CHItA/ticket/14178
[ticket/14178] Fix installer's database helper test
2015-09-20 00:27:41 +02:00
Mate Bartus
635b5999b9 [ticket/14178] Fix installer's database helper test
PHPBB3-14178
2015-09-19 20:28:39 +02:00
Tristan Darricau
4c00474845 [ticket/12633] Doesn't use DEBUG to debug templates events
Check the templates events on runtime only when Twig debug is on

PHPBB3-12633
2015-09-18 21:23:34 +02:00
Tristan Darricau
f9f7f935b4 [ticket/12577] Docblock
PHPBB3-12577
2015-09-18 19:54:06 +02:00
Michael Miday
ff6d590b36 [ticket/12769] Fix font permissions 2015-09-17 18:57:33 +02:00
Michael Miday
f00a7e3acc [ticket/12769] Fix avatar spacing 2015-09-17 18:37:32 +02:00
Michael Miday
3eb63b921d [ticket/12769] Guess we should add the fonts 2015-09-17 18:37:32 +02:00
Michael Miday
aa5daba9f7 [ticket/12769] Fix spacing issue 2015-09-17 18:37:32 +02:00
Michael Miday
9fdb31affb [ticket/12769] More attachment icons 2015-09-17 18:37:32 +02:00
Michael Miday
faaafe14ed [ticket/12769] Fix some froom button inconsistency 2015-09-17 18:37:32 +02:00
Michael Miday
bc09f6899e [ticket/12769] Fix dropdown on topics 2015-09-17 18:37:32 +02:00
Michael Miday
a9d93af6f3 [ticket/12769] Fix paging arrows 2015-09-17 18:37:31 +02:00
Michael Miday
d13f31c5bf [ticket/12769] Fix search-boxs 2015-09-17 18:37:31 +02:00
Michael Miday
0a7650da30 [ticket/12769] Fix remaining action-bars 2015-09-17 18:37:31 +02:00
Michael Miday
623ac1e345 [ticket/12769] Fix bidi 2015-09-17 18:37:31 +02:00
Michael Miday
e345e82e66 [ticket/12769] Remove deuplicates from colours 2015-09-17 18:37:31 +02:00
Michael Miday
6f942ae48f [ticket/12769] Profile menu caret fix 2015-09-17 18:37:31 +02:00
Michael Miday
f32df4d949 [ticket/12769] Leftover imageset cleanup 2015-09-17 18:37:30 +02:00
Michael Miday
14e2631b92 [ticket/12769] Fix search-box styling 2015-09-17 18:37:30 +02:00
Michael Miday
353fce9625 [ticket/12769] Misc table fix 2015-09-17 18:37:30 +02:00
Michael Miday
91c4e8c5fb [ticket/12769] Misc Link fixes 2015-09-17 18:37:30 +02:00
Michael Miday
6cccd3bcdd [ticket/12769] Small icon BC 2015-09-17 18:37:30 +02:00
Michael Miday
47eb88e877 [ticket/12769] More dropdown refactoring 2015-09-17 18:37:30 +02:00
Michael Miday
bc18985bd4 [ticket/12769] slightly refactor linklists 2015-09-17 18:37:30 +02:00
Michael Miday
de7b1a2ec7 [ticket/12769] One more dropdown to refactor 2015-09-17 18:37:29 +02:00
Michael Miday
2523ec8277 [ticket/12769] Refacto action bar 2015-09-17 18:37:29 +02:00
Michael Miday
171424f89c [ticket/12769] We need some icon color classes 2015-09-17 18:37:29 +02:00
Michael Miday
201a961367 [ticket/12769] Completely refactor btns and paging 2015-09-17 18:37:29 +02:00
Michael Miday
77cf756378 [ticket/12769] Add icon module to work with 2015-09-17 18:37:29 +02:00
Michael Miday
cd97d591eb [ticket/12769] Fix dropdown styling 2015-09-17 18:37:29 +02:00
Michael Miday
32868a6f87 [ticket/12769] Fix responsive features 2015-09-17 18:37:29 +02:00
Michael Miday
ea591562ae [ticket/12769] Fix subscription toggling fn 2015-09-17 18:37:29 +02:00
Michael Miday
fd72a36a0c [ticket/12769] Add CDN dynamic fallback for FA 2015-09-17 18:37:28 +02:00
Michael Miday
c319955f00 [ticket/12769] Swap misc remaining icons 2015-09-17 18:37:28 +02:00
Michael Miday
4dd1b004e2 [ticket/12769] Swap icons in pagination 2015-09-17 18:37:28 +02:00
Michael Miday
6251d0124f [ticket/12769] Swap icons in viewforum 2015-09-17 18:37:28 +02:00
Michael Miday
efd1e2b740 [ticket/12769] Swap icons in topic_tools 2015-09-17 18:37:28 +02:00
Michael Miday
11bf9e5488 [ticket/12769] Swap icons in ucp 2015-09-17 18:37:28 +02:00
Michael Miday
4504fe4118 [ticket/12769] Swap out close icon 2015-09-17 18:37:27 +02:00
Michael Miday
6041ea8ec2 [ticket/12769] Swap icons in search_resaults 2015-09-17 18:37:27 +02:00
Michael Miday
b0025896e2 [ticket/12769] Swap icons in posts 2015-09-17 18:37:27 +02:00
Michael Miday
d146a609ac [ticket/12769] Swap icons in posting_buttons 2015-09-17 18:37:27 +02:00
Michael Miday
cc2eeeeb49 [ticket/12769] Swap icons in header 2015-09-17 18:37:27 +02:00
Michael Miday
62707ecc67 [ticket/12769] Swap icons in notification_dropdown 2015-09-17 18:37:27 +02:00
Michael Miday
c497be98f2 [ticket/12769] Swap icons in navbar_footer 2015-09-17 18:37:27 +02:00
Michael Miday
97007ddbab [ticket/12769] Swap icons in navbar_header 2015-09-17 18:37:26 +02:00
Michael Miday
5197be9ba5 [ticket/12769] Swap icons in mcp 2015-09-17 18:37:26 +02:00
Michael Miday
c4fd2b837e [ticket/12769] Swap icons in jumpbox 2015-09-17 18:37:26 +02:00
Michael Miday
c5066644bb [ticket/12769] Swap icons in forumlist_body 2015-09-17 18:37:25 +02:00
Michael Miday
c0590e7766 [ticket/12769] Swap icon in faq_body 2015-09-17 18:37:25 +02:00
Michael Miday
5988e3a192 [ticket/12769] Delete imageset & consolidate imgs 2015-09-17 18:37:25 +02:00
Michael Miday
956723af0e [ticket/12769] Properly include FA 2015-09-17 18:37:25 +02:00
Tristan Darricau
25f5e4f18f [ticket/12577] Lazy initialize the password manager
PHPBB3-12577
2015-09-17 15:36:04 +02:00
Marc Alexander
eab8a12fb8 Merge branch '3.1.x' 2015-09-16 22:48:10 +02:00
Marc Alexander
d92a46ef02 Merge pull request #3833 from rxu/ticket/14102
[ticket/14102] Add core event to the mcp_topic.php
2015-09-16 22:47:11 +02:00
Tristan Darricau
087e219a09 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14154] Add extension composer name as tooltip
2015-09-16 11:58:53 +02:00
Tristan Darricau
5b9d828328 Merge pull request #3895 from Zoddo/ticket/14154
[ticket/14154] Add extension composer name as tooltip

* Zoddo/ticket/14154:
  [ticket/14154] Add extension composer name as tooltip
2015-09-16 11:57:28 +02:00
Tristan Darricau
a562fea230 Merge pull request #3727 from marc1706/ticket/13904
[ticket/13904] Refactor attachments functions into service

* marc1706/ticket/13904: (66 commits)
  [ticket/13904] Use filespec's get_filesize instead of calling filesize()
  [ticket/13904] Set properties to protected where possible in filespec
  [ticket/13904] Fix tests after changes to factory
  [ticket/13904] Minor coding style fixes
  [ticket/13904] Add language entries for error messages in upload class
  [ticket/13904] Modify files for updated fast-image-size library
  [ticket/13904] Update composer.lock
  [ticket/13904] Improve code coverage
  [ticket/13904] Add unit tests for local upload type
  [ticket/13904] Minor coding style fixes
  [ticket/13904] Improve test coverage of base upload type class
  [ticket/13904] Improve test coverage of remote upload type
  [ticket/13904] Improve test coverage of form upload type
  [ticket/13904] Improve test coverage of filespec class
  [ticket/13904] Add back tests for retrieving floats
  [ticket/13904] Use ini_get() wrapper in file upload types
  [ticket/13904] Modify files for changes in ini wrapper
  [ticket/13904] Add bantu/ini-get-wrapper to composer.json
  [ticket/13904] Switch around constructor arguments
  [ticket/13904] Use \phpbb\php\ini class for ini_get()
  ...
2015-09-16 11:55:13 +02:00
Marc Alexander
d4a47409f7 Merge pull request #3907 from hanakin/ticket/14165
[ticket/14165] Fix layout of ucp/mcp after 14139
2015-09-15 16:44:45 +02:00
Michael Miday
eb691ba4af [ticket/14165] Fix Tab Layout 2015-09-15 16:02:47 +02:00
Marc Alexander
3cdf97f003 [ticket/14163] Properly fix select all for code tag in Edge
PHPBB3-14163
2015-09-15 14:42:11 +02:00
Marc Alexander
2a217e38e2 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/overall_header.html
2015-09-15 14:37:35 +02:00
Marc Alexander
2bf9e91101 Merge pull request #3865 from Zoddo/ticket/13992
[ticket/13992] Fix HTML5 error from w3.org validator
2015-09-15 14:35:29 +02:00
Marc Alexander
a033cd7d5e Merge pull request #3879 from hanakin/ticket/14139
[Ticket/14139] Stop styling with IDs
2015-09-15 10:08:14 +02:00
Michael Miday
3606e130de [ticket/14139] Fix loading indicator 2015-09-14 16:26:27 +02:00
Michael Miday
9e5e2ee3e2 [ticket/14139] Swap ids for classes in css files 2015-09-14 16:26:07 +02:00
Michael Miday
70f1b08c69 [ticket/14139] Add class of IDs to html tags 2015-09-14 16:25:36 +02:00
Marc Alexander
fe0e9b2e4c Merge pull request #3837 from hanakin/ticket/14107
[ticket/14107] Fix dropdown rtl states
2015-09-14 14:42:53 +02:00
Marc Alexander
3303ce511f Merge pull request #3905 from Zoddo/ticket/14078
[ticket/14078] Fix SQL error when editing a post with a quote
2015-09-14 12:45:12 +02:00
Zoddo
e9013db9b9 [ticket/14078] Fix SQL error when editing a post with a quote
PHPBB3-14078
2015-09-13 22:13:02 +02:00
Marc Alexander
797e70380b Merge branch '3.1.x' 2015-09-13 17:51:08 +02:00
Marc Alexander
bc518bf96e Merge pull request #3894 from Nicofuma/ticket/14156
[ticket/14156] Add Symfony ResponseListener
2015-09-13 17:51:02 +02:00
Zoddo
aa01ee1bbc [ticket/8920] Revert update_module_auth() on revert_data()
PHPBB3-8920
2015-09-13 14:06:10 +02:00
Marc Alexander
6651c1d8f4 [ticket/13904] Use filespec's get_filesize instead of calling filesize()
PHPBB3-13904
2015-09-13 09:31:23 +02:00
Marc Alexander
759dc9bb84 [ticket/13904] Set properties to protected where possible in filespec
PHPBB3-13904
2015-09-13 09:30:56 +02:00
Marc Alexander
3bde202a10 Merge pull request #3897 from Nicofuma/ticket/14158
[ticket/14158] Add language::lang_array() to avoid using call_user_func_array
2015-09-12 17:33:58 +02:00
Zoddo
2f4fcee7e8 [ticket/14159] Hide version info on ACP if we don't have the permission
This also hide a link to an unreachable module (Check phpBB version).

We could have simply remove the link to the module, but if the user hasn't
the permission to access to the phpBB version check module, I think that
he shouldn't view any version information about phpBB.

PHPBB3-14159
2015-09-12 17:11:20 +02:00
Zoddo
333c07d554 [ticket/10165] Add more information when sending the test email
PHPBB3-10165
2015-09-12 15:17:41 +02:00
Tristan Darricau
8aa8173ebf [ticket/14158] Fix 5.3 compatibility
PHPBB3-14158
2015-09-12 15:14:42 +02:00
Tristan Darricau
d332fe734c Merge pull request #3899 from marc1706/ticket/14089
[ticket/14089] Remove subsilver2 file from events.md

* marc1706/ticket/14089:
  [ticket/14089] Remove subsilver2 file from events.md
2015-09-12 15:09:57 +02:00
Zoddo
a4a99f5ea3 [ticket/14154] Add extension composer name as tooltip
PHPBB3-14154
2015-09-12 14:52:31 +02:00
Marc Alexander
baf95d3ca2 [ticket/14089] Remove subsilver2 file from events.md
PHPBB3-14089
2015-09-12 14:33:23 +02:00
Marc Alexander
087a42a887 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-09-12 13:24:29 +02:00
Marc Alexander
c166adf3c7 Merge pull request #3767 from Zoddo/ticket/14020
[ticket/14089] Add posting_topic_title_after template event

Conflicts:
	phpBB/docs/events.md
2015-09-12 13:23:47 +02:00
Tristan Darricau
8629eac393 [ticket/14158] Add language::lang_array() to avoid using call_user_func_array
PHPBB3-14158
2015-09-12 11:15:06 +02:00
Tristan Darricau
7d15704f6a [ticket/14156] Add Symfony ResponseListener
PHPBB3-14156
2015-09-11 18:17:09 +02:00
Marc Alexander
8f6b50922f Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/theme/common.css
	phpBB/styles/subsilver2/theme/stylesheet.css
2015-09-11 09:39:17 +02:00
Marc Alexander
46f6b4459a Merge pull request #3892 from cyberalien/ticket/14153
[ticket/14153] Fix floating elements in notifications dropdown header
2015-09-11 09:35:24 +02:00
Matt Friedman
0f49eaa2e2 [ticket/14155] Row highlighting for extension/styles management
PHPBB3-14155
2015-09-11 00:19:58 -07:00
cyberalien
0744330080 [ticket/14153] Fix floating elements in notifications dropdown header
PHPBB3-14153
2015-09-10 12:03:02 +03:00
Zoddo
57cb7e4111 [ticket/10165] Add a "Send test email" feature
PHPBB3-10165
2015-09-09 17:51:14 +02:00
Marc Alexander
40e614f564 [ticket/13904] Fix tests after changes to factory
PHPBB3-13904
2015-09-09 12:58:22 +02:00
Tristan Darricau
2c188f22d0 Merge branch '3.1.x'
* 3.1.x:
  [ticket/7362] Add alt attribute on topic icons
2015-09-09 11:06:58 +02:00
Tristan Darricau
c9d159257a Merge pull request #3868 from Zoddo/ticket/7362
[ticket/7362] Add alt attribute on topic icons

* Zoddo/ticket/7362:
  [ticket/7362] Add alt attribute on topic icons
2015-09-09 11:06:36 +02:00
Tristan Darricau
542d75b3a9 Merge pull request #3870 from Zoddo/ticket/9485
[ticket/9485] Add a "View post" link in the moderation logs

* Zoddo/ticket/9485:
  [ticket/9485] Fix tests
  [ticket/9485] Add post_id to relevant $phpbb_log->add()
  [ticket/9485] Add a "View post" link in the moderation logs
2015-09-09 11:04:13 +02:00
Tristan Darricau
b83ce0a702 Merge pull request #3876 from VSEphpbb/ticket/14138
[ticket/14138] Use span tags instead of abbr

* VSEphpbb/ticket/14138:
  [ticket/14138] Use span tags instead of abbr
2015-09-09 11:02:22 +02:00
Tristan Darricau
23205ca0cc Merge branch '3.1.x'
* 3.1.x:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
2015-09-09 11:01:03 +02:00
Tristan Darricau
1affd34814 Merge pull request #3890 from marc1706/ticket/13423
[ticket/13423] Set busyTimeout on connect to prevent db locking

* marc1706/ticket/13423:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
2015-09-09 11:00:44 +02:00
Marc Alexander
5f91f1cad8 [ticket/13904] Minor coding style fixes
PHPBB3-13904
2015-09-09 10:46:14 +02:00
Marc Alexander
70ad0c6a8f [ticket/13904] Add language entries for error messages in upload class
PHPBB3-13904
2015-09-09 10:43:12 +02:00
Marc Alexander
327e36a4d6 [ticket/13904] Modify files for updated fast-image-size library
PHPBB3-13904
2015-09-09 09:41:40 +02:00
Marc Alexander
223fa3aed5 [ticket/13904] Update composer.lock
PHPBB3-13904
2015-09-09 08:31:40 +02:00
Marc Alexander
e60c8a5a8b [ticket/13904] Improve code coverage
PHPBB3-13904
2015-09-09 08:29:12 +02:00
Marc Alexander
00e5ff9e2e [ticket/13904] Add unit tests for local upload type
PHPBB3-13904
2015-09-09 08:29:12 +02:00
Marc Alexander
7a92ad596c [ticket/13904] Minor coding style fixes
PHPBB3-13904
2015-09-09 08:29:11 +02:00
Marc Alexander
e5bffbf40f [ticket/13904] Improve test coverage of base upload type class
PHPBB3-13904
2015-09-09 08:29:10 +02:00
Marc Alexander
82bca32015 [ticket/13904] Improve test coverage of remote upload type
PHPBB3-13904
2015-09-09 08:29:09 +02:00
Marc Alexander
1b9e6e352f [ticket/13904] Improve test coverage of form upload type
PHPBB3-13904
2015-09-09 08:29:08 +02:00
Marc Alexander
591995267a [ticket/13904] Improve test coverage of filespec class
PHPBB3-13904
2015-09-09 08:29:07 +02:00
Marc Alexander
c3ccd423d2 [ticket/13904] Add back tests for retrieving floats
PHPBB3-13904
2015-09-09 08:29:07 +02:00
Marc Alexander
b29b62debe [ticket/13904] Use ini_get() wrapper in file upload types
PHPBB3-13904
2015-09-09 08:29:06 +02:00
Marc Alexander
16f3b8c2b9 [ticket/13904] Modify files for changes in ini wrapper
PHPBB3-13904
2015-09-09 08:29:05 +02:00
Marc Alexander
b2957b9d65 [ticket/13904] Add bantu/ini-get-wrapper to composer.json
PHPBB3-13904
2015-09-09 08:28:49 +02:00
Marc Alexander
36545d5cbe [ticket/13904] Switch around constructor arguments
PHPBB3-13904
2015-09-09 08:28:11 +02:00
Marc Alexander
cdde86ce7e [ticket/13904] Use \phpbb\php\ini class for ini_get()
PHPBB3-13904
2015-09-09 08:28:10 +02:00
Marc Alexander
02f94b7527 [ticket/13904] Update doc blocks
PHPBB3-13904
2015-09-09 08:28:09 +02:00
Marc Alexander
7ba0fe47a8 [ticket/13904] Test move file on existing error
PHPBB3-13904
2015-09-09 08:28:09 +02:00
Marc Alexander
46e3d82196 [ticket/13904] Add more tests and test cases
PHPBB3-13904
2015-09-09 08:28:08 +02:00
Marc Alexander
3e99816fa2 [ticket/13904] Set visibility in files and improve test coverage
PHPBB3-13904
2015-09-09 08:28:07 +02:00
Marc Alexander
9e87e5a343 [ticket/13904] Remove unused use statement
PHPBB3-13904
2015-09-09 08:28:06 +02:00
Marc Alexander
845233fc62 [ticket/13904] Improve test coverage and use constants instead of magic numbers
PHPBB3-13904
2015-09-09 08:28:05 +02:00
Marc Alexander
a09c6d1fb7 [ticket/13904] Split code up and pass root path to remote upload type
PHPBB3-13904
2015-09-09 08:28:04 +02:00
Marc Alexander
0a6f54d522 [ticket/13904] Modify doc blocks
PHPBB3-13904
2015-09-09 08:28:04 +02:00
Marc Alexander
759a1a09fa [ticket/13904] Fix remote upload functional tests
PHPBB3-13904
2015-09-09 08:28:03 +02:00
Marc Alexander
57ccfe0c48 [ticket/13904] Move remote upload to its own type class
PHPBB3-13904
2015-09-09 08:28:02 +02:00
Marc Alexander
5b21830ba8 [ticket/13904] Improve docblock
PHPBB3-13904
2015-09-09 08:28:01 +02:00
Marc Alexander
636a29d589 [ticket/13904] Split up local_upload method
PHPBB3-13904
2015-09-09 08:28:00 +02:00
Marc Alexander
167cc58f27 [ticket/13904] Add types base class
PHPBB3-13904
2015-09-09 08:27:59 +02:00
Marc Alexander
adcc901af1 [ticket/13904] Fix minor issues and move local_upload to its own class
PHPBB3-13904
2015-09-09 08:27:58 +02:00
Marc Alexander
cf9b6ed474 [ticket/13904] Use the class member plupload instead of argument
PHPBB3-13904
2015-09-09 08:27:58 +02:00
Marc Alexander
f9b69e73d4 [ticket/13904] Fix minor coding issues and don't use form_upload anymore
PHPBB3-13904
2015-09-09 08:27:57 +02:00
Marc Alexander
11b2c938c6 [ticket/13904] Move form_upload to its own class and define type classes
PHPBB3-13904
2015-09-09 08:27:56 +02:00
Marc Alexander
c65f0d748a [ticket/13904] Add more tests for upload class
PHPBB3-13904
2015-09-09 08:27:55 +02:00
Marc Alexander
b871dbcf1f [ticket/13904] Remove phpbb_root_path global from filespec class
PHPBB3-13904
2015-09-09 08:27:54 +02:00
Marc Alexander
52652ca182 [ticket/13904] Remove phpbb_root_path global from upload class
PHPBB3-13904
2015-09-09 08:27:53 +02:00
Marc Alexander
47f8f2cc88 [ticket/13904] Pass request service to upload instead of using global
PHPBB3-13904
2015-09-09 08:27:53 +02:00
Marc Alexander
697ac5f4aa [ticket/13904] Use language class instead of global user in filespec
PHPBB3-13904
2015-09-09 08:27:52 +02:00
Marc Alexander
6541e4cb17 [ticket/13904] Improve doc blocks in filespec class
PHPBB3-13904
2015-09-09 08:27:51 +02:00
Marc Alexander
ef59e0228a [ticket/13904] Fix tests again
PHPBB3-13904
2015-09-09 08:27:50 +02:00
Marc Alexander
0121e60cd7 [ticket/13904] Use language class instead of user global in upload
PHPBB3-13904
2015-09-09 08:27:49 +02:00
Marc Alexander
e4546ad03c [ticket/13904] Improve doc blocks in upload class
PHPBB3-13904
2015-09-09 08:27:48 +02:00
Marc Alexander
25df7f8149 [ticket/13904] Remove functions_fileupload.php
PHPBB3-13904
2015-09-09 08:27:47 +02:00
Marc Alexander
c34fd1e7c0 [ticket/13904] Fix fileupload functional tests
PHPBB3-13904
2015-09-09 08:27:47 +02:00
Marc Alexander
a53825ad76 [ticket/13904] No longer use fileerror class for extending filespec class
PHPBB3-13904
2015-09-09 08:27:46 +02:00
Marc Alexander
eb11973ea8 [ticket/13904] Use factory instead of container and add factory to services
PHPBB3-13904
2015-09-09 08:27:45 +02:00
Marc Alexander
f32a94ae5d [ticket/13904] Pass filesystem to upload avatar again
PHPBB3-13904
2015-09-09 08:27:44 +02:00
Marc Alexander
dbfdb61f82 [ticket/13904] Fix fileupload tests
PHPBB3-13904
2015-09-09 08:27:43 +02:00
Marc Alexander
2915647a54 [ticket/13904] Fix filespec tests
PHPBB3-13904
2015-09-09 08:27:42 +02:00
Marc Alexander
57de896286 [ticket/13904] Remove unneeded parameters from avatars and fix tests
PHPBB3-13904
2015-09-09 08:27:42 +02:00
Marc Alexander
0a98fc2561 [ticket/13904] Remove fileupload class
PHPBB3-13904
2015-09-09 08:27:41 +02:00
Marc Alexander
a96e7a8ec6 [ticket/13904] Get rid of useless parameters and variables
PHPBB3-13904
2015-09-09 08:27:40 +02:00
Marc Alexander
186b4495b6 [ticket/13904] Allow using factory for none files. classes
PHPBB3-13904
2015-09-09 08:27:39 +02:00
Marc Alexander
8c2cbc0599 [ticket/13904] Remove magic method from factory and allow short names
PHPBB3-13904
2015-09-09 08:27:38 +02:00
Marc Alexander
1af6f052d8 [ticket/13904] Load upload class using factory
PHPBB3-13904
2015-09-09 08:27:37 +02:00
Marc Alexander
d2be8e1503 [ticket/13904] Add fileupload class to files classes
PHPBB3-13904
2015-09-09 08:27:37 +02:00
Marc Alexander
92e49cd0ac [ticket/13904] Turn filespec into prototype and improve init methods
PHPBB3-13904
2015-09-09 08:27:36 +02:00
Marc Alexander
0cbb713cc2 [ticket/13904] Fix uploading for use with new filespec class
PHPBB3-13904
2015-09-09 08:27:35 +02:00
Marc Alexander
891ffb8ac7 [ticket/13904] Remove filespec class from functions_upload
PHPBB3-13904
2015-09-09 08:27:13 +02:00
Marc Alexander
c72d6a71bb [ticket/13904] Modify constructor to be instantiatable by container
PHPBB3-13904
2015-09-09 08:26:07 +02:00
Marc Alexander
557f1a89d5 [ticket/13904] Add filespec class to files classes
PHPBB3-13904
2015-09-09 08:26:06 +02:00
Marc Alexander
b971f20a5d [ticket/13904] Add initial factory for handling file classes
PHPBB3-13904
2015-09-09 08:26:05 +02:00
Tristan Darricau
dccc0877c1 Merge pull request #3891 from marc1706/ticket/14150
[ticket/14150] Update fast-image-size to newest version

* marc1706/ticket/14150:
  [ticket/14150] Update fast-image-size to newest version
2015-09-09 00:16:22 +02:00
Marc Alexander
9d18b3d1ee Merge branch '3.1.x' 2015-09-08 13:35:04 +02:00
Marc Alexander
90d5eefccf Merge pull request #3881 from VSEphpbb/ticket/14142
[ticket/14142] Remove unused ignore_configs from avatar drivers
2015-09-08 13:34:58 +02:00
Marc Alexander
58286171f1 [ticket/14150] Update fast-image-size to newest version
PHPBB3-14150
2015-09-08 12:59:55 +02:00
Marc Alexander
ea594d00f7 [ticket/13423] Set busyTimeout on connect to prevent db locking
PHPBB3-13423
2015-09-07 12:23:49 +02:00
Marc Alexander
3ddee852fa Merge branch '3.1.x'
Conflicts:
	phpBB/includes/functions_messenger.php
2015-09-07 12:16:12 +02:00
Marc Alexander
9537ec56eb Merge pull request #3884 from Nicofuma/ticket/14143
[ticket/14143] Flush the mail queue when writing it
2015-09-07 12:15:24 +02:00
Michael Miday
71def7cda6 [ticket/14107] Remove template var 2015-09-06 09:13:35 +02:00
Michael Miday
fd1195ed6a [ticket/14107] Fix typo 2015-09-06 09:13:35 +02:00
Michael Miday
39ca60023b [ticket/14107] Add back comment 2015-09-06 09:13:35 +02:00
Michael Miday
a21ed712bc [ticket/14107] Fix dropdown rtl states 2015-09-06 09:13:35 +02:00
Tristan Darricau
0e93efd7cb [ticket/14143] Flush the mail queue when writing it
PHPBB3-14143
2015-09-05 17:53:29 +02:00
Andreas Fischer
c2a5108452 Merge pull request #3878 from Nicofuma/ticket/14140-master
[ticket/14140] Update Symfony to latest 2.8-dev version  - #3877

* Nicofuma/ticket/14140-master:
  [ticket/14140] Update Symfony to latest 2.8-dev version
  [ticket/14140] Update SYmfony to 2.3.32
2015-09-05 16:08:28 +02:00
Andreas Fischer
35bb32ff88 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14140] Update SYmfony to 2.3.32

Conflicts:
	phpBB/composer.lock
2015-09-05 16:08:21 +02:00
Andreas Fischer
8cab2374f9 Merge pull request #3877 from Nicofuma/ticket/14140
[ticket/14140] Update Symfony to 2.3.32

* Nicofuma/ticket/14140:
  [ticket/14140] Update SYmfony to 2.3.32
2015-09-05 16:08:13 +02:00
Joas Schilling
fb3e9d9a77 Merge branch '3.1.x'
Conflicts:
	build/build.xml
2015-09-05 15:20:38 +02:00
Joas Schilling
f201c22ca7 Merge branch 'prep-release-3.1.6' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-09-05 15:19:16 +02:00
Joas Schilling
5258fba2e0 [prep-release-3.1.6] Add migration for 3.1.6 2015-09-05 12:45:53 +02:00
Joas Schilling
82a45cd4da [prep-release-3.1.6] Update version for final 3.1.6 release 2015-09-05 12:45:00 +02:00
Matt Friedman
076807c63a [ticket/14142] Remove unused ignore_configs from avatar drivers
PHPBB3-14142
2015-09-04 13:38:14 -07:00
Zoddo
053a6d1d70 [ticket/8800] Add "mark topics read" link to "View unread posts"
PHPBB3-8800
2015-09-04 20:06:13 +02:00
Tristan Darricau
7701034871 [ticket/14140] Update SYmfony to 2.3.32
PHPBB3-14140
2015-09-03 14:57:05 +02:00
Tristan Darricau
615ed729b5 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14123] Fix typo
  [ticket/14123] Remove redundant help messages
  [ticket/14123] Add descriptive help to the CLI help output
2015-09-02 12:45:34 +02:00
Tristan Darricau
5faa12db4c Merge pull request #3855 from VSEphpbb/ticket/14123
[ticket/14123] Add descriptive help to the CLI help output

* VSEphpbb/ticket/14123:
  [ticket/14123] Fix typo
  [ticket/14123] Remove redundant help messages
  [ticket/14123] Add descriptive help to the CLI help output
2015-09-02 12:44:52 +02:00
Tristan Darricau
42631dc093 [ticket/14140] Update Symfony to latest 2.8-dev version
PHPBB3-14140
2015-09-02 12:37:00 +02:00
Tristan Darricau
9546035632 Merge branch 'ticket/14140' into ticket/14140-master
* ticket/14140:
  [ticket/14140] Update SYmfony to 2.3.32
2015-09-02 12:28:30 +02:00
Tristan Darricau
1c4a72bba0 [ticket/14140] Update SYmfony to 2.3.32
PHPBB3-14140
2015-09-02 12:26:26 +02:00
Tristan Darricau
28da758163 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14075] Update version to 3.1.7-RC1
  [ticket/14075] Add template event after poll preview panel
2015-09-02 12:04:49 +02:00
Tristan Darricau
58af8606c1 Merge pull request #3853 from marc1706/ticket/14075
[ticket/14075] Add template event after poll preview panel

* marc1706/ticket/14075:
  [ticket/14075] Update version to 3.1.7-RC1
  [ticket/14075] Add template event after poll preview panel
2015-09-02 12:03:58 +02:00
Tristan Darricau
058c3116ed Merge branch '3.1.x'
* 3.1.x:
  [ticket/14126] Add viewtopic_topic_title_after template event
2015-09-02 12:00:48 +02:00
Tristan Darricau
48d05bad25 Merge pull request #3860 from kinerity/ticket/14126
[ticket/14126] Add viewtopic_topic_title_after template event

* kinerity/ticket/14126:
  [ticket/14126] Add viewtopic_topic_title_after template event
2015-09-02 11:59:14 +02:00
Tristan Darricau
5d4c7f9952 Merge branch '3.1.x'
* 3.1.x:
  [ticket/11468] Allow controllers to set paramters of page_header()
2015-09-02 11:51:16 +02:00
Tristan Darricau
2ee8b14f86 Merge pull request #3872 from Zoddo/ticket/11468
[ticket/11468] Allow controllers to set paramters of page_header()

* Zoddo/ticket/11468:
  [ticket/11468] Allow controllers to set paramters of page_header()
2015-09-02 11:50:35 +02:00
Matt Friedman
b4dbb5b249 [ticket/14138] Use span tags instead of abbr
PHPBB3-14138
2015-09-01 15:13:12 -07:00
Tristan Darricau
4a75a8eaa3 Merge pull request #3875 from hanakin/ticket/14137
[Ticket/14137] Fix Notification Menu Layout issue

* hanakin/ticket/14137:
  [ticket/14137]
2015-09-01 22:25:14 +02:00
Michael Miday
a6ff0c8775 [ticket/14137] 2015-09-01 22:15:48 +02:00
Tristan Darricau
5b8164a1bb Merge branch '3.1.x'
* 3.1.x:
  [ticket/13950] Hide undefined categories
  [ticket/13950] Hide undefined permissions
2015-09-01 21:47:19 +02:00
Tristan Darricau
8749c99e34 Merge pull request #3765 from Zoddo/ticket/13950
[ticket/13950] Hide undefined permissions

* Zoddo/ticket/13950:
  [ticket/13950] Hide undefined categories
  [ticket/13950] Hide undefined permissions
2015-09-01 21:47:05 +02:00
Tristan Darricau
5e643ae750 Merge pull request #3861 from hanakin/ticket/12821
[ticket/12821] Convert all images to gradients

* hanakin/ticket/12821:
  [ticket/12821] Graceful ie9 fallbacks
  [ticket/12821] IE 9 requires filter: none for svg
  [ticket/12821] Update all Gradients to last two
  [ticket/12821] Convert all colors to upper
  [ticket/12821] Update all gradients
2015-09-01 19:15:49 +02:00
Tristan Darricau
9faf434d37 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14133] Comment fix for phpbb_get_user_rank()
2015-09-01 18:51:10 +02:00
Tristan Darricau
4979d98aa9 Merge pull request #3873 from lavigor/ticket/14133
[ticket/14133] Comment fix for phpbb_get_user_rank()

* lavigor/ticket/14133:
  [ticket/14133] Comment fix for phpbb_get_user_rank()
2015-09-01 18:46:56 +02:00
Michael Miday
39b39fd783 [ticket/12821] Graceful ie9 fallbacks 2015-09-01 18:24:08 +02:00
Michael Miday
39b20b89f3 [ticket/12821] IE 9 requires filter: none for svg 2015-09-01 18:24:08 +02:00
Michael Miday
9e8b4f5622 [ticket/12821] Update all Gradients to last two 2015-09-01 18:24:08 +02:00
Michael Miday
985e4ee3d4 [ticket/12821] Convert all colors to upper 2015-09-01 18:24:07 +02:00
Michael Miday
d81ca8d7a5 [ticket/12821] Update all gradients 2015-09-01 18:24:07 +02:00
Tristan Darricau
8c758e223e Merge pull request #3866 from hanakin/ticket/14038
[Ticket/14038] Jumpbox improvements

* hanakin/ticket/14038:
  [ticket/14038] Minor color tweaks
  [ticket/14038] Switch to spacer spans
  [ticket/14038] Stylize & differintiate
  [ticket/14038] Give links some visual love
2015-09-01 18:07:06 +02:00
lavigor
3fe517f50c [ticket/14133] Comment fix for phpbb_get_user_rank()
PHPBB3-14133
2015-08-31 21:49:22 +03:00
Michael Miday
aafa5b6ed0 [ticket/14038] Minor color tweaks 2015-08-31 06:35:54 +02:00
Zoddo
cc060a2611 [ticket/11468] Allow controllers to set paramters of page_header()
PHPBB3-11468
2015-08-30 23:24:07 +02:00
Zoddo
1fbdf615f2 [ticket/9485] Fix tests
PHPBB3-9485
2015-08-30 22:43:19 +02:00
Zoddo
51600b8f18 [ticket/9485] Add post_id to relevant $phpbb_log->add()
PHPBB3-9485
2015-08-30 22:43:07 +02:00
Max Pen
96521767f8 [ticket/13992] Fix HTML5 error from w3.org validator
PHPBB3-13992
2015-08-30 22:02:39 +02:00
Zoddo
306fbf23a8 [ticket/9485] Add a "View post" link in the moderation logs
PHPBB3-9485
2015-08-30 19:52:00 +02:00
Michael Miday
d228c80c61 [ticket/14038] Switch to spacer spans 2015-08-30 18:54:39 +02:00
Michael Miday
0e26b4e68f [ticket/14038] Stylize & differintiate 2015-08-30 18:30:40 +02:00
Zoddo
a606b1c480 [ticket/7362] Add alt attribute on topic icons
PHPBB3-7362
2015-08-30 14:37:28 +02:00
Michael Miday
5b112b974f [ticket/14038] Give links some visual love 2015-08-30 14:01:56 +02:00
Zoddo
e9e199bc37 [ticket/8920] Add a MCP PM reports view permission
Anybody who has the permission to read reports in one forum
can read PM reports.

Solving this problem by adding a new permission to read PM reports.

PHPBB3-8920
2015-08-30 12:18:37 +02:00
Zoddo
af246483e2 [ticket/13950] Hide undefined categories
This hides the categories added by disabled extensions

PHPBB3-13950
2015-08-28 18:56:10 +02:00
Zoddo
11b2bffa8e [ticket/13950] Hide undefined permissions
This hides the permissions of the disabled extensions

PHPBB3-13950
2015-08-28 18:43:59 +02:00
Tristan Darricau
214c5c6d0b Merge branch '3.1.x'
* 3.1.x:
  [ticket/13988] Update tests
  [ticket/13988] Use absolute path for image attachments in feeds
2015-08-28 17:34:50 +02:00
Tristan Darricau
bfbce5a1b0 Merge pull request #3764 from Zoddo/ticket/13988
[ticket/13988] Use absolute path for image attachments in feeds

* Zoddo/ticket/13988:
  [ticket/13988] Update tests
  [ticket/13988] Use absolute path for image attachments in feeds
2015-08-28 17:05:09 +02:00
Matt Friedman
76158e429b [ticket/14123] Fix typo
PHPBB3-14123
2015-08-28 07:54:50 -07:00
Matt Friedman
6c36f56b12 [ticket/14123] Remove redundant help messages
PHPBB3-14123
2015-08-28 07:49:07 -07:00
Tristan Darricau
c3ceafb37d Merge branch '3.1.x'
* 3.1.x:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
2015-08-28 16:40:41 +02:00
Tristan Darricau
624f5ae921 Merge pull request #3835 from rxu/ticket/14106
[ticket/14106] Fix topics sorting in MCP for topics merging.

* rxu/ticket/14106:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
2015-08-28 16:40:33 +02:00
Tristan Darricau
74418f2300 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14058] Contact us form missing email subject field in subsilver2
2015-08-28 16:30:04 +02:00
Tristan Darricau
6d7a5dfe5e Merge pull request #3802 from Oyabun1/ticket/14058
[ticket/14058] Contact us form missing email subject field in subsilver2

* Oyabun1/ticket/14058:
  [ticket/14058] Contact us form missing email subject field in subsilver2
2015-08-28 16:29:31 +02:00
Tristan Darricau
9e0a075be1 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14070] Properly pass whether config should be ignored for avatars
2015-08-28 16:28:59 +02:00
Tristan Darricau
90d18356a0 Merge pull request #3809 from marc1706/ticket/14070
[ticket/14070] Properly pass whether config should be ignored for avatars

* marc1706/ticket/14070:
  [ticket/14070] Properly pass whether config should be ignored for avatars
2015-08-28 16:27:05 +02:00
Máté Bartus
e91e525e8a Merge pull request #3858 from Nicofuma/ticket/14125
[ticket/14125] Add --env option to all CLI commands
2015-08-28 12:00:46 +02:00
Máté Bartus
e8219e8610 Merge pull request #3470 from Nicofuma/ticket/13645
[ticket/13645] Move the feeds to controllers
2015-08-28 10:39:07 +02:00
Máté Bartus
6dc195e5a7 Merge pull request #3859 from Nicofuma/ticket/13897
[ticket/13897] Make dependency to the filesystem optional in error handler
2015-08-28 09:58:44 +02:00
Tristan Darricau
3babe02540 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol
2015-08-27 23:09:11 +02:00
Tristan Darricau
eb2b3868bb Merge pull request #3862 from Zoddo/ticket/14127
[ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol

* Zoddo/ticket/14127:
  [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol
2015-08-27 23:09:01 +02:00
Tristan Darricau
7d41a9894a Merge pull request #3863 from VSEphpbb/ticket/14128
[ticket/14128] Fix img bbcode regression, lost postimage class

* VSEphpbb/ticket/14128:
  [ticket/14128] Fix img bbcode regression, lost postimage class
2015-08-27 22:55:37 +02:00
Matt Friedman
e19d446881 [ticket/14128] Fix img bbcode regression, lost postimage class
PHPBB3-14128
2015-08-26 14:08:59 -07:00
Tristan Darricau
de686a2e83 Merge pull request #3840 from hanakin/ticket/12719
[ticket/12719] Convert to Normalize & SUITCSS

* hanakin/ticket/12719:
  [ticket/12719] normalize 3.0.3 and firefox 40 fx
  [ticket/12719] Remove old reset
  [ticket/12719] Fix hamburger menu icon
  [ticket/12719] Fix pagination
  [ticket/12719] Fix Buttons
  [ticket/12719] Add normalize & base
2015-08-26 19:28:55 +02:00
Michael Miday
b8692e459c [ticket/12719] normalize 3.0.3 and firefox 40 fx 2015-08-26 17:39:14 +02:00
Marc Alexander
b96250b391 Merge pull request #3478 from n-aleha/ticket/12505
[ticket/12505] Remove outdated media handling in attachments
2015-08-26 15:27:07 +02:00
Tristan Darricau
d13d66fc01 [ticket/14124] CS
PHPBB3-14124
2015-08-26 14:09:42 +02:00
Tristan Darricau
2e81771c6e [ticket/14124] Update cron tests
PHPBB3-14124
2015-08-26 12:49:18 +02:00
Michael Miday
69039054a0 [ticket/12719] Remove old reset 2015-08-26 06:44:04 +02:00
Tristan Darricau
2a07de70c2 [ticket/14124] Migrate cron:run exceptions
PHPBB3-14124
2015-08-25 22:24:37 +02:00
Tristan Darricau
17e7a89a60 [ticket/14124] Automatically translate exceptions in CLI
PHPBB3-14124
2015-08-25 22:24:28 +02:00
Tristan Darricau
6af8c579e0 [ticket/13897] Make dependency to the filesystem optional in error handler
PHPBB3-13897
2015-08-25 21:44:40 +02:00
Marc Alexander
5a51acd643 [ticket/14075] Update version to 3.1.7-RC1
PHPBB3-14075
2015-08-25 15:22:09 +02:00
Zoddo
2b01772fa9 [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol
This error was accidentally introduced in the patch
for PHPBB3-13967 (PR #3729)

PHPBB3-14127
2015-08-25 12:43:18 +02:00
Kailey Truscott
d08c5edcca [ticket/14126] Add viewtopic_topic_title_after template event
Add content directly after the topic title link on the View topic screen
(outside of the h2 HTML tag).

PHPBB3-14126
2015-08-24 17:53:09 -04:00
Tristan Darricau
c868582e44 [ticket/14125] Add --env option to all CLI commands
PHPBB3-14125
2015-08-24 18:07:37 +02:00
Tristan Darricau
c9ec16f614 [ticket/13645] Fix docblocks
PHPBB3-13645
2015-08-24 03:24:26 +02:00
Matt Friedman
13851f308f [ticket/14123] Add descriptive help to the CLI help output
PHPBB3-14123
2015-08-23 15:14:08 -07:00
n-aleha
afccb9cb49 [ticket/12505] Fix variable usage in migration file
PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
1f16704d34 [ticket/12505] Add migration
PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
5cc6370cea [ticket/12505] Set deprecations for constants to 3.2
PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
83f45bdac0 [ticket/12505] Remove outdated media extensions
Update constants and data schema for new installations.
Mark outdated media constants as deprecated.

PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
c60b92bf61 [ticket/12505] Remove outdated media handling from acp
Remove outdated media handling from acp

PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
436b020f9e [ticket/12505] Remove outdated media handling from prosilver
PHPBB3-12505
2015-08-24 00:40:26 +03:00
n-aleha
626dfbdd86 [ticket/12505] Remove outdated media handing in attachments
Remove code for handling media in RealPlayer, QuickTime, and Windows Media
Player.

PHPBB3-12505
2015-08-24 00:27:42 +03:00
Tristan Darricau
f6a4843c6d Merge pull request #3652 from Elsensee/ticket/12143
[ticket/12143] Make it possible to use translated group names for non-special groups

* Elsensee/ticket/12143:
  [ticket/12143] Fix tests after rebase
  [ticket/12143] Avoid no output from get_group_name()
  [ticket/12143] Fix those tests
  [ticket/12143] Add some tests
  [ticket/12143] Oops, fixed array index
  [ticket/12143] Replace group name output
  [ticket/12143] Add group helper class to translate groupnames
  [ticket/12143] Add is_set method to language service
2015-08-23 22:42:18 +02:00
Tristan Darricau
5df9a45473 [ticket/13645] Proper OOP for feeds
PHPBB3-13645
2015-08-23 22:36:10 +02:00
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers
PHPBB3-13645
2015-08-23 22:36:10 +02:00
Tristan Darricau
f56fe0ba8d Merge pull request #3842 from CHItA/ticket/14097
[ticket/14097] Improve error and failure handling in the installer

* CHItA/ticket/14097:
  [ticket/14097] Remove auto refresh on install failure
  [ticket/14097] Improve error and failure handling in the installer
2015-08-23 21:44:28 +02:00
Joas Schilling
05851e2b4b Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-08-23 18:27:30 +02:00
Joas Schilling
335452b1c1 [3.1.x] Update version to 3.1.7-dev 2015-08-23 18:24:12 +02:00
Joas Schilling
4be255ef9f Merge branch 'prep-release-3.1.6' into 3.1.x 2015-08-23 18:22:33 +02:00
Joas Schilling
5be06ec66a [prep-release-3.1.6] Add changelog for 3.1.6-RC1 2015-08-23 17:20:22 +02:00
Joas Schilling
623a8f2d0f [prep-release-3.1.6] Add migration for 3.1.6-RC1 2015-08-23 16:54:43 +02:00
Joas Schilling
819eca99a8 [prep-release-3.1.6] Update version to 3.1.6-RC1 2015-08-23 16:50:43 +02:00
Joas Schilling
eb53e51e36 Merge branch '3.1.x' 2015-08-23 16:33:11 +02:00
Joas Schilling
96fe2666f7 Merge pull request #3854 from Nicofuma/ticket/14099-master
[ticket/14099] Update twig/twig to 1.20.0 - master version
2015-08-23 16:33:04 +02:00
Joas Schilling
a7272fec97 Merge pull request #3829 from Nicofuma/ticket/14099
[ticket/14099] Update Twig to 1.20.0
2015-08-23 16:30:26 +02:00
Tristan Darricau
e0be660e16 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14099] Fix the assets
  [ticket/14099] Make composer.phar executable again
  [ticket/14099] Fix tests
  [ticket/14099] Update twig/twig to 1.20.0
  [ticket/14099] Update composer.phar
2015-08-23 15:21:40 +02:00
Zoddo
0caaf86158 [ticket/14089] Add posting_topic_title_after template event
Allows to add some information after the topic title in the posting form

PHPBB3-14089
2015-08-23 14:12:44 +02:00
Marc Alexander
c96c6877bf Merge branch '3.1.x'
Conflicts:
	phpBB/includes/ucp/ucp_activate.php
2015-08-22 10:41:46 +02:00
Marc Alexander
f585f48aca Merge pull request #3823 from lavigor/ticket/14087
[ticket/14087] Add an event to ucp_activate.php.
2015-08-22 10:40:33 +02:00
Marc Alexander
f2edec90b0 Merge branch '3.1.x' 2015-08-22 10:37:53 +02:00
Marc Alexander
d8dd6bad6b Merge pull request #3834 from brunoais/ticket/14104
[ticket/14104] Fix missing  variables from previous commit
2015-08-22 10:37:48 +02:00
Marc Alexander
eb168913d9 Merge branch '3.1.x' 2015-08-22 10:36:15 +02:00
Marc Alexander
f2a0fe39a5 Merge pull request #3831 from rxu/ticket/14101
[ticket/14101] Add core event to the download/file.php
2015-08-22 10:36:09 +02:00
Marc Alexander
fdca5532e6 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-08-22 10:32:41 +02:00
Marc Alexander
b09e1ad26d Merge pull request #3852 from marc1706/ticket/14068
[ticket/14068] Add template events before and after poll panel in viewtopic
2015-08-22 10:32:09 +02:00
Marc Alexander
1cc3d24cd8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
2015-08-22 09:09:08 +02:00
Marc Alexander
583068da9d Merge pull request #3771 from Zoddo/ticket/14025
[ticket/14091] Add mcp_topic_subject_* template events

Conflicts:
	phpBB/docs/events.md
2015-08-22 09:08:11 +02:00
javiexin
f153342fb3 [ticket/14075] Add template event after poll preview panel
PHPBB3-14075
2015-08-22 08:57:26 +02:00
Marc Alexander
1a9bc8a7ad Merge branch '3.1.x'
Conflicts:
	phpBB/includes/message_parser.php
2015-08-22 08:51:09 +02:00
Marc Alexander
2d24b9b61f Merge pull request #3813 from rxu/ticket/14072
[ticket/14072] Add core event to the function format_display()
2015-08-22 08:49:21 +02:00
javiexin
04b0ba9f6d [ticket/14068] Add template events before and after poll panel
In viewtopic.

PHPBB3-14068
2015-08-22 08:28:33 +02:00
Marc Alexander
6cdb61e68c Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_history.html
2015-08-22 08:18:21 +02:00
Marc Alexander
ccd1e1eebb Merge pull request #3803 from rxu/ticket/14064
[ticket/14064] Add template events to ucp_pm_history.html
2015-08-22 08:17:50 +02:00
Marc Alexander
c8db7ae7c4 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
2015-08-22 08:14:18 +02:00
Marc Alexander
a959e5f4cc Merge pull request #3806 from rxu/ticket/14067
[ticket/14067] Add template events to overall_header.html around feeds
2015-08-22 08:13:39 +02:00
Marc Alexander
d30b5207b8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
2015-08-22 08:11:15 +02:00
Marc Alexander
697ccd41c4 Merge pull request #3804 from rxu/ticket/14065
[ticket/14065] Add template events to attachment.html
2015-08-22 08:10:27 +02:00
Mate Bartus
dd1b777ca7 [ticket/14097] Remove auto refresh on install failure
PHPBB3-14097
2015-08-21 18:03:36 +02:00
Tristan Darricau
b802732167 Merge branch 'ticket/14099' into 3.1.x
* ticket/14099:
  [ticket/14099] Fix the assets
  [ticket/14099] Make composer.phar executable again
  [ticket/14099] Fix tests
  [ticket/14099] Update twig/twig to 1.20.0
  [ticket/14099] Update composer.phar
2015-08-21 09:34:26 +02:00
Marc Alexander
942705e6c6 Merge branch '3.1.x' 2015-08-20 15:48:18 +02:00
Marc Alexander
6c98b01ad1 Merge pull request #3849 from marc1706/ticket/14037
[ticket/14037] Allows adapting memberlist profile fields headline
2015-08-20 15:48:12 +02:00
Marc Alexander
648389af6f Merge branch '3.1.x'
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/mcp_forum.html
2015-08-20 10:23:56 +02:00
Marc Alexander
ffe72e500c Merge pull request #3797 from RMcGirr83/ticket/13863
[ticket/13863] Add topic_row_append/prepend to mcp_forum.html
2015-08-20 10:22:42 +02:00
Marc Alexander
7cdaa03e20 Merge branch '3.1.x' 2015-08-20 10:17:50 +02:00
Marc Alexander
6f1d848087 Merge pull request #3783 from Zoddo/ticket/14041
[ticket/14041] Add viewtopic_dropdown_*_custom template event
2015-08-20 10:17:45 +02:00
Marc Alexander
897b9f333b [ticket/14037] Minor coding style improvements to event
PHPBB3-14037
2015-08-20 10:14:07 +02:00
javiexin
cf0170d5e3 [ticket/14037] Allows adapting memberlist profile fields headline
Adds an event to allow modifying the profile fields headline in line
with modifications to profile fields data.

PHPBB3-14037
2015-08-20 10:12:59 +02:00
Marc Alexander
5ae821ee28 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
2015-08-20 10:08:47 +02:00
Marc Alexander
00aab15f7c Merge pull request #3769 from Zoddo/ticket/14023
[ticket/14090] Add mcp_topic_topic_title_* template events
2015-08-20 10:08:06 +02:00
Marc Alexander
aaa13be1ec Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/breadcrumbs.html
2015-08-20 08:56:45 +02:00
Marc Alexander
11a0516739 Merge pull request #3846 from rxu/ticket/14115
[ticket/14115] Fix breadcrumbs microdata to make it valid
2015-08-20 08:51:42 +02:00
Andreas Fischer
0a5f7d2e51 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14116] sql_affectedrows method has no arguments
2015-08-20 03:52:34 +02:00
Andreas Fischer
ef3de412b7 Merge pull request #3848 from VSEphpbb/ticket/14116
[ticket/14116] sql_affectedrows method has no arguments

* VSEphpbb/ticket/14116:
  [ticket/14116] sql_affectedrows method has no arguments
2015-08-20 03:52:34 +02:00
Michael Miday
53ef8815b1 [ticket/12719] Fix hamburger menu icon 2015-08-20 02:36:16 +02:00
Michael Miday
6105f98219 [ticket/12719] Fix pagination 2015-08-20 02:36:16 +02:00
Michael Miday
922f631a46 [ticket/12719] Fix Buttons 2015-08-20 02:36:15 +02:00
Michael Miday
4fac568d5e [ticket/12719] Add normalize & base
phpbb3-12719
2015-08-20 02:35:56 +02:00
Matt Friedman
50a7167c9a [ticket/14116] sql_affectedrows method has no arguments
PHPBB3-14116
2015-08-19 16:12:01 -07:00
rxu
51eaa8917f [ticket/14115] Fix breadcrumbs microdata to make it valid
PHPBB3-14115
2015-08-20 01:12:12 +07:00
Tristan Darricau
5f905f67ee [ticket/14099] Fix the assets
PHPBB3-14099
2015-08-18 21:03:03 +02:00
Andreas Fischer
35a48279a7 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14077] Fall back to 1 as focusOffset if length is unsupported
2015-08-18 10:47:40 -04:00
Andreas Fischer
19267242e3 Merge pull request #3818 from marc1706/ticket/14077
[ticket/14077] Fall back to 1 as focusOffset if length is unsupported

* marc1706/ticket/14077:
  [ticket/14077] Fall back to 1 as focusOffset if length is unsupported
2015-08-18 10:47:40 -04:00
Mate Bartus
f4f0ff0eec [ticket/14097] Improve error and failure handling in the installer
PHPBB3-14097
2015-08-17 18:38:07 +02:00
Marc Alexander
452b3b4890 [ticket/14077] Fall back to 1 as focusOffset if length is unsupported
The setBaseAndExtent() in Microsoft's Edge browser is incompatible with
the one Webkit browsers use. As a result of that, we have to fall back to
setting the focusOffset to 1 instead of the text length.

PHPBB3-14077
2015-08-17 15:25:13 +02:00
Tristan Darricau
5b534369d1 [ticket/14099] Make composer.phar executable again
PHPBB3-14099
2015-08-17 10:27:21 +02:00
Marc Alexander
dce1c5d4c9 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/theme/stylesheet.css
2015-08-17 09:39:16 +02:00
Marc Alexander
dcf12cad26 Merge pull request #3832 from cyberalien/ticket/14103
[ticket/14103] Reset text-decoration in abbr element
2015-08-17 09:38:15 +02:00
rxu
ec032733de [ticket/14106] Fix topics sorting in MCP for topics merging.
The "bug" in the deleted code comment is non-existent now.
The PR is for 3.1 only.

PHPBB3-14106
2015-08-16 19:55:00 +07:00
brunoais
81b4293cc5 [ticket/14104] Fix missing variables from previous commit
Fixing variables wrongly attributed in PHPBB3-13691

PHPBB3-14104
2015-08-15 22:04:51 +01:00
rxu
6b0f235cc9 [ticket/14102] Add core event to the mcp_topic.php
PHPBB3-14102
2015-08-15 18:38:25 +07:00
cyberalien
d89c952955 [ticket/14103] Reset text-decoration in abbr element
PHPBB3-14103
2015-08-15 13:57:48 +03:00
rxu
e22dbbc7e8 [ticket/14101] Add core event to the download/file.php
PHPBB3-14101
2015-08-15 16:34:30 +07:00
Tristan Darricau
a83bcaa8ac [ticket/14099] Fix tests
PHPBB3-14099
2015-08-14 15:52:35 +02:00
Tristan Darricau
a24f9a7ad7 [ticket/14099] Update twig/twig to 1.20.0
PHPBB3-14099
2015-08-14 15:52:24 +02:00
Tristan Darricau
dbfea6d0fa [ticket/14099] Update composer.phar
PHPBB3-14099
2015-08-14 15:52:13 +02:00
Marc Alexander
a2e19e4ea8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-08-14 13:38:09 +02:00
Marc Alexander
e466318dc2 Merge pull request #3761 from Zoddo/ticket/13997
[ticket/13997] Add posting_editor_submit_buttons template event
2015-08-14 13:36:22 +02:00
Marc Alexander
dc55863cad Merge branch '3.1.x' 2015-08-13 07:52:36 +02:00
Marc Alexander
57ba51c529 Merge pull request #3763 from Zoddo/ticket/13968
[ticket/13968] Add core.user_setup_after event
2015-08-13 07:52:30 +02:00
Zoddo
9d4228291c [ticket/13968] Add core.user_setup_after event
It allows to execute code at the end of user setup.
It can replace the phpbb_user_session_handler hook.

PHPBB3-13968
2015-08-12 22:26:06 +02:00
Máté Bartus
b541ee5a2b Merge pull request #3827 from Nicofuma/ticket/14096
[ticket/14096] Update Symfony
2015-08-12 15:43:39 +02:00
Máté Bartus
951e9bb3c5 Merge pull request #3826 from rxu/ticket/14094
[ticket/14094] Fix segmentation fault error on PHP 7 tests
2015-08-12 15:42:06 +02:00
Tristan Darricau
cd37b32b3d [ticket/14096] Update Symfony
PHPBB3-14096
2015-08-12 14:48:06 +02:00
Tristan Darricau
4773742881 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
2015-08-12 13:59:16 +02:00
Tristan Darricau
dead984f54 Merge pull request #3825 from rxu/ticket/14093
[ticket/14093] Hardcoded language in ucp_pm_viewfolder.html

* rxu/ticket/14093:
  [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
2015-08-12 13:58:12 +02:00
rxu
df334b1da8 [ticket/14094] Fix segmentation fault error on PHP 7 tests
PHPBB3-14094
2015-08-12 17:13:51 +07:00
rxu
2cd2cf2b39 [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
PHPBB3-14093
2015-08-12 14:41:48 +07:00
Zoddo
146c4b1624 [ticket/14091] Add mcp_topic_subject_* template events
Add some options (field, checkbox, ...) before/after the subject
field when split a subject

PHPBB3-14091
2015-08-11 20:15:39 +02:00
Zoddo
4bab984dac [ticket/14090] Add mcp_topic_topic_title_* template events
Allows to add some information before/after the topic title

PHPBB3-14090
2015-08-11 20:10:45 +02:00
Marc Alexander
81e045628d Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_forum.html
2015-08-11 09:14:23 +02:00
Marc Alexander
972f04ec6a Merge pull request #3768 from Zoddo/ticket/14021
[ticket/14086] Add mcp_forum_topic_title_* template events
2015-08-11 09:13:34 +02:00
Zoddo
40666dd96f [ticket/14086] Add mcp_forum_topic_title_* template events
Allows to add some information before/after the topic title

PHPBB3-14086
2015-08-10 22:27:19 +02:00
rxu
c4bc5f3930 [ticket/14088] Add more core events to the search.php
Also add more vars to the core.search_get_topic_data event.

PHPBB3-14088
2015-08-11 03:14:24 +07:00
Andreas Fischer
92b23df864 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
2015-08-10 13:20:04 +02:00
Andreas Fischer
3bd5fe6be8 Merge pull request #3811 from marcovo/ticket/14069
[ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration

* marcovo/ticket/14069:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
2015-08-10 13:20:03 +02:00
lavigor
1b1fc6ed24 [ticket/14087] Add an event to ucp_activate.php.
PHPBB3-14087
2015-08-09 23:35:06 +03:00
Marc Alexander
32c3267295 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-08-09 20:59:14 +02:00
Marc Alexander
edeeff597f Merge pull request #3766 from Zoddo/ticket/14019
[ticket/14019] Add posting_topic_title_before template event
2015-08-09 20:58:17 +02:00
Zoddo
9a2c74a68c [ticket/14019] Add posting_topic_title_before template event
Allows to add some information on the left of the topic title
in the posting form

PHPBB3-14019
2015-08-09 13:42:34 +02:00
Zoddo
166e0b5961 [ticket/13997] Add posting_editor_submit_buttons template event
PHPBB3-13997
2015-08-09 11:36:49 +02:00
Marc Alexander
1956bd4bba Merge branch '3.1.x' 2015-08-09 10:31:43 +02:00
Marc Alexander
668defcf57 Merge pull request #3784 from Senky/ticket/14043
[ticket/14043] Add core.get_avatar_after php event
2015-08-09 10:31:37 +02:00
Marc Alexander
03c64d3384 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_forum.php
2015-08-09 10:15:02 +02:00
Marc Alexander
5f4943c183 Merge pull request #3760 from Zoddo/ticket/14014
[ticket/14014] Add core.mcp_forum_view_before event
2015-08-09 10:13:24 +02:00
Marc Alexander
7b8f8d7d90 Merge branch '3.1.x' 2015-08-09 10:08:06 +02:00
Marc Alexander
9e38f412ea Merge pull request #3756 from rxu/ticket/14005
[ticket/14005] Allow extensions control post buttons displaying
2015-08-09 10:08:00 +02:00
Marc Alexander
b1d8f8a22c Merge branch '3.1.x' 2015-08-09 10:00:34 +02:00
Marc Alexander
8d54f06d19 Merge pull request #3822 from brunoais/ticket/14083
[ticket/14083] Fix wrong variables from previous commit
2015-08-09 10:00:29 +02:00
Marc Alexander
994b9c2c77 Merge branch '3.1.x' 2015-08-09 09:56:40 +02:00
Marc Alexander
4d2940dd2f Merge pull request #3821 from brunoais/ticket/14082
[ticket/14082] Fix wrong variables from previous commit
2015-08-09 09:56:34 +02:00
brunoais
7a2f72df75 [ticket/14083] Fix wrong variables from previous commit
Fixing variables wrongly attributed in PHPBB3-13693

PHPBB3-14083
2015-08-08 22:45:38 +01:00
brunoais
84a40b6ad1 [ticket/14082] Fix wrong variables from previous commit
Fixing variables wrongly attributed in PHPBB3-13686

PHPBB3-14082
2015-08-08 22:23:17 +01:00
Marc Alexander
e41fcab3de Merge branch '3.1.x' 2015-08-08 22:40:40 +02:00
Marc Alexander
8e80425c82 Merge pull request #3759 from Zoddo/ticket/14013
[ticket/14013] Add acp_forums_custom_settings event
2015-08-08 22:40:35 +02:00
Marc Alexander
47b32f1da9 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php
2015-08-08 22:23:03 +02:00
Marc Alexander
b7e4d0b0a5 Merge pull request #3738 from javiexin/ticket/13981
[ticket/13981] Add events to capture avatar deletion or overwriting
2015-08-08 22:21:11 +02:00
Marc Alexander
46ffafd0c6 Merge branch '3.1.x' 2015-08-08 22:17:29 +02:00
Marc Alexander
3dcba7000b Merge pull request #3757 from Zoddo/ticket/14006
[ticket/14006] Add core.ucp_register_agreement event
2015-08-08 22:17:21 +02:00
Máté Bartus
962fb6b19b Merge pull request #3819 from Nicofuma/ticket/14079
[ticket/14079] Correctly mark notifications as read
2015-08-08 19:53:34 +02:00
rxu
b1e92393ee [ticket/14080] Add template events around the topic row in viewforum_body.html
PHPBB3-14080
2015-08-09 00:32:22 +07:00
Tristan Darricau
05d583bba7 [ticket/14079] Correctly mark notifications as read
PHPBB3-14079
2015-08-08 19:18:18 +02:00
Máté Bartus
ec270713d0 Merge pull request #3817 from Nicofuma/ticket/14076
[ticket/14076] Fix notification settings
2015-08-07 16:39:55 +02:00
Tristan Darricau
7e62b3a4b0 [ticket/14076] Fix notification settings
PHPBB3-14076
2015-08-07 16:38:53 +02:00
Máté Bartus
e4e3f595ec Merge pull request #3816 from Nicofuma/ticket/14074
[ticket/14074] Fix mark notifications as read in the ucp
2015-08-07 16:34:15 +02:00
Tristan Darricau
2260533d47 [ticket/14074] Fix mark notifications as read in the ucp
PHPBB3-14074
2015-08-07 16:14:40 +02:00
Marc Alexander
b55361e89b Merge remote-tracking branch 'Nicofuma/ticket/12692' 2015-08-07 10:07:45 +02:00
Tristan Darricau
618065ec16 [ticket/12692] Fix tests and update style
PHPBB3-12692
2015-08-06 13:26:14 +02:00
rxu
9e467a4e4a [ticket/14072] Add core event to the function format_display()
PHPBB3-14072
2015-08-06 03:51:48 +07:00
Marco Kubuntu
32f5dc3d8b [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
Changed the sql_fetchfield() call to comply to the function definition.

PHPBB3-14069
2015-08-05 19:07:02 +02:00
Oliver Schramm
2510369804 [ticket/12143] Fix tests after rebase
PHPBB3-12143
2015-08-05 17:50:26 +02:00
Oliver Schramm
c3e5185135 [ticket/12143] Avoid no output from get_group_name()
PHPBB3-12143
2015-08-05 17:50:26 +02:00
Oliver Schramm
981bd8bed4 [ticket/12143] Fix those tests
I always have to fix them.. :(

PHPBB3-12143
2015-08-05 17:50:26 +02:00
Oliver Schramm
ca17bc7187 [ticket/12143] Add some tests
PHPBB3-12143
2015-08-05 17:50:25 +02:00
Oliver Schramm
d4095bb11d [ticket/12143] Oops, fixed array index
PHPBB3-12143
2015-08-05 17:50:25 +02:00
Oliver Schramm
185fbe41c9 [ticket/12143] Replace group name output
So now we can use translated group names for non-special groups

PHPBB3-12143
2015-08-05 17:50:24 +02:00
Oliver Schramm
4b3343e756 [ticket/12143] Add group helper class to translate groupnames
We can translate groupnames now even though these groups aren't special

PHPBB3-12143
2015-08-05 17:50:22 +02:00
Marc Alexander
f4c1796d5e [ticket/14070] Properly pass whether config should be ignored for avatars
PHPBB3-14070
2015-08-05 17:46:17 +02:00
Oliver Schramm
2b30e632b6 [ticket/12143] Add is_set method to language service
We need that.

PHPBB3-12143
2015-08-05 17:45:14 +02:00
Andreas Fischer
4aac578908 Merge pull request #3782 from RMcGirr83/ticket/13711
[ticket/13711] Notifications are sent to inactive users

* RMcGirr83/ticket/13711:
  [ticket/13711] Notifications are sent to inactive users
2015-08-05 13:45:02 +02:00
Andreas Fischer
452c8bef28 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13711] Notifications are sent to inactive users
2015-08-05 13:45:02 +02:00
Andreas Fischer
50cf610eb6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14049] Use headers from config when sending Plupload delete request.
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
2015-08-05 13:41:59 +02:00
Andreas Fischer
b34e74254a Merge pull request #3790 from prototech/ticket/14010
[ticket/14010] Update Plupload from 2.1.2 to 2.1.8.

* prototech/ticket/14010:
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
2015-08-05 13:40:40 +02:00
Andreas Fischer
e7c6c3f02b Merge pull request #3791 from prototech/ticket/14049
[ticket/14049] Use headers from config when sending Plupload delete request.

* prototech/ticket/14049:
  [ticket/14049] Use headers from config when sending Plupload delete request.
2015-08-05 13:39:44 +02:00
Tristan Darricau
cbe74844b0 Merge pull request #3698 from s9e/ticket/13935
[ticket/13935] Allow more admin-configurable schemes in post links

* s9e/ticket/13935:
  [ticket/13935] Removed cache invalidation from acp_board
  [ticket/13935] Removed UI
  [ticket/13935] Allow more admin-configurable schemes in post links
2015-08-05 12:59:55 +02:00
rxu
49bc477a87 [ticket/14067] Add template events to overall_header.html around feeds
PHPBB3-14067
2015-08-05 16:29:06 +07:00
rxu
6a7978965d [ticket/14065] Add template events to attachment.html
Additionally remove some unnecessary empty lines.

PHPBB3-14065
2015-08-03 18:35:15 +07:00
rxu
478a4c4133 [ticket/14064] Add template events to ucp_pm_history.html
PHPBB3-14064
2015-08-03 03:48:20 +07:00
Jakub Senko
7cb7ca57c2 [ticket/14043] Add more parameters to the event
PHPBB3-14043
2015-08-02 20:27:05 +02:00
Oyabun1
84f8d6d64e [ticket/14058] Contact us form missing email subject field in subsilver2
PHPBB3-14058
2015-07-31 22:30:30 +10:00
rxu
0d6c323611 [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.
PHPBB3-13846
2015-07-30 19:35:01 +07:00
Tristan Darricau
e70373a820 Merge pull request #3799 from CHItA/ticket/14056
[ticket/14056] Keep install schema resources in the install folder

* CHItA/ticket/14056:
  [ticket/14056] Fix remaining schema path
  [ticket/14056] Keep install schema resources in the install folder
2015-07-30 09:58:34 +02:00
Mate Bartus
4ae83e4266 [ticket/14056] Fix remaining schema path
PHPBB3-14056
2015-07-29 22:08:37 +02:00
Mate Bartus
6eb284b23a [ticket/14056] Keep install schema resources in the install folder
PHPBB3-14056
2015-07-29 20:24:52 +02:00
RMcGirr83
30449b69af [ticket/13863] Spaces not tabs
PHPBB3-13863
2015-07-29 12:47:31 -04:00
Richard McGirr
9c67d02bd2 [ticket/13863] Add topic_row_append/prepend to mcp_forum.html
PHPBB3-13863
2015-07-28 05:53:30 -04:00
Tristan Darricau
979e125c7c Merge pull request #3795 from CHItA/ticket/14053
[ticket/14053] Fix tests for installer config

* CHItA/ticket/14053:
  [ticket/14053] Fix tests for installer config
2015-07-27 16:13:54 +02:00
Mate Bartus
172b021c89 [ticket/14053] Fix tests for installer config
@covers annotations causing build failures on bamboo, so removed them

PHPBB3-14053
2015-07-27 16:04:34 +02:00
Máté Bartus
3cfaa61560 Merge pull request #3793 from Nicofuma/ticket/14052
[ticket/14052] Translate installer commands
2015-07-27 13:55:55 +02:00
RMcGirr83
771090f13e [ticket/13711] Notifications are sent to inactive users
PHPBB3-13711
2015-07-27 06:27:25 -04:00
Tristan Darricau
6499a8a6c0 [ticket/14052] Translate installer commands
PHPBB3-14052
2015-07-27 11:40:12 +02:00
Tristan Darricau
a0258ae25c Merge pull request #3514 from CHItA/ticket/13740
[ticket/13740] Refactoring installer

* CHItA/ticket/13740: (75 commits)
  [ticket/13740] Reduce number of references in nav provider
  [ticket/13740] Move handle_language_select calls to the controllers
  [ticket/13740] Fix infinite config.php check loop
  [ticket/13740] Move default data settings out of constructors
  [ticket/13740] Deduplicate container builder's checks
  [ticket/13740] Use JSON for installer config
  [ticket/13740] Fix comment
  [ticket/13740] Use language service in console application
  [ticket/13740] Fix CS in compatibilty_globals.php
  [ticket/13740] Fix message element creation in JS
  [ticket/13740] Replace more spaces with tabs
  [ticket/13740] Fix CS
  [ticket/13740] Filter basic directory change attempts in lang change
  [ticket/13740] Use tabs instead of spaces in JS file
  [ticket/13740] Add success message when install finished
  [ticket/13740] Fix $script_path in obtain_data
  [ticket/13740] Fix is_phpbb_installed() method
  [ticket/13740] Login admin when install finished
  [ticket/13740] Enhance server output buffer bypass
  [ticket/13740] Secure installer config against corrupted config data
  ...
2015-07-27 11:24:43 +02:00
Mate Bartus
11dfe503aa [ticket/13740] Reduce number of references in nav provider
PHPBB3-13740
2015-07-26 23:00:40 +02:00
Mate Bartus
495c0c6fb3 [ticket/13740] Move handle_language_select calls to the controllers
PHPBB3-13740
2015-07-26 22:20:32 +02:00
Cesar G
ff67a09724 [ticket/14049] Use headers from config when sending Plupload delete request.
PHPBB3-14049
2015-07-25 18:56:19 -07:00
Cesar G
edf81e8de8 [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
PHPBB3-14010
2015-07-25 18:54:09 -07:00
Mate Bartus
f7641cd506 [ticket/13740] Fix infinite config.php check loop
PHPBB3-13740
2015-07-25 15:41:10 +02:00
Mate Bartus
0befa9f109 [ticket/13740] Move default data settings out of constructors
PHPBB3-13740
2015-07-25 14:44:39 +02:00
Mate Bartus
e8e9193690 [ticket/13740] Deduplicate container builder's checks
PHPBB3-13740
2015-07-25 14:43:54 +02:00
Mate Bartus
723337d2f6 [ticket/13740] Use JSON for installer config
PHPBB3-13740
2015-07-25 14:42:37 +02:00
Mate Bartus
04186e8498 [ticket/13740] Fix comment
PHPBB3-13740
2015-07-25 14:42:17 +02:00
Mate Bartus
be7e1ba7a0 [ticket/13740] Use language service in console application
PHPBB3-13740
2015-07-24 18:05:10 +02:00
Mate Bartus
fc46dec813 [ticket/13740] Fix CS in compatibilty_globals.php
PHPBB3-13740
2015-07-24 17:36:04 +02:00
Mate Bartus
0d88b3f9e9 [ticket/13740] Fix message element creation in JS
PHPBB3-13740
2015-07-24 11:06:50 +02:00
javiexin
c3d77edd83 [ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture new avatar moving in place (and maybe overwriting
existing avatar), and another to capture deletion.  Includes better error
processing.  Rename event.

PHPBB3-13981
2015-07-24 10:52:00 +02:00
Mate Bartus
b4552a8ba3 [ticket/13740] Replace more spaces with tabs
PHPBB3-13740
2015-07-24 08:33:02 +02:00
Mate Bartus
22786a5b6f [ticket/13740] Fix CS
PHPBB3-13740
2015-07-24 02:37:00 +02:00
Mate Bartus
cb593c0e04 [ticket/13740] Filter basic directory change attempts in lang change
PHPBB3-13740
2015-07-24 00:04:40 +02:00
Mate Bartus
27d2d58e05 [ticket/13740] Use tabs instead of spaces in JS file
PHPBB3-13740
2015-07-23 23:46:36 +02:00
Mate Bartus
3840882b93 [ticket/13740] Add success message when install finished
PHPBB3-13740
2015-07-23 23:35:20 +02:00
Mate Bartus
115029b601 [ticket/13740] Fix $script_path in obtain_data
PHPBB3-13740
2015-07-23 23:23:06 +02:00
Mate Bartus
e08f134112 [ticket/13740] Fix is_phpbb_installed() method
PHPBB3-13740
2015-07-23 22:55:31 +02:00
Mate Bartus
0e3b7e2de6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13982] Remove extra new line
2015-07-23 21:32:01 +02:00
Máté Bartus
f34f28f283 Merge pull request #3789 from marc1706/ticket/13982
[ticket/13982] Remove extra new line
2015-07-23 21:27:57 +02:00
Mate Bartus
fbd5929606 [ticket/13740] Login admin when install finished
PHPBB3-13740
2015-07-23 20:50:33 +02:00
Marc Alexander
4bf0534bf9 [ticket/13982] Remove extra new line
PHPBB3-13982
2015-07-23 18:05:12 +02:00
Mate Bartus
dd31020fb3 [ticket/13740] Enhance server output buffer bypass
PHPBB3-13740
2015-07-23 16:43:20 +02:00
javiexin
e37b3495f0 [ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture overwriting, and another to capture deletion.
Includes better error processing. Replaced global by dependency injection.
Fix Travis tests.

PHPBB3-13981
2015-07-23 14:46:51 +02:00
Marc Alexander
b677bc41c9 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_view.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-07-23 12:12:03 +02:00
Marc Alexander
da53d95b95 Merge pull request #3739 from javiexin/ticket/13982
[ticket/13982] Add events around ranks

Conflicts:
	phpBB/docs/events.md
2015-07-23 12:10:27 +02:00
Marc Alexander
fb6afde298 Merge branch '3.1.x' 2015-07-23 10:20:10 +02:00
Marc Alexander
3e8af1cf33 Merge pull request #3788 from marc1706/ticket/13899
[ticket/13899] Add items to core.search_results_modify_search_title
2015-07-23 10:20:04 +02:00
Marc Alexander
b24ce02526 [ticket/13899] Use multi-line definition for vars array
PHPBB3-13899
2015-07-23 08:54:13 +02:00
Mate Bartus
98d9d92aa7 [ticket/13740] Secure installer config against corrupted config data
PHPBB3-13740
2015-07-23 04:27:31 +02:00
Marc Alexander
5e7550ee53 [ticket/13899] Fix doc block arrangement and add @changed info
PHPBB3-13899
2015-07-22 19:18:01 +02:00
david63
84d302a2fd [ticket/13899] Add items to core.search_results_modify_search_title
PHPBB3-13899
2015-07-22 19:15:37 +02:00
Jakub Senko
c6a654e859 [ticket/14043] Add dispatcher to globals, change @since value
PHPBB3-14043
2015-07-22 13:55:26 +02:00
Mate Bartus
3356130ce2 [ticket/13740] Separate new installer style templates
PHPBB3-13740
2015-07-22 12:43:17 +02:00
Tristan Darricau
e1cbe73538 Merge pull request #3781 from Elsensee/ticket/8708-2
[ticket/8708] Add extra permission for posting global announcements

* Elsensee/ticket/8708-2:
  [ticket/8708] Apply permission 'f_announce_global'
  [ticket/8708] Add f_announce_global permission
2015-07-22 11:30:50 +02:00
Marc Alexander
8bfbd77828 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_profile.php
2015-07-22 10:38:35 +02:00
Marc Alexander
5da50fcf6e Merge pull request #3719 from javiexin/ticket/13911
[ticket/13911] Add events to configure options for profile fields
2015-07-22 10:37:16 +02:00
Marc Alexander
b635853479 Merge branch '3.1.x' 2015-07-22 10:30:58 +02:00
Marc Alexander
e686f8bbdf Merge pull request #3786 from marc1706/ticket/13311
[ticket/13311] Add core event on acp_forums for forum content deletes
2015-07-22 10:30:52 +02:00
Marc Alexander
b3974ed0f6 Merge branch '3.1.x' 2015-07-22 10:14:50 +02:00
Marc Alexander
d1e6c89b90 Merge pull request #3787 from marc1706/ticket/13843
[ticket/13843] Add templates events to insert custom panel in posting editor
2015-07-22 10:14:43 +02:00
Marc Alexander
23aed66473 [ticket/13311] Remove whitespace at end of line
PHPBB3-13311
2015-07-22 09:54:28 +02:00
Marc Alexander
49bffc1851 [ticket/13843] Fix merge issues and update @since version
PHPBB3-13843
2015-07-22 09:45:55 +02:00
alf007
8b21e7c0d9 [ticket/13843] Add templates events to insert custom panel in posting
Events added in events.md
Add in template posting_editor.html for link to custom panel
Add in template posting_layout.html for include of custom panel template body

PHPBB3-13843
2015-07-22 09:43:59 +02:00
Marc Alexander
ce937346f3 [ticket/13311] Update @since to 3.1.6-RC1
PHPBB3-13311
2015-07-22 09:29:22 +02:00
alf007
e30c6caac8 [ticket/13311] Add core event on acp_forums for forum content deletes
Event added for the function delete_forum_content() in
includes/acp/acp_forums.php, so that you can insert any extension's table(s)
to be updated when forum content is deleted
Incude parameters forum_id, topic_ids and post_counts

PHPBB3-13311
2015-07-22 09:25:19 +02:00
Mate Bartus
0c49b88dde [ticket/13740] Fix CS
PHPBB3-13740
2015-07-22 04:01:52 +02:00
Mate Bartus
97d08d6f56 [ticket/13740] Allow language change in the installer
PHPBB3-13740
2015-07-22 03:16:16 +02:00
Mate Bartus
11642a5f94 [ticket/13740] Keep language file's names
PHPBB3-13740
2015-07-22 02:42:13 +02:00
Jakub Senko
5e3ebda0da [ticket/14043] Add core.get_avatar_after php event
PHPBB3-14043
2015-07-21 21:20:24 +02:00
Zoddo
7e21d1dab5 [ticket/14041] Add viewtopic_dropdown_*_custom template event
Allows an extension to create a custom dropdown menu.

PHPBB3-14041
PHPBB3-14042
2015-07-21 16:33:45 +02:00
Mate Bartus
136ec8d7e2 [ticket/13740] Keep keys when sorting navigation
PHPBB3-13740
2015-07-21 15:53:26 +02:00
Mate Bartus
030f6da911 [ticket/13740] Remove extra dot from config sample's name
PHPBB3-13740
2015-07-21 15:30:31 +02:00
Mate Bartus
3d4f21c1f8 [ticket/13740] Check navigation requirements
PHPBB3-13740
2015-07-21 15:13:54 +02:00
Mate Bartus
3a3dd94145 [ticket/13740] Remove default config CLI command
PHPBB3-13740
2015-07-21 15:06:15 +02:00
Mate Bartus
b2b9fb1df2 [ticket/13740] Fix CS and docblocks
PHPBB3-13740
2015-07-21 14:42:15 +02:00
Mate Bartus
0488c49116 [ticket/13740] Exit from installation if phpBB is already installed
PHPBB3-13740
2015-07-20 19:26:07 +02:00
Mate Bartus
6216007caa [ticket/13740] Fix docblocks and comments
PHPBB3-13740
2015-07-20 18:47:10 +02:00
Mate Bartus
88bf1d7f58 [ticket/13740] Clean up install config file when installation has finished
PHPBB3-13740
2015-07-20 18:22:53 +02:00
Mate Bartus
846ab1d22f [ticket/13740] Move install-config.yml to docs/
PHPBB3-13740
2015-07-20 18:12:50 +02:00
Mate Bartus
c89b226a7a [ticket/13740] Add more room for further tasks
PHPBB3-13740
2015-07-20 18:06:02 +02:00
Marc Alexander
69c66db459 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_main_front.html
2015-07-20 13:07:32 +02:00
Marc Alexander
6b658874bb Merge pull request #3754 from rxu/ticket/14002
[ticket/14002] Add template events before/after user details in ucp_main_front.html
2015-07-20 13:06:29 +02:00
Marc Alexander
cdaf4381ac Merge branch '3.1.x' 2015-07-20 09:39:42 +02:00
Marc Alexander
ebf0bc2134 Merge pull request #3780 from RMcGirr83/ticket/13815
[ticket/13815] Event parameters in posting have no effect
2015-07-20 09:39:35 +02:00
Tristan Darricau
b39b5d9e56 Merge pull request #3745 from s9e/ticket/13986
[ticket/13986] Add --resume option to reparser CLI

* s9e/ticket/13986:
  [ticket/13986] Replaced hardcoded value
  [ticket/13986] Fixed resume data to carry through multiple runs
  [ticket/13986] Add --resume option to reparser CLI
2015-07-19 22:42:03 +02:00
Tristan Darricau
85f89a0417 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14018] Update CSS for handling quick link menus
  [ticket/14018] Fix responsive quick link menus
2015-07-19 22:23:02 +02:00
Tristan Darricau
203bd4edd5 Merge pull request #3772 from VSEphpbb/ticket/14018
[ticket/14018] Fix responsive quick link menus

* VSEphpbb/ticket/14018:
  [ticket/14018] Update CSS for handling quick link menus
  [ticket/14018] Fix responsive quick link menus
2015-07-19 22:22:17 +02:00
Tristan Darricau
4c687194bf Merge pull request #3778 from s9e/ticket/14036
[ticket/14036] Replace path_helper with a mock

* s9e/ticket/14036:
  [ticket/14036] Fixed mocked web root path
  [ticket/14036] Replace path_helper with a mock
2015-07-19 22:20:23 +02:00
Oliver Schramm
7d31232846 [ticket/8708] Apply permission 'f_announce_global'
PHPBB3-8708
2015-07-19 21:26:47 +02:00
Oliver Schramm
df56b2ed36 [ticket/8708] Add f_announce_global permission
PHPBB3-8708
2015-07-19 21:26:47 +02:00
Richard McGirr
8b981f9ccd [ticket/13815] Event parameters in posting have no effect
PHPBB3-13815
2015-07-19 06:25:59 -04:00
Zoddo
7e1b0330a3 [ticket/13988] Update tests
PHPBB3-13988
2015-07-18 21:18:49 +02:00
Matt Friedman
d548a2aa3e [ticket/14018] Update CSS for handling quick link menus
PHPBB3-14018
2015-07-17 14:35:14 -07:00
javiexin
11256cd167 [ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture overwriting, and another to capture deletion.
Includes better error processing. Replaced global by dependency injection.
Fix typo.

PHPBB3-13981
2015-07-17 23:03:19 +02:00
javiexin
4d3188ba57 [ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture overwriting, and another to capture deletion.
Includes better error processing. Replaced global by dependency injection.

PHPBB3-13981
2015-07-17 19:40:33 +02:00
JoshyPHP
6cc2510cee [ticket/14036] Fixed mocked web root path
...to match what it would return normally

PHPBB3-14036
2015-07-17 19:10:36 +02:00
JoshyPHP
ca141f2e1e [ticket/14036] Replace path_helper with a mock
PHPBB3-14036
2015-07-17 18:28:27 +02:00
JoshyPHP
c8e209a2de [ticket/13986] Replaced hardcoded value
PHPBB3-13986
2015-07-17 16:52:52 +02:00
Marc Alexander
39f3313534 Merge branch '3.1.x' 2015-07-17 16:15:25 +02:00
Marc Alexander
56251adc24 Merge pull request #3732 from kinerity/ticket/13974
[ticket/13974] Add core.mcp_change_poster_after event
2015-07-17 16:15:22 +02:00
Marc Alexander
24625d3afc Merge branch '3.1.x' 2015-07-17 16:08:31 +02:00
Marc Alexander
4262dfeaef Merge pull request #3731 from marcovo/ticket/13971
[ticket/13971] Add draft_id var to core.posting_modify_template_vars
2015-07-17 16:08:28 +02:00
JoshyPHP
9274bc4e32 [ticket/13986] Fixed resume data to carry through multiple runs
Options restored from a previous execution should carry to the
next resumed execution

PHPBB3-13986
2015-07-17 14:02:19 +02:00
Marc Alexander
12f85a6a89 Merge branch '3.1.x' 2015-07-17 13:35:34 +02:00
Marc Alexander
100fd39c5e Merge pull request #3593 from satanasov/ticket/13817
[ticket/13817] Add core.update_session event
2015-07-17 13:35:15 +02:00
Marc Alexander
29a15710d6 Merge pull request #3773 from Nicofuma/ticket/14015
[ticket/14015] Update Symfony
2015-07-17 13:03:07 +02:00
JoshyPHP
903f100c51 [ticket/13986] Add --resume option to reparser CLI
PHPBB3-13986
2015-07-17 11:53:28 +02:00
javiexin
de75a3577f [ticket/13982] Add events around ranks
Add events to present information around ranks in the memberlist,
user profile, viewtopic profile and private message profile.
Slight repositioning of events in the memberlist.

PHPBB3-13982
2015-07-17 11:42:44 +02:00
Tristan Darricau
15ea66c096 [ticket/14015] Update Symfony
- Removing symfony/filesystem (2.8.x-dev 45cc231)
- Installing symfony/filesystem (2.8.x-dev 9f70c56)
	Cloning 9f70c5625a32b2f1e6fc37222f52b4e0eb437b0e

- Removing symfony/config (2.8.x-dev 291e3f1)
- Installing symfony/config (2.8.x-dev 358ec92)
	Cloning 358ec929e494b6f12d8508d88357cbd7383a10ca

- Removing symfony/console (2.8.x-dev 7e857a2)
- Installing symfony/console (2.8.x-dev fd85e75)
	Cloning fd85e7517e79a2bceafcee8f7e8b7bbd0919a90a

- Removing symfony/dependency-injection (2.8.x-dev 90a7527)
- Installing symfony/dependency-injection (2.8.x-dev f279142)
	Cloning f279142fb6bc21e83fcd40e0a01a62ff527268be

- Removing symfony/finder (2.8.x-dev fd26bdb)
- Installing symfony/finder (2.8.x-dev 8712d5e)
	Cloning 8712d5e8c4ad65e6b936ed9b6a581e5e6a87fddf

- Removing symfony/http-foundation (2.8.x-dev 06aa08b)
- Installing symfony/http-foundation (2.8.x-dev 5339030)
	Cloning 5339030f5af0d6fef7c897130291ac168278289f

- Removing symfony/event-dispatcher (2.8.x-dev 8766ceb)
- Installing symfony/event-dispatcher (2.8.x-dev d724688)
	Cloning d7246885b7fe4cb5a2786bda34362d2f0e40b730

- Removing symfony/debug (2.8.x-dev eda866d)
- Installing symfony/debug (2.8.x-dev d1114d8)
	Cloning d1114d892ae70f833871dc55599f17084191efaa

- Removing symfony/http-kernel (2.8.x-dev c587069)
- Installing symfony/http-kernel (2.8.x-dev f24d2cb)
	Cloning f24d2cb4778ecc5f6c8e8f7f31bc4691099a920d

- Removing symfony/routing (2.8.x-dev 76b18ed)
- Installing symfony/routing (2.8.x-dev 9e797cd)
	Cloning 9e797cd70762db18d87c59dc6bc1ab7c3eb963ed

- Removing symfony/security-core (2.8.x-dev 2c21845)
- Installing symfony/security-core (2.8.x-dev 8253e02)
	Cloning 8253e027bf8a1c9c573a7b3c494027847058c959

- Removing symfony/twig-bridge (2.8.x-dev 2e072a1)
- Installing symfony/twig-bridge (2.8.x-dev a02e3a8)
	Cloning a02e3a8ff1f8eda04d0e0655d2cefcbe9ecc4e14

- Removing symfony/yaml (2.8.x-dev 2396832)
- Installing symfony/yaml (2.8.x-dev 000e7fc)
	Cloning 000e7fc2653335cd42c6d21405dac1c74224a387

- Removing symfony/dom-crawler (2.8.x-dev 3a523d1)
- Installing symfony/dom-crawler (2.8.x-dev 3aed431)
	Cloning 3aed431721a4a779d1ec30210bd53075da9623f5

- Removing symfony/browser-kit (2.8.x-dev 4916397)
- Installing symfony/browser-kit (2.8.x-dev 4f297d7)
	Cloning 4f297d7e00c375b6ab03732e076f65799a73937d

- Removing symfony/process (2.8.x-dev daf96f1)
- Installing symfony/process (2.8.x-dev 25d74c9)
	Cloning 25d74c90d79e66905013714d8d188e4ccb5ff466

PHPBB3-14015
2015-07-17 09:51:49 +02:00
Tristan Darricau
04a8c3c0a4 Merge pull request #3776 from VSEphpbb/ticket/14033
[ticket/14033] Fix errors in docblocks
2015-07-17 09:50:15 +02:00
Marc Alexander
e7975ad412 Merge pull request #3777 from s9e/ticket/14034
[ticket/14034] Fix reparser names that contain "text_reparser" in the middle
2015-07-17 09:48:47 +02:00
JoshyPHP
e7763cd273 [ticket/14034] Fix reparser names that contain "text_reparser" in the middle
PHPBB3-14034
2015-07-17 08:26:14 +02:00
Matt Friedman
af7872473d [ticket/14033] Fix errors in docblocks
PHPBB3-14033
2015-07-16 22:52:25 -07:00
rxu
64b41f314e [ticket/14005] Allow extensions control post buttons displaying for PM
PHPBB3-14005
2015-07-17 00:55:16 +07:00
Matt Friedman
ae31a604e6 [ticket/14018] Fix responsive quick link menus
PHPBB3-14018
2015-07-16 09:11:24 -07:00
Marc Alexander
e6e54430b9 Merge branch '3.1.x' 2015-07-16 08:35:12 +02:00
Marc Alexander
b002948e21 Merge pull request #3755 from RMcGirr83/ticket/14004
[ticket/14004] Add user_info to core event
2015-07-16 08:35:10 +02:00
JoshyPHP
88348e1ccc [ticket/13935] Removed cache invalidation from acp_board
PHPBB3-13935
2015-07-15 22:08:20 +02:00
JoshyPHP
9129cd0e9e [ticket/13935] Removed UI
PHPBB3-13935
2015-07-15 22:05:06 +02:00
JoshyPHP
da7fc9e5da [ticket/13935] Allow more admin-configurable schemes in post links
PHPBB3-13935
2015-07-15 22:05:06 +02:00
CarstenF
23f1b7d9c7 [ticket/13988] Use absolute path for image attachments in feeds
Previously, atom feeds use relative links for image attachments

PHPBB3-13988
2015-07-15 19:39:54 +02:00
Zoddo
2e10961fff [ticket/14014] Add core.mcp_forum_view_before event
This event can be used to get some data in order to execute other actions.

PHPBB3-14014
2015-07-15 15:55:55 +02:00
Marc Alexander
f1df8e2688 Merge branch '3.1.x' 2015-07-15 13:44:24 +02:00
Marc Alexander
3768f7f2b8 Merge pull request #3737 from javiexin/ticket/13980
[ticket/13980] Uploaded avatar not removed when new is uploaded
2015-07-15 13:44:19 +02:00
Zoddo
92703127d3 [ticket/14013] Add documentation for acp_forums_custom_settings
PHPBB3-14013
2015-07-15 02:05:33 +02:00
Zoddo
3a62903fd1 [ticket/14013] Add acp_forums_custom_settings event
PHPBB3-14013
2015-07-15 01:25:06 +02:00
Mate Bartus
c5c98b7ca2 [ticket/13740] Implement navigation sorting
PHPBB3-13740
2015-07-14 23:14:35 +02:00
Máté Bartus
1127f8bbf8 Merge pull request #3751 from Nicofuma/ticket/11444
[ticket/11444] Moving the in-board notifications to a method class
2015-07-14 12:19:52 +02:00
Tristan Darricau
da0897323b Merge pull request #3758 from s9e/ticket/14008
[ticket/14008] Do not add a user_id value to quotes from guests
2015-07-13 23:03:44 +02:00
Tristan Darricau
11bef3e22e [ticket/11444] Update tests
PHPBB3-11444
2015-07-13 22:43:58 +02:00
Tristan Darricau
c1deeab318 [ticket/11444] Fix services definition
PHPBB3-11444
2015-07-13 22:41:14 +02:00
Tristan Darricau
fc34057f28 [ticket/11444] Update tests and cleanup types/methods
PHPBB3-11444
2015-07-13 22:41:14 +02:00
Tristan Darricau
f29b12e353 [ticket/11444] Cleanup method constructors
PHPBB3-11444
2015-07-13 22:41:14 +02:00
Tristan Darricau
06077d9970 [ticket/11444] BC layer
PHPBB3-11444
2015-07-13 22:41:14 +02:00
Nicofuma
be0d4e20d4 [ticket/11444] Moving the in-board notifications to a method class
Currently the in-board method for the notifications is hardcoded and
cannot be disabled. This method should be in his own class extending
`phpbb\notification\method\method_interface`.

It also add the possibility, for each method, to be enabled by default (ie:
no entry in the DB => notification enabled).

https://tracker.phpbb.com/browse/PHPBB3-11444
https://tracker.phpbb.com/browse/PHPBB3-11967

PHPBB3-11444
2015-07-13 22:41:13 +02:00
Tristan Darricau
58d1d37c16 Merge pull request #3747 from rxu/ticket/13377
[ticket/13377] Fix decoding for www type URLs in function decode_message()
2015-07-13 17:36:35 +02:00
JoshyPHP
675cf5e897 [ticket/14008] Do not add a user_id value to quotes from guests
PHPBB3-14008
2015-07-13 16:08:57 +02:00
Máté Bartus
d54f9d176e Merge pull request #3753 from s9e/ticket/14000
[ticket/14000] Added support for emoji
2015-07-13 15:35:21 +02:00
JoshyPHP
0d52d36b37 [ticket/14000] Replaced test content with non-emoji characters
PHPBB3-14000
2015-07-13 10:31:07 +02:00
Zoddo
e69d23dc88 [ticket/14006] Add core.ucp_register_agreement event
It allows to execute code before the agreements are displayed.

PHPBB3-14006
2015-07-12 19:25:05 +02:00
JoshyPHP
ca671708cb [ticket/14000] Added support for emoji
PHPBB3-14000
2015-07-12 18:55:23 +02:00
Stanislav Atanasov
0d7f8ba8af [ticket/13817] Fix target version
PHPBB3-13817
2015-07-12 19:28:45 +03:00
rxu
9ab4b30739 [ticket/14005] Allow extensions control post buttons displaying
PHPBB3-14005
2015-07-12 20:41:28 +07:00
Richard McGirr
629a826f5b [ticket/14004] Add user_info to core event
PHPBB3-14004
2015-07-12 08:30:49 -04:00
rxu
42dc7eb0f5 [ticket/14002] Add template events before/after user details in ucp_main_front
PHPBB3-14002
2015-07-11 17:51:03 +07:00
Mate Bartus
051b7d1867 [ticket/13740] Module base test
PHPBB3-13740
2015-07-10 22:15:03 +02:00
Marc Alexander
8df16ed92c Merge branch '3.1.x' 2015-07-10 13:14:08 +02:00
Marc Alexander
05f1476fc9 Merge pull request #3741 from rxu/ticket/13984
[ticket/13984] Fix the call of Ajax loading indicator
2015-07-10 13:13:20 +02:00
Mate Bartus
59d22eff49 [ticket/13740] Fix CS
PHPBB3-13740
2015-07-10 00:47:28 +02:00
Mate Bartus
e46689a0cd [ticket/13740] Remove service container from modules
PHPBB3-13740
2015-07-09 23:23:40 +02:00
Mate Bartus
4d2212a3c2 [ticket/13740] Fix database version comparison
PHPBB3-13740
2015-07-09 21:52:36 +02:00
Mate Bartus
3309c89b05 [ticket/13740] Fix CS
PHPBB3-13740
2015-07-09 19:32:30 +02:00
Mate Bartus
e967f3c1a8 [ticket/13740] Fix itteration problems, implement class name aware collections
PHPBB3-13740
2015-07-09 19:08:28 +02:00
javiexin
4b54df8d45 [ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture overwriting, and another to capture deletion.
Includes better error processing.

PHPBB3-13981
2015-07-09 16:33:56 +02:00
javiexin
d0cdc5553a [ticket/13980] Uploaded avatar not removed when new is uploaded
Remove the previously uploaded avatar when a new one with a different
extension is uploaded, using existing delete method

PHPBB3-13980
2015-07-09 15:31:28 +02:00
Mate Bartus
b284e31a9e [ticket/13740] Add option to have class names in service collections
PHPBB3-13740
2015-07-09 15:30:30 +02:00
Mate Bartus
62103cec30 [ticket/13740] Use service collection instead of array of task names
PHPBB3-13740
2015-07-09 15:30:30 +02:00
Mate Bartus
794726a464 [ticket/13740] Fix database test
PHPBB3-13740
2015-07-09 15:30:29 +02:00
Tristan Darricau
e3e293f5a6 [ticket/12692] Cleanup language file
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
96c5165a65 [ticket/12692] Fix languages vars and services order
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
556504df24 [ticket/12692] Fix tests
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
0f789f4d5a [ticket/12692] Fix languages files
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
24e39545ae [ticket/12692] Add output
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
a55c83b771 [ticket/12692] Add a proper extension to the fixtures
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
487fea8cff [ticket/12692] Move the language strings to cli.php
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
54be6b1f62 [ticket/12692] Update the database regularly
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
c96cc2cb05 [ticket/12692] Cast the ids to int
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
6b5fdc730f [ticket/12692] Remove a not and swap the blocks in the corresponding if
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
3f0fa70e3a [ticket/12692] Update comments
PHPBB3-12692
2015-07-09 09:21:51 +02:00
Tristan Darricau
ed0e159080 [ticket/12692] Fix coding style
PHPBB3-12692
2015-07-09 09:21:50 +02:00
Tristan Darricau
3924428050 [ticket/12692] Use strict comparison in thumbnail:recreate
PHPBB3-12692
2015-07-09 09:21:50 +02:00
Tristan Darricau
3a0883e93e [ticket/12692] Use !empty() instead of sizeof()
PHPBB3-12692
2015-07-09 09:21:50 +02:00
Tristan Darricau
074dfdbdfe [ticket/12692] Update doc blocks
PHPBB3-12692
2015-07-09 09:21:50 +02:00
Tristan Darricau
d517ed846b [ticket/12692] Add unit test
PHPBB3-12692
2015-07-09 09:21:50 +02:00
Tristan Darricau
98ab5478e6 [ticket/12692] Add a console command to manage the thumbnails
PHPBB3-12692
2015-07-09 09:21:50 +02:00
Máté Bartus
46e6a4e61f Merge pull request #3752 from VSEphpbb/ticket/13995
[ticket/13995] Fix errors in tests from merge conflict
2015-07-09 02:07:48 +02:00
Matt Friedman
80f91da9b9 [ticket/13995] Fix errors in tests from merge conflict
PHPBB3-13995
2015-07-08 15:11:10 -07:00
Marc Alexander
01097a24b5 Merge branch '3.1.x'
Conflicts:
	tests/template/template_includecss_test.php
2015-07-08 22:54:26 +02:00
Marc Alexander
f576f42b4d Merge pull request #3749 from VSEphpbb/ticket/13995
[ticket/13995] Fixes for invalid HTML in docs and phpBB
2015-07-08 22:52:16 +02:00
Matt Friedman
23db3d0b83 [ticket/13995] Remove projection from tests
PHPBB3-13995
2015-07-08 08:11:04 -07:00
Mate Bartus
1c01252b5d [ticket/13740] Fix test stubs
PHPBB3-13740
2015-07-08 16:25:30 +02:00
Matt Friedman
04d34e6c8b [ticket/13995] Invalid avatar HTML missing space between elements
PHPBB3-13995
2015-07-07 20:10:18 -07:00
Matt Friedman
6294c45bd3 [ticket/13995] Remove invalid name element from anchors in Docs
PHPBB3-13995
2015-07-07 20:09:47 -07:00
Matt Friedman
498a516017 [ticket/13995] Remove deprecated projection media type
PHPBB3-13995
2015-07-07 20:09:01 -07:00
Mate Bartus
612eead5a9 [ticket/13740] Installer config test
PHPBB3-13740
2015-07-08 01:28:12 +02:00
Mate Bartus
9d54867485 [ticket/13740] Test navigation provider
PHPBB3-13740
2015-07-08 01:28:11 +02:00
Mate Bartus
5ad0af3d3d [ticket/13740] Fixes and Tests for database helper
PHPBB3-13740
2015-07-08 01:28:11 +02:00
Mate Bartus
8bfd29e86d [ticket/13740] Clean up CLI CS
PHPBB3-13740
2015-07-08 01:28:10 +02:00
Mate Bartus
10f6716566 [ticket/13740] Restore original install folder
This reverts commit 934e2821f1cef5e2e21ad6d96f7beb45647ed81c.

PHPBB3-13740
2015-07-08 01:28:10 +02:00
Mate Bartus
249345d9cc [ticket/13740] Clean up CLI merge
[ci skip]

PHPBB3-13740
2015-07-08 01:28:09 +02:00
Tristan Darricau
06f4ebce1b [ticket/13740] CLI installer and fixes
[ci skip]

PHPBB3-13740
2015-07-08 01:28:08 +02:00
Mate Bartus
524b98e7bd [ticket/13740] Fix controller class name in service definition
PHPBB3-13740
2015-07-08 01:28:08 +02:00
Mate Bartus
08d9d567ca [ticket/13740] Fix database installation
PHPBB3-13740
2015-07-08 01:28:07 +02:00
CHItA
02029fe161 [ticket/13740] Use DBAL for retrieving DB version
PHPBB3-13740
2015-07-08 01:28:07 +02:00
CHItA
0f5f62f8db [ticket/13740] Load schema_data.sql from the correct location
[ci skip]

PHPBB3-13740
2015-07-08 01:28:06 +02:00
CHItA
69a19e48fa [ticket/13740] Cache installer container
PHPBB3-13740
2015-07-08 01:28:06 +02:00
CHItA
609eb7a4d3 [ticket/13740] Fix AJAX HTTP header setting
PHPBB3-13740
2015-07-08 01:28:05 +02:00
CHItA
c53ce3d5fb [ticket/13740] Fix CS and extend phpbb extensions
[ci skip]

PHPBB3-13740
2015-07-08 01:28:04 +02:00
CHItA
5ce170dcc3 [ticket/13740] Remove ActiveXObject as it is supported by IE versions >= 8
PHPBB3-13740
2015-07-08 01:28:04 +02:00
CHItA
aa6a1c5939 [ticket/13740] Fix CS
PHPBB3-13740
2015-07-08 01:28:03 +02:00
CHItA
3dcaa48850 [ticket/13740] Move installer files to phpbb/install directory
PHPBB3-13740
2015-07-08 01:28:03 +02:00
CHItA
db4cfa7df6 [ticket/13740] Add navigation bar support for the installer
Also added various UI elements and texts.
[ci skip]

PHPBB3-13740
2015-07-08 01:28:02 +02:00
CHItA
1b81bf5b23 [ticket/13740] Add better progress handling, also add log messages
PHPBB3-13740
2015-07-08 01:28:01 +02:00
CHItA
0dc6029bfe [ticket/13740] Tasks can appear as multiple steps for the progress bar
PHPBB3-13740
2015-07-08 01:28:01 +02:00
MateBartus
63c3500dac [ticket/13740] Clean up JS code some more
PHPBB3-13740
2015-07-08 01:28:00 +02:00
MateBartus
b7ef709549 [ticket/13740] Implement progress bar for AJAX UI
PHPBB3-13740
2015-07-08 01:27:59 +02:00
MateBartus
37b0134aa4 [ticket/13740] Add backend support for install progress tracking
PHPBB3-13740
2015-07-08 01:27:59 +02:00
MateBartus
4df89d8848 [ticket/13740] Clean up docblocks
PHPBB3-13740
2015-07-08 01:27:58 +02:00
MateBartus
0b74e3b0de [ticket/13740] Installer's install tasks and modules
[ci skip]

PHPBB3-13740
2015-07-08 01:27:58 +02:00
MateBartus
11623dd671 [ticket/13740] Front facing files and controllers
[ci skip]

PHPBB3-13740
2015-07-08 01:27:57 +02:00
MateBartus
8155205ae7 [ticket/13740] Implementation of the new installer framework
[ci skip]

PHPBB3-13740
2015-07-08 01:27:56 +02:00
MateBartus
53c5610080 [ticket/13740] Add new language file for install
[ci skip]

PHPBB3-13740
2015-07-08 01:27:56 +02:00
MateBartus
5afc632bca [ticket/13740] Core file workarounds
[ci skip]

PHPBB3-13740
2015-07-08 01:27:55 +02:00
MateBartus
14e8f712ae [ticket/13740] Moving old installer to install_old
PHPBB3-13740
2015-07-08 01:27:55 +02:00
rxu
d63412af4c [ticket/13377] Add test entries
PHPBB3-13377
2015-07-07 22:50:06 +07:00
rxu
1365519283 [ticket/13377] Fix decoding for www type URLs in function decode_message()
PHPBB3-13377
2015-07-07 22:30:20 +07:00
Tristan Darricau
2fbfb0e004 Merge pull request #3744 from s9e/ticket/13987
[ticket/13987] Add --dry-run option to reparser CLI
2015-07-07 17:25:28 +02:00
Marc Alexander
39d3a026fe Merge branch '3.1.x' 2015-07-07 10:46:51 +02:00
Marc Alexander
1bd20eb273 Merge pull request #3740 from kinerity/ticket/13955
[ticket/13955] Fix WebFontConig to load web fonts correctly
2015-07-07 10:46:47 +02:00
Tristan Darricau
d54aa190f1 Merge pull request #3623 from s9e/ticket/10620
[ticket/10620] Quote improvements
2015-07-07 09:46:36 +02:00
JoshyPHP
cf4cdcda58 [ticket/13987] Replaced optional parameter with explicit API
Added disable_save() and enable_save() to toggle a dry run

PHPBB3-13987
2015-07-06 23:45:38 +02:00
JoshyPHP
7ccb638912 [ticket/13987] Add --dry-run option to reparser CLI
PHPBB3-13987
2015-07-06 23:45:20 +02:00
Tristan Darricau
ca5d4fd310 Merge pull request #3726 from CHItA/ticket/13961
[ticket/13961] Add orderable service collections
2015-07-06 23:31:35 +02:00
Tristan Darricau
193c6d58b0 Merge pull request #3743 from s9e/ticket/13985
[ticket/13985] Updated s9e\TextFormatter
2015-07-06 23:30:20 +02:00
Tristan Darricau
25220f4886 Merge pull request #3746 from s9e/ticket/13990
[ticket/13990] Reparse markup inside of forum rules/description
2015-07-06 23:24:49 +02:00
Kailey Truscott
4ac2256683 [ticket/13955] Revert changes made in previous commit
Revert the javascript function change
Place the families code on it's own line

PHPBB3-13955
2015-07-06 16:43:57 -04:00
JoshyPHP
a44711e574 [ticket/13990] Reparse markup inside of forum rules/description
PHPBB3-13990
2015-07-06 19:17:40 +02:00
javiexin
51bb51124a [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. Use L_ language string
instead of LA_ language string.

PHPBB3-13748
2015-07-06 11:39:28 +02:00
Kailey Truscott
886ca1dbb9 [ticket/13955] Fix javascript to conform to Google and add simple_header
Fix the javascript code to conform to Google Fonts standard
Add code to fix simple_header

PHPBB3-13955
2015-07-06 01:43:03 -04:00
JoshyPHP
57a07f4ff7 [ticket/13985] Updated s9e\TextFormatter
PHPBB3-13985
2015-07-06 01:15:18 +02:00
rxu
73ba70e98c [ticket/13984] Fix the call of Ajax loading indicator
PHPBB3-13984
2015-07-04 14:36:28 +07:00
Kailey Truscott
b346f216c2 [ticket/13955] Fix WebFontConig to load web fonts correctly
Fix overall_header's WebFontConfig section to load fonts correctly
in all browsers.

PHPBB3-13955
2015-07-03 23:44:43 -04:00
javiexin
ed3f46a9b1 [ticket/13982] Add events around ranks
Add events to present information around ranks in the memberlist,
user profile, viewtopic profile and private message profile.

PHPBB3-13982
2015-07-04 01:51:06 +02:00
javiexin
e0efd5ee57 [ticket/13981] Add events to capture avatar deletion or overwriting
PHPBB3-13981
2015-07-03 21:39:36 +02:00
javiexin
352e995674 [ticket/13980] Uploaded avatar not removed when new is uploaded
Remove the previously uploaded avatar when a new one with a different
extension is uploaded

PHPBB3-13980
2015-07-03 19:40:09 +02:00
Joas Schilling
f81a2bc7c5 Merge branch '3.1.x' 2015-07-03 17:17:00 +02:00
Joas Schilling
60b4d5132f Merge pull request #3734 from RMcGirr83/ticket/13759
[ticket/13759] Initial commit broke timestamps when quoting a post.
2015-07-03 17:16:28 +02:00
RMcGirr83
18a08e1af1 [ticket/13579] This commit corrects the regression.
PHPBB3-13759
2015-07-02 20:43:14 -04:00
Máté Bartus
c5f449ad61 Merge pull request #3735 from Nicofuma/ticket/13891
[ticket/13891] Fix CS for code sniffer
2015-07-02 16:15:19 +02:00
Mate Bartus
108b9833a1 [ticket/13961] Define behaviour when the array is modified in a loop
PHPBB3-13961
2015-07-02 16:10:55 +02:00
Tristan Darricau
b251d98314 [ticket/13891] Fix CS
PHPBB3-13891
2015-07-02 15:26:49 +02:00
Tristan Darricau
31bd696680 Merge pull request #3662 from s9e/ticket/13891
[ticket/13891] Added reparser:list and reparser:reparse to CLI
2015-07-02 14:38:05 +02:00
Tristan Darricau
5970d0360c [ticket/13891] Handle verbosity
PHPBB3-13891
2015-07-02 13:40:02 +02:00
JoshyPHP
dd131d7439 [ticket/13891] Added elapsed/estimated time and memory to the progress bar
Also fixed some extra whitespace.

PHPBB3-13891
2015-07-02 12:22:51 +02:00
Tristan Darricau
6b68544483 [ticket/13891] Use the SymfonyStyle in the reparse command
PHPBB3-13891
2015-07-01 15:49:32 +02:00
javiexin
80fee7422c [ticket/13934] Add enctype clause for profile fields
Adds a template variable (the same) in all places where profile fields
may need an enctype clause in the corresponding forms.

PHPBB3-13934
2015-06-30 14:35:01 +02:00
JoshyPHP
c7f10ec4d4 [ticket/13891] Updated range description
Does not count #0 as a potential record

PHPBB3-13891
2015-06-30 10:32:00 +02:00
JoshyPHP
6de5e5cc36 [ticket/13891] Added a progress bar
PHPBB3-13891
2015-06-30 10:32:00 +02:00
JoshyPHP
fadb192c57 [ticket/13891] Added command-line options
PHPBB3-13891
2015-06-30 10:32:00 +02:00
JoshyPHP
119f90e363 [ticket/13891] Replaced ContainerBuilder with service_collection
PHPBB3-13891
2015-06-30 10:31:58 +02:00
JoshyPHP
615ab099e2 [ticket/13891] Added reparser:list and reparser:reparse to CLI
PHPBB3-13891
2015-06-30 10:31:28 +02:00
Tristan Darricau
614f04b455 Merge branch '3.1.x' 2015-06-29 11:33:25 +02:00
Tristan Darricau
e4696318bd Merge pull request #3689 from s9e/ticket/13880-fix-master
[ticket/13880] Merge branch 'fix-3.1' into fix-master
2015-06-29 11:33:20 +02:00
Tristan Darricau
2be39c5a8f Merge pull request #3654 from s9e/ticket/13880
[ticket/13880] Automatically remove quotes that are nested too deep
2015-06-29 11:33:00 +02:00
Tristan Darricau
385a0bb790 Merge pull request #3730 from s9e/ticket/13970
[ticket/13970] Save the value of the optional [code] parameter
2015-06-29 11:31:29 +02:00
Kailey Truscott
cc23ac887c [ticket/13974] Change userdata type from string to array
Change the docblock for userdata from string to array.

PHPBB3-13974
2015-06-28 14:31:02 -04:00
Kailey Truscott
607f2e791f [ticket/13974] Add core.mcp_change_poster_after event
Create a new event to perform additional tasks after chainging a post's
poster.

PHPBB3-13974
2015-06-28 01:14:08 -04:00
Joas Schilling
de14c3563b Merge branch '3.1.x' 2015-06-27 14:57:30 +02:00
Joas Schilling
7b903919bf Merge pull request #3620 from VSEphpbb/ticket/13818
[ticket/13818] Add Extension and Style CDB Links into ACP Management pages
2015-06-27 14:54:33 +02:00
Mate Bartus
c80cf87b90 [ticket/13961] Allow the collection to be modified runtime
PHPBB3-13961
2015-06-27 12:49:10 +02:00
javiexin
d0cf674f33 [ticket/13911] Add events to configure options for profile fields
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number again.

PHPBB3-13911
2015-06-27 12:45:56 +02:00
Marco Kubuntu
6f18963636 [ticket/13971] Add draft_id var to event core.posting_modify_template_vars
Added draft_id to the core.posting_modify_template_vars event in posting.php,
to provide the ability to use the 'checked' draft_id in extensions,
in addition to the 'raw' draft_id provided in earlier events in posting.php

PHPBB3-13971
2015-06-27 12:38:31 +02:00
JoshyPHP
353b3b4cfd [ticket/13970] Save the value of the optional [code] parameter
PHPBB3-13970
2015-06-27 12:33:44 +02:00
Joas Schilling
8510faa767 Merge branch '3.1.x' 2015-06-27 11:14:50 +02:00
Joas Schilling
7b93df1522 Merge pull request #3714 from marc1706/ticket/13951
[ticket/13951] Make sure the page number is an integer
2015-06-27 11:14:23 +02:00
Joas Schilling
03b1b63520 Merge branch '3.1.x' 2015-06-27 11:06:30 +02:00
Joas Schilling
2237030398 Merge pull request #3725 from RMcGirr83/ticket/13962
[ticket/13962] MCP Queue dropdown for forum selection
2015-06-27 11:01:47 +02:00
Joas Schilling
5b7dab01f9 Merge branch '3.1.x' 2015-06-27 10:53:50 +02:00
Joas Schilling
dbd653327c Merge pull request #3729 from Zoddo/ticket/13967
[ticket/13967] Use HTTPS on phpbb.com links
2015-06-27 10:53:36 +02:00
JoshyPHP
d9db021af4 [ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-master
PHPBB3-13880
2015-06-27 04:34:12 +02:00
JoshyPHP
ae2237f640 [ticket/13880] Replaced the quote regexp to allow brackets
This matches the regexp used in bbcode::bbcode_cache_init()

PHPBB3-13880
2015-06-27 04:25:54 +02:00
JoshyPHP
817db2f135 [ticket/13880] Automatically remove quotes that are nested too deep
PHPBB3-13880
2015-06-27 02:52:26 +02:00
Zoddo
8bb48b575d [ticket/13967] Use HTTPS on phpbb.com links
This fix the HTTPS breaking issue on the BBCode FAQ.

PHPBB3-13967
2015-06-26 14:53:05 +02:00
Marc Alexander
9e117a9eeb Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_post.php
2015-06-26 10:25:10 +02:00
Marc Alexander
7d7b536874 Merge pull request #3728 from Crizz0/ticket/13966
[ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_…
2015-06-26 10:19:58 +02:00
Mate Bartus
b09293d5ff [ticket/13961] Move back service_collections under original namespace
PHPBB3-13961
2015-06-26 01:04:36 +02:00
JoshyPHP
9d364aee4a [ticket/10620] Moved quote's date to the upper corner
PHPBB3-10620
2015-06-25 22:51:44 +02:00
JoshyPHP
1f6b9bc048 [ticket/10620] Fixed functional tests to account for newlines
PHPBB3-10620
2015-06-25 22:51:43 +02:00
JoshyPHP
5a55ce3f68 [ticket/10620] Add more whitespace to long quotes in JS
PHPBB3-10620
2015-06-25 22:51:43 +02:00
JoshyPHP
4c9507e20a [ticket/10620] Fixed some stylistic issues in JS
PHPBB3-10620
2015-06-25 22:51:40 +02:00
Crizzo
ef6af2682b [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_post
PHPBB3-13966
2015-06-25 22:22:56 +02:00
JoshyPHP
7ce2d996a8 [ticket/10620] Added tests
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
4f1b25706f [ticket/10620] Removed extraneous quotes from attribute values
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
129b3375ae [ticket/10620] Added enhanced quotes in pm history
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
06936bda05 [ticket/10620] Added enhanced quotes in topic review
Added support for enhanced quotes in topic_review's quote button.
NOTE: the UI doesn't appear to be testable via PhantomJS.

PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
c934b8f150 [ticket/10620] Updated docblock
PHPBB3-10620
2015-06-25 03:11:58 +02:00
JoshyPHP
f02cc27014 [ticket/10620] Implemented quote improvements
PHPBB3-10620
2015-06-25 03:11:55 +02:00
Tristan Darricau
8747c7a2c1 Merge pull request #3579 from s9e/ticket/13803
[ticket/13803] Implement a generic and scalable way to reparse rich text
2015-06-24 16:58:41 +02:00
Tristan Darricau
6bcf12a558 Merge pull request #3618 from marc1706/ticket/13832
[ticket/13832] Use preg_replace_callback instead of /e modifier
2015-06-24 16:36:15 +02:00
Tristan Darricau
d430acb568 Merge pull request #3669 from s9e/ticket/13901
[ticket/13901] Add more whitespace to long quotes for readability
2015-06-24 16:34:53 +02:00
Tristan Darricau
c1b1693098 Merge pull request #3683 from s9e/ticket/13921
[ticket/13921] Fix block BBCodes inside of inline BBCodes
2015-06-24 16:28:57 +02:00
Mate Bartus
050de400d7 [ticket/13961] Fix compatibility issue with parent class
PHPBB3-13961
2015-06-24 15:35:47 +02:00
Mate Bartus
a34a65afdc [ticket/13691] Add services when the iterator requested
PHPBB3-13691
2015-06-24 15:15:38 +02:00
Mate Bartus
f5b476b221 [ticket/13961] Add tests for ordered collections
PHPBB3-13961
2015-06-24 13:13:13 +02:00
Mate Bartus
a91c4e4f96 [ticket/13961] Add ordered service collection
PHPBB3-13961
2015-06-24 13:08:19 +02:00
Marc Alexander
510f704bc8 Merge branch '3.1.x' 2015-06-24 08:54:50 +02:00
Marc Alexander
84bbd4490e Merge pull request #3538 from RMcGirr83/ticket/13759
[ticket/13759] Take post_time into account
2015-06-24 08:54:45 +02:00
Marc Alexander
58b40945b0 Merge branch '3.1.x' 2015-06-24 08:52:05 +02:00
Marc Alexander
11e312f41c Merge pull request #3528 from RMcGirr83/ticket/13598
[ticket/13598] Allow topic lock on topic creation
2015-06-24 08:51:57 +02:00
Stanislav Atanasov
82bc9baa24 [ticket/13817] fix after for session_update
Fix wrong variables passed to create session event

PHPBB3-13817
2015-06-24 04:34:34 +03:00
RMcGirr83
2ec5c5de17 [ticket/13962] MCP Queue dropdown for forum selection
PHPBB3-13962
2015-06-23 13:26:47 -04:00
Mate Bartus
9dbd8f4f9b [ticket/13961] Add test to service_collection
PHPBB3-13961
2015-06-23 14:35:45 +02:00
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
Andreas Fischer
abf98f92e6 Merge pull request #3722 from rxu/ticket/13948
[ticket/13948] Correctly forwarding to the RIR for whois feature

* rxu/ticket/13948:
  [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
Marc Alexander
da7b24449d Merge pull request #3715 from marc1706/ticket/13949
[ticket/13949] Replace colon with colon lang key in memberlist search page
2015-06-19 10:39:33 +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
8b28881aa2 Merge pull request #3712 from VSEphpbb/ticket/13882
[ticket/13882] Add lazy load avatars to phpbb avatar wrappers
2015-06-17 15:39:06 +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
Andreas Fischer
0bab5db1dd Merge pull request #3711 from bantu/ticket/13903
[ticket/13903] Replacing regexp path naming for container by md5.

* bantu/ticket/13903:
  [ticket/13903] Replacing regexp path naming for container by md5.
2015-06-16 20:03:31 +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
Andreas Fischer
65d44923b4 Merge branch '3.1.x'
* 3.1.x:
  [ticket/12952] Check obvious errors before status in functional tests
2015-06-16 14:24:35 +02:00
Andreas Fischer
efc09df8df Merge pull request #3710 from marc1706/ticket/12952
[ticket/12952] Check obvious errors before status in functional tests

* marc1706/ticket/12952:
  [ticket/12952] Check obvious errors before status in functional tests
2015-06-16 14:24:34 +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
Marc Alexander
2503723e2f [ticket/12952] Check obvious errors before status in functional tests
This will change the output from just saying that the status did not match
the expected one to actually showing any errors before complaining about a
possible difference in the status code.

PHPBB3-12952
2015-06-16 11:10:22 +02:00
CHItA
d5414592f1 Merge branch '3.1.x' 2015-06-16 01:20:22 +02:00
CHItA
c6308ee7c0 Merge branch 'nickvergessen/ticket/13947' into 3.1.x 2015-06-16 01:18:12 +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
Joas Schilling
f688bc6160 Merge branch 'ticket/13938' into prep-release-3.1.5 2015-06-14 07:44:58 +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
Joas Schilling
e59b96e968 Merge pull request #3706 from marc1706/ticket/13942
[ticket/13942] Check if path to language file contains language path
2015-06-14 07:22:57 +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
Joas Schilling
a50e2c0c47 Merge branch 'ticket/13939' into prep-release-3.1.5 2015-06-13 15:42:42 +02:00
cyberalien
5170cd67fb [ticket/13939] Check if loadingIndicator exists before accessing it
PHPBB3-13939
2015-06-13 15:42:30 +02:00
Andreas Fischer
e0d1f81114 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
2015-06-13 15:18:44 +02:00
Andreas Fischer
bf7a4f629d Merge pull request #3704 from Nicofuma/ticket/13941
[ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3

* Nicofuma/ticket/13941:
  [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
2015-06-13 15:18:43 +02:00
JoshyPHP
eb11c80b23 [ticket/13921] Fix block BBCodes inside of inline BBCodes
PHPBB3-13921
2015-06-13 14:27:12 +02:00
Tristan Darricau
5dbfd14699 [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
PHPBB3-13941
2015-06-13 13:20:55 +02:00
javiexin
7b026eff79 [ticket/10711] Duplicate key error on forum_tracks_table
In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY'
in the forums_track table is produced when marking forums read
(viewforum.php?f=xx&mark=forums).

The problem happens when there are duplicates in the forum_id array.
The solution is to remove those duplicates.

PHPBB3-10711
2015-06-13 01:08:18 +02:00
Joas Schilling
a49bd38e83 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-06-11 23:29:55 +02:00
Joas Schilling
9238d28353 [3.1.x] Update dev version to 3.1.6-RC1 2015-06-11 23:25:43 +02:00
Joas Schilling
7bb617eeb6 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 23:24:02 +02:00
Joas Schilling
a3883a6f23 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-06-11 21:00:04 +02:00
Joas Schilling
4276962e78 [3.1.x] Increase dev version to 3.1.6-dev 2015-06-11 20:57:26 +02:00
Joas Schilling
69eb563e18 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 20:57:00 +02:00
Joas Schilling
2c65b9b133 Merge pull request #3699 from nickvergessen/ticket/13823
[ticket/13823] Move the part of the query, so the update will get it …
2015-06-10 22:26:16 +02:00
Joas Schilling
dfb7bb1de1 Merge branch '3.0.x' into prep-release-3.1.5 2015-06-10 22:23:34 +02:00
Joas Schilling
0d349a82ca Merge pull request #3700 from Nicofuma/ticket/13823
[ticket/13823] Change diff options while packaging to not ignore all whitespaces
2015-06-10 22:22:52 +02:00
Tristan Darricau
cdf580ee37 [ticket/13823] Change diff options while packaging to not ignore all whitespaces
Removed:
    -w, --ignore-all-space       Ignore white space when comparing lines.

Added:
    -Z, --ignore-trailing-space  Ignore white space at line end.
    -b, --ignore-space-change    Ignore changes in the amount of white space.

PHPBB3-13823
2015-06-10 14:15:10 +02:00
Joas Schilling
3d18d6dc77 [ticket/13823] Move the part of the query, so the update will get it correctly
PHPBB3-13823
2015-06-09 23:11:26 +02:00
Andreas Fischer
9713f52fc6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
2015-06-09 21:27:56 +02:00
Andreas Fischer
d8343f2108 Merge pull request #3685 from Nicofuma/ticket/13923
[ticket/13923] Update startup.php

* Nicofuma/ticket/13923:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
2015-06-09 21:27:49 +02:00
Andreas Fischer
37c197404e Merge branch '3.1.x'
* 3.1.x:
2015-06-09 21:27:26 +02:00
Andreas Fischer
1f4976f590 Merge pull request #3696 from marc1706/ticket/13930-master
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930-master:
  [ticket/13930] Add missing space to mssql_extractor
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
2015-06-09 21:27:23 +02:00
Andreas Fischer
c952622fa0 Merge pull request #3694 from marc1706/ticket/13930
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930:
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
2015-06-09 21:27:07 +02:00
Tristan Darricau
b5573bb92d [ticket/13923] CS
PHPBB3-13923
2015-06-09 21:22:52 +02:00
Joas Schilling
790f7ded5b [prep-release-3.1.5] Add changelog for 3.1.5-RC1 2015-06-09 20:45:37 +02:00
Joas Schilling
23a45fcace [prep-release-3.1.5] Add migration for 3.1.5-RC1 2015-06-09 20:32:15 +02:00
Joas Schilling
d2a2c183ed [prep-release-3.1.5] Update version to 3.1.5-RC1 2015-06-09 20:30:40 +02:00
Joas Schilling
00c15c76c3 Merge branch '3.1.x' 2015-06-09 20:23:29 +02:00
Joas Schilling
832c9f64e0 Merge pull request #3551 from rxu/ticket/13779
[ticket/13779] Set new auth options to the role only if matching the role type
2015-06-09 20:23:08 +02:00
Marc Alexander
47ef99f6ef Merge branch '3.1.x' 2015-06-09 17:22:02 +02:00
Marc Alexander
405681f138 Merge pull request #3486 from brunoais/ticket/13693
[ticket/13693] Allow modifying the MySQL author search query
2015-06-09 17:21:54 +02:00
Marc Alexander
6d3c4d3879 Merge branch '3.1.x' 2015-06-09 17:19:49 +02:00
Marc Alexander
b7db12a593 Merge pull request #3485 from brunoais/ticket/13694
[ticket/13694] Allow modifying the Postgres native author search query for results
2015-06-09 17:19:42 +02:00
Marc Alexander
39c273e346 Merge branch '3.1.x' 2015-06-09 17:18:12 +02:00
Marc Alexander
4143f65b46 Merge pull request #3484 from brunoais/ticket/13691
[ticket/13691] Allow modifying the fulltext native search query for total results for author
2015-06-09 17:18:04 +02:00
Marc Alexander
35f3c5c4b0 Merge branch '3.1.x' 2015-06-09 17:14:58 +02:00
Marc Alexander
5f7fa4c89c Merge pull request #3483 from brunoais/ticket/13686
[ticket/13686] Allow modify query used for counting in fulltext_native
2015-06-09 17:14:23 +02:00
Marc Alexander
a21650e689 Merge branch '3.1.x' 2015-06-09 17:11:20 +02:00
Marc Alexander
83d8ea013b Merge pull request #3481 from brunoais/ticket/13689
[ticket/13689] Allow modifying the query for postgres native fulltext search

Conflicts:
	phpBB/develop/search_fill.php
	phpBB/includes/acp/acp_main.php
	phpBB/includes/acp/acp_search.php
	phpBB/includes/functions_admin.php
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_main.php
	phpBB/includes/mcp/mcp_post.php
	phpBB/install/install_convert.php
	phpBB/install/install_install.php
	phpBB/phpbb/search/fulltext_mysql.php
	phpBB/phpbb/search/fulltext_native.php
	phpBB/phpbb/search/fulltext_postgres.php
	phpBB/phpbb/search/fulltext_sphinx.php
	phpBB/search.php
	tests/search/mysql_test.php
	tests/search/native_test.php
	tests/search/postgres_test.php
2015-06-09 17:10:44 +02:00
Marc Alexander
b2ada8ba09 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_main.php
2015-06-09 15:24:08 +02:00
Marc Alexander
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685
[ticket/13685] Allow modifying the query for mysql native fulltext search
2015-06-09 14:27:13 +02:00
brunoais
3ac95f48f8 [ticket/13685] phpBB, not PhpBB
PHPBB3-13685
2015-06-09 12:55:27 +01:00
brunoais
6e8da5a424 [ticket/13685] This should take care of the rest
PHPBB3-13685
2015-06-08 18:09:48 +01:00
Marc Alexander
d3e55a8290 Merge branch '3.1.x'
Conflicts:
	phpBB/posting.php
2015-06-08 17:59:49 +02:00
Marc Alexander
1214210864 Merge branch '3.0.x' into 3.1.x 2015-06-08 17:58:09 +02:00
Marc Alexander
abce057467 Merge pull request #3663 from Elsensee/ticket/13833
[ticket/13833] Prevent flooding if type="submit" doesn't exist
2015-06-08 17:58:08 +02:00
Marc Alexander
88d16b47a4 Merge pull request #3697 from Elsensee/ticket/13833-30x
[ticket/13833] Prevent flooding if type=submit doesn't exist
2015-06-08 17:52:31 +02:00
Oliver Schramm
c2d254ea41 Merge branch 'ticket/13833-30x' into ticket/13833
Conflicts:
        phpBB/posting.php

PHPBB3-13833
2015-06-08 17:19:11 +02:00
Oliver Schramm
2c6369c5d9 [ticket/13833] Prevent flooding if type=submit doesn't exist
PHPBB3-13833
2015-06-08 17:01:52 +02:00
Marc Alexander
1fae4152ef [ticket/13930] Add missing space to mssql_extractor
PHPBB3-13930
2015-06-08 15:55:03 +02:00
Marc Alexander
2e31cae7bf Merge branch 'ticket/13930' into ticket/13930-master
Conflicts:
	phpBB/includes/acp/acp_database.php
2015-06-08 15:39:47 +02:00
Andreas Fischer
04c9520c73 Merge pull request #3690 from s9e/ticket/13902
[ticket/13902] Increased CSS margin around quotes

* s9e/ticket/13902:
  [ticket/13902] Increased CSS margin around quotes
2015-06-08 15:13:42 +02:00
Marc Alexander
f9389995e7 [ticket/13930] Add missing spaces to code
PHPBB3-13930
2015-06-08 13:54:50 +02:00
Marc Alexander
d4e0c08915 [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
PHPBB3-13930
2015-06-08 13:40:33 +02:00
javiexin
41f78b5c49 [ticket/13931] Wrong order in docs/events.md
Reordered alphabetically (mcp before memberlist).

PHPBB3-13931
2015-06-08 11:26:59 +02:00
Marc Alexander
d70ad1230b [ticket/13930] Remove not needed return statements
PHPBB3-13930
2015-06-08 10:07:12 +02:00
Andreas Fischer
03bfcba582 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13888] Fix sql_freeresult() error on author searches
2015-06-08 01:59:09 +02:00
Andreas Fischer
f94bbcb4fe Merge pull request #3691 from CHItA/ticket/13888
[ticket/13888] Fix sql_freeresult() error on author searches

* CHItA/ticket/13888:
  [ticket/13888] Fix sql_freeresult() error on author searches
2015-06-08 01:59:08 +02:00
Marc Alexander
9203bf3141 [ticket/13930] Add missing spaces to code
PHPBB3-13930
2015-06-07 22:53:41 +02:00
Marc Alexander
6687b7e9ab [ticket/13930] Check for correct spacing between keyword & parenthesis
The codesniffer should check for a correct spacing between keywords like
if or foreach and its opening parenthesis.

PHPBB3-13930
2015-06-07 22:51:33 +02:00
brunoais
823783773c [ticket/13685] BUMP version to 3.1.5-dev
PHPBB3-13685
2015-06-07 18:40:50 +01:00
brunoais
94aff53e3f [ticket/13685] Allow modifying the query for mysql native fulltext search
PHPBB3-13685
2015-06-07 18:40:49 +01:00
brunoais
3cb86cb6f1 [ticket/13685] Fix tests for fulltext search
PHPBB3-13685
2015-06-07 18:40:49 +01:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors
PHPBB3-13685
2015-06-07 18:40:44 +01:00
Tristan Darricau
9777abaed4 Merge branch '3.1.x' 2015-06-07 18:02:47 +02:00
Tristan Darricau
25c4c481d7 Merge pull request #3693 from nickvergessen/ticket/13823
[ticket/13823] Remove the unnecessary brackets
2015-06-07 18:02:31 +02:00
Joas Schilling
17b94b8f9c [ticket/13823] Remove the unnecessary brackets
This changes the line with non-whitespace changes, so the packaging script
should correctly detect them as changed and put the file into the update.

PHPBB3-13823
2015-06-07 17:54:38 +02:00
CHItA
29cda5f2ad [ticket/13888] Fix sql_freeresult() error on author searches
PHPBB3-13888
2015-06-07 17:41:17 +02:00
Joas Schilling
6817418b06 Merge branch '3.1.x' 2015-06-07 17:11:10 +02:00
Joas Schilling
91212d5453 Merge pull request #3692 from CHItA/ticket/sec-184
[ticket/sec-184] Fix tests
2015-06-07 17:10:49 +02:00
CHItA
32a2546c5d [ticket/sec-184] Fix tests
SECURITY-184
2015-06-07 16:43:27 +02:00
Marc Alexander
77bc8ee68b Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php
2015-06-07 14:59:33 +02:00
Marc Alexander
bac02a348e Merge pull request #22 from phpbb/ticket/sec-184
[ticket/sec-184] Do not output passwords to HTML
2015-06-07 14:57:06 +02:00
JoshyPHP
3c0cbda289 [ticket/13902] Increased CSS margin around quotes
PHPBB3-13902
2015-06-07 06:57:59 +02:00
Matt Friedman
a620651ca1 [ticket/13818] Add browse CDB links to ext style lang management
PHPBB3-13818
2015-06-06 10:30:09 -07:00
Tristan Darricau
1f772234f7 Merge branch '3.1.x' 2015-06-06 18:12:54 +02:00
Tristan Darricau
99d3995548 Merge pull request #23 from phpbb/ticket/13913
[ticket/13913] Correctly check the forum_password and read permissions
2015-06-06 18:12:36 +02:00
AJ Quick
c78ee4e201 [ticket/13923] Update startup.php
While suppressing the output from the 'set_magic_quotes_runtime(0)'
is sufficient with normal phpBB installs, using this file in association
with the oauth plugin will cause an error on some versions of PHP.
This fixes a potential bug where set_magic_quotes_runtime is depreciated
in newer versions of PHP.

PHPBB3-13923
2015-06-06 13:05:34 +02:00
Tristan Darricau
e60b7f6cf2 Merge branch '3.1.x' 2015-06-06 12:02:15 +02:00
Tristan Darricau
774582876c Merge pull request #3671 from marc1706/ticket/9563
[ticket/9563] Do not show empty categories on index
2015-06-06 12:02:04 +02:00
Tristan Darricau
12c793bcd1 Merge branch '3.1.x' 2015-06-06 11:45:42 +02:00
Tristan Darricau
bed8df20d2 Merge pull request #3680 from marc1706/ticket/13917
[ticket/13917] Use hash_equals() if possible in password driver helper
2015-06-06 11:45:22 +02:00
Tristan Darricau
b30c699900 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
	phpBB/styles/subsilver2/template/login_body.html
	phpBB/styles/subsilver2/template/login_forum.html
	phpBB/styles/subsilver2/template/ucp_login_link.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
	phpBB/styles/subsilver2/template/ucp_register.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-06-06 11:44:05 +02:00
Tristan Darricau
593c7ed0e4 Merge pull request #3681 from marc1706/ticket/13200
[ticket/13200] Disable autocomplete for sensitive input fields
2015-06-06 11:40:18 +02:00
rxu
c221571963 [ticket/13779] Add permission set tests
PHPBB3-13779
2015-06-06 15:15:17 +07:00
Tristan Darricau
59ac18c03e Merge pull request #3682 from marc1706/ticket/13564
[ticket/13564] Fix user_delete_test on master
2015-06-05 10:09:05 +02:00
Marc Alexander
c8ccae7a7c Merge branch '3.1.x' 2015-06-05 10:05:50 +02:00
Marc Alexander
20b16fda4f Merge pull request #3684 from CHItA/ticket/13841
[ticket/13841] Fix tests on 3.1 and master branch
2015-06-05 10:05:44 +02:00
CHItA
2b0acdcea4 [ticket/13841] Fix tests on 3.1 and master branch
PHPBB3-13841
2015-06-05 07:33:40 +02:00
Marc Alexander
49f2dd8c5e [ticket/13564] Fix user_delete_test on master
PHPBB3-13564
2015-06-04 19:26:56 +02:00
javiexin
9057f72fc7 [ticket/13911] Add events to configure options for profile fields
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number and event name.

PHPBB3-13911
2015-06-04 19:13:23 +02:00
Marc Alexander
eebab029fd [ticket/13200] Disable autocomplete for sensitive input fields
PHPBB3-13200
2015-06-04 19:01:46 +02:00
Marc Alexander
5b8a721b73 [ticket/13799] Split lines in HTML files for better readability
PHPBB3-13799
2015-06-04 18:21:05 +02:00
Marc Alexander
0427e5f1b3 [ticket/13799] Add missing space before checked attribute
PHPBB3-13799
2015-06-04 18:14:52 +02:00
Joas Schilling
3ce3183e61 Merge branch '3.1.x' 2015-06-04 18:03:35 +02:00
Joas Schilling
7a55bcc0f3 Merge pull request #3611 from Alf007/ticket/13841
Ticket/13841
2015-06-04 18:03:19 +02:00
Joas Schilling
a2643f8e67 Merge branch '3.1.x' 2015-06-04 17:51:09 +02:00
Joas Schilling
51831924c5 Merge pull request #3567 from javiexin/ticket/13795
[ticket/13795] Modify core event in posting to include poll data
2015-06-04 17:51:00 +02:00
Joas Schilling
c28a213b1b Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344 Merge pull request #3558 from javiexin/ticket/13786
[ticket/13786] Add events to add MCP post options
2015-06-04 17:45:21 +02:00
Joas Schilling
f3f82bd377 Merge branch '3.1.x' 2015-06-04 17:30:16 +02:00
Joas Schilling
9005711ad7 Merge pull request #3502 from marc1706/ticket/13564
[ticket/13564] Unlink user accounts upon deleting user
2015-06-04 17:30:09 +02:00
Marc Alexander
fb94bd11fb [ticket/13917] Do not pass non-string variables to hash_equals()
PHPBB3-13917
2015-06-04 17:16:22 +02:00
Marc Alexander
852337cacd [ticket/13917] Use hash_equals() if it's available
PHPBB3-13917
2015-06-04 16:52:08 +02:00
Joas Schilling
e8f9458a21 [ticket/13913] Correctly check the forum_password and read permissions
We need to check them on the forum the post is in, rather than the forum row
we are displaying.

PHPBB3-13913
2015-06-04 16:48:58 +02:00
Joas Schilling
78b0c938a2 [ticket/sec-184] Do not output LDAP password to HTML
SECURITY-184
2015-06-04 14:29:03 +02:00
Joas Schilling
9c84b3b5fb [ticket/sec-184] Do not output Jabber password to HTML
SECURITY-184
2015-06-04 14:13:07 +02:00
Joas Schilling
6ca3a30576 [ticket/sec-184] Do not output config passwords to the HTML page
SECURITY-184
2015-06-04 14:06:35 +02:00
JoshyPHP
78eeb210e7 [ticket/13906] Renamed test
PHPBB3-13906
2015-06-02 22:46:14 +02:00
javiexin
b627a097bb [ticket/13911] Add events to configure options for profile fields
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fix bamboo formatting errors.

PHPBB3-13911
2015-06-02 18:30:10 +02:00
javiexin
0f6d16920b [ticket/13911] Add events to configure options for profile fields
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields.

PHPBB3-13911
2015-06-02 13:18:33 +02:00
JoshyPHP
d37c995f4b [ticket/13906] Added test
PHPBB3-13906
2015-06-02 12:37:36 +02:00
JoshyPHP
eb227977d2 [ticket/13906] Fixed old signatures in post preview
PHPBB3-13906
2015-06-01 02:24:48 +02:00
Nils Adermann
6813735d82 Merge pull request #3552 from MateBartus/ticket/13777
[ticket/13777] Move module management related functionailty into service
2015-05-31 17:22:21 +02:00
Cesar G
4b46ac78a6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13905] Don't load loading.gif until needed.
2015-05-31 16:57:38 +02:00
Cesar G
db3782e491 Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x
* callumacrae/ticket/13905:
  [ticket/13905] Don't load loading.gif until needed.
2015-05-31 16:56:44 +02:00
MateBartus
8d443c3de7 [ticket/13777] Remove module_class_not_defined_exception
PHPBB3-13777
2015-05-31 16:27:16 +02:00
MateBartus
4044b5df89 [ticket/13777] Reorder get_module_infos() method's arguments
PHPBB3-13777
2015-05-31 16:03:11 +02:00
Marc Alexander
7a66d62290 Merge branch '3.1.x' 2015-05-31 14:15:19 +02:00
Marc Alexander
189d94e897 Merge pull request #3668 from callumacrae/js-linting
[ticket/13898] js coding standards
2015-05-31 14:15:17 +02:00
Callum Macrae
cfbd051d52 [ticket/13898] Moved jshint and jscs rcs to correct dir.
PHPBB3-13898
2015-05-31 13:50:48 +02:00
Callum Macrae
d978564600 [ticket/13905] Don't load loading.gif until needed.
PHPBB3-13905
2015-05-31 13:46:30 +02:00
MateBartus
fcff3ee4ad [ticket/13777] Fix tests
PHPBB3-13777
2015-05-31 13:22:46 +02:00
MateBartus
77ee0e62ca [ticket/13777] Use module manager in phpBB core files
PHPBB3-13777
2015-05-31 13:22:45 +02:00
MateBartus
e877a752be [ticket/13777] Deduplicate migration service definitions
PHPBB3-13777
2015-05-31 13:22:45 +02:00
MateBartus
71d03647f0 [ticket/13777] Move module management into service
PHPBB3-13777
2015-05-31 13:22:44 +02:00
Marc Alexander
2e20bae695 [ticket/9563] Do not show empty categories on index
PHPBB3-9563
2015-05-31 11:08:00 +02:00
Marc Alexander
c0972f74ca Merge pull request #3670 from s9e/ticket/8420
[ticket/8420] Emoticon removes space before itself when using preview
2015-05-31 10:49:05 +02:00
JoshyPHP
6ac37145ec [ticket/8420] Added regression test
PHPBB3-8420
2015-05-31 10:13:20 +02:00
JoshyPHP
433021f429 [ticket/13901] Fixed test's expected result
PHPBB3-13901
2015-05-30 23:51:09 +02:00
JoshyPHP
b69e33c2b0 [ticket/13901] Add whitespace to short, multiline quotes for readability
PHPBB3-13901
2015-05-30 22:20:52 +02:00
JoshyPHP
2f0d11ba3c [ticket/13901] Add more whitespace to long quotes for readability
PHPBB3-13901
2015-05-30 22:17:14 +02:00
alf007
1f385b536a [ticket/13841] Add core event on functions_admin for topics move
Event added for the function move_topics() in
includes/functions_admin.php, so that you can insert any extension's table(s)
to be updated when topics are moved between forums
Added parameters topic_ids, forum_id, forum_ids and auto_sync

PHPBB3-13841
2015-05-30 17:48:18 +02:00
JoshyPHP
2a7d26d3de [ticket/13803] Use accurate flags for generate_text_for_edit()
PHPBB3-13803
2015-05-30 17:29:49 +02:00
JoshyPHP
25ce302a60 [ticket/13803] Added text_reparser_collection service
PHPBB3-13803
2015-05-30 17:29:43 +02:00
JoshyPHP
132282634f [ticket/13803] Moved tests to a subdir
PHPBB3-13803
2015-05-30 17:26:13 +02:00
JoshyPHP
c8052ea823 [ticket/13803] Set up a global $user for tests
PHPBB3-13803
2015-05-30 17:26:13 +02:00
JoshyPHP
1275f77da5 [ticket/13803] Renamed var
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
f463b99ad0 [ticket/13803] Updated services.yml [ci skip]
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
1bff7d1175 [ticket/13803] Fixed method name
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
75eb283f8d [ticket/13803] Renamed methods
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
54b18df084 [ticket/13803] Added contact_admin_info tests
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
3827a131ae [ticket/13803] Rewrote the poll_option plugin
As it turns out, poll_option_id is not a primary key.

PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
7a8ac4bb71 [ticket/13803] Added get_max_id() tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
ae6ad754a4 [ticket/13803] Moved the add_missing_fields() call to the base class
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
2dc19cec9d [ticket/13803] Added poll_option tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
8ef15d10e6 [ticket/13803] Added poll_title tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
b0eb63e5b9 [ticket/13803] Added group_description tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
a870f8f860 [ticket/13803] Added user_signature tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
212fc277b4 [ticket/13803] Reordered methods [ci skip]
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
d42b2fe795 [ticket/13803] Sort test rows in SQL to match the expected result
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
6ab524f8dc [ticket/13803] Added tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
70cd911281 [ticket/13803] Added tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
9bf0f794b5 [ticket/13803] Added pm_text tests
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
ea445ffa47 [ticket/13803] Added methods to detect whether a given feature is in use
They test whether a given BBCode was enabled and has been used in a text,
or smilies, or magic URLs.

PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
459f1d4c1f [ticket/13803] Refactored test
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
b5911281ae [ticket/13803] Added tests, fixed param order in generate_text_for_storage()
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
986af43f37 [ticket/13803] Added plugins
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
e11ae7e9cd [ticket/13803] Hyphenated class names
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
de52580a78 [ticket/13803] WIP implementation
PHPBB3-13803
2015-05-30 17:26:00 +02:00
Callum Macrae
27a70f573f [ticket/13898] Fixed all the forum_fn.js violations I understood
PHPBB3-13898
2015-05-30 15:03:56 +02:00
Callum Macrae
a39a421acb [ticket/13898] Allow underscores :(
PHPBB3-13898
2015-05-30 14:55:42 +02:00
Callum Macrae
bafd649eea [ticket/13898] 4 spaces, not 2
PHPBB3-13898
2015-05-30 14:50:35 +02:00
Callum Macrae
e3090e04c3 [ticket/13898] js coding standaaards
PHPBB3-13898
2015-05-30 14:44:48 +02:00
Nils Adermann
073f3e6fdc Merge pull request #3592 from Nicofuma/ticket/13388
[ticket/13388] Integrate routing and di parameters resolution
2015-05-30 13:21:22 +02:00
Tristan Darricau
ea7114e785 [ticket/13388] Fix coding style
PHPBB3-13388
2015-05-30 13:14:27 +02:00
Oliver Schramm
cdd76da6a3 Merge branch '3.1.x' 2015-05-30 12:55:21 +02:00
Oliver Schramm
049f584111 Merge pull request #3638 from naderman/ticket/13874
[ticket/13874] Add master to sami API docs
2015-05-30 12:54:27 +02:00
Marc Alexander
e9601813c1 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-05-30 12:41:24 +02:00
Marc Alexander
d6cd90d325 Merge pull request #3658 from callumacrae/js-refactoring-again
JS Refactoring
2015-05-30 12:40:46 +02:00
Nils Adermann
03cb588ac6 Merge pull request #3665 from Nicofuma/ticket/13896
Fix conding style
2015-05-30 12:30:51 +02:00
Tristan Darricau
41efc55be9 [ticket/13896] Fix coding style
PHPBB3-13896
2015-05-30 12:27:31 +02:00
Marc Alexander
e04f9a2425 [ticket/9252] Do not try to disapprove a post that was just approved
Without this change, posts that are approved by someone right before
another moderator is trying to disapprove a post are actually deleted
instead of disapproved.

PHPBB3-9252
2015-05-30 12:27:00 +02:00
Callum Macrae
d1c4f5bc35 [ticket/13882] Added tiny docblock to lazyLoadAvatars
PHPBB3-13882
2015-05-30 12:18:44 +02:00
Marc Alexander
1ba86eaa8e [ticket/13799] Correctly urlencode category and show selected avatar
PHPBB3-13799
2015-05-30 11:54:54 +02:00
Marc Alexander
b499a1ce06 Merge branch '3.1.x' 2015-05-30 11:33:50 +02:00
Marc Alexander
df4b391baa Merge pull request #3545 from VSEphpbb/ticket/13771
[ticket/13771] Allow AJAX errors to support exceptions messages
2015-05-30 11:33:48 +02:00
Marc Alexander
44b8dafb23 [ticket/6466] Support form reset and do not loose role upon resubmit
PHPBB3-6466
2015-05-30 11:24:00 +02:00
Nils Adermann
f958d05aed Merge branch '3.1.x'
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
2015-05-30 10:58:40 +02:00
Marc Alexander
2e46bef2ec [ticket/6466] Remove createElement function from tooltip.js
PHPBB3-6466
2015-05-30 10:54:32 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790
[ticket/13790] Update phpcs
2015-05-30 10:53:47 +02:00
Callum Macrae
9366f29fd7 [ticket/13882] no more egyptian brackets /o/
PHPBB3-13882
2015-05-30 10:48:38 +02:00
Andreas Fischer
3f4206e012 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test
2015-05-29 22:46:34 +02:00
Andreas Fischer
b5fed65fe3 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test

Conflicts:
	tests/lint_test.php
2015-05-29 22:46:28 +02:00
Andreas Fischer
fedd0ae7f3 Merge pull request #3639 from marc1706/ticket/13875
[ticket/13875] Ignore cache, ext, and store folder in lint test

* marc1706/ticket/13875:
  [ticket/13875] Ignore cache, ext, and store folder in lint test
2015-05-29 22:31:41 +02:00
Marc Alexander
89cb8a3217 [ticket/6466] Minor documentation changes
PHPBB3-6466
2015-05-29 18:06:30 +02:00
Marc Alexander
0d5f074f54 [ticket/6466] Rename variables and remove unused ones
PHPBB3-6466
2015-05-29 17:39:03 +02:00
Marc Alexander
c8bb0fd241 [ticket/6466] Improve code in tooltip.js
PHPBB3-6466
2015-05-29 17:35:53 +02:00
Marc Alexander
120600e055 [ticket/6466] Rename functions and clean up code
PHPBB3-6466
2015-05-29 17:34:42 +02:00
Marc Alexander
abf0be4b4c [ticket/6466] Get rid of useless variables and functions in tooltip.js
PHPBB3-6466
2015-05-29 17:18:03 +02:00
Marc Alexander
75e1cbdc77 [ticket/6466] Remove double semicolon
PHPBB3-6466
2015-05-29 17:08:17 +02:00
Marc Alexander
795776db4b [ticket/6466] Removed link tooltip
It wasn't being used anymore and didn't work anymore.

PHPBB3-6466
2015-05-29 17:07:47 +02:00
Marc Alexander
faa5ab5899 [ticket/6466] Improved code in tooltip.js
PHPBB3-6466
2015-05-29 17:06:14 +02:00
Marc Alexander
4d827b5b99 [ticket/6466] Remove remnants of old code
PHPBB3-6466
2015-05-29 16:56:24 +02:00
Tristan Darricau
d129ee6c94 [ticket/13388] Fix deprecations
PHPBB3-13388
2015-05-29 16:53:54 +02:00
Tristan Darricau
80375c98f0 [ticket/13388] Fix rebase
PHPBB3-13388
2015-05-29 16:52:21 +02:00
Tristan Darricau
6656567424 [ticket/13388] Address comments
PHPBB3-13388
2015-05-29 16:48:51 +02:00
Tristan Darricau
66c0e0c6a8 [ticket/13388] Integrate routing and di parameters resolution
PHPBB3-13388
2015-05-29 16:48:51 +02:00
Marc Alexander
fc00447520 [ticket/6466] Improve behavior of select and properly save role
PHPBB3-6466
2015-05-29 16:44:12 +02:00
Oliver Schramm
13955a3e13 Merge pull request #3660 from Nicofuma/ticket/13890
[ticket/13890] Fix di tests
2015-05-29 16:40:42 +02:00
Tristan Darricau
86ad1a92c8 Merge pull request #3561 from s9e/ticket/10922
[ticket/10922] Added support for body and subject in email BBCode
2015-05-29 16:15:04 +02:00
Marc Alexander
467c794b97 [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
PHPBB3-6466
2015-05-29 16:05:16 +02:00
Tristan Darricau
2aecb94068 Merge pull request #3383 from nickvergessen/ticket/9109
Ticket/9109 Properly document and calculate the group settings with value 0
2015-05-29 16:04:56 +02:00
Tristan Darricau
a3d46575c7 Merge pull request #3613 from nickvergessen/ticket/13844
Ticket/13844 Better FAQ language files
2015-05-29 15:44:39 +02:00
Tristan Darricau
f5dbc3b6f2 Merge pull request #3616 from s9e/ticket/13847
[ticket/13847] Move quote generation to text_formatter.utils
2015-05-29 15:42:14 +02:00
Tristan Darricau
6641ed6478 [ticket/13890] Fix di tests
PHPBB3-13890
2015-05-29 14:54:08 +02:00
Tristan Darricau
3c3b099f88 Merge pull request #3622 from s9e/ticket/13860
[ticket/13860] Fixed array-to-string conversion
2015-05-29 13:15:33 +02:00
Callum Macrae
da6f751cef [ticket/13887] Made readable code DRY
PHPBB3-13887
2015-05-29 13:08:31 +02:00
Tristan Darricau
835a2ebcb8 Merge pull request #3625 from s9e/ticket/11742
[ticket/11742] Remove tabs-to-space conversion in [code]
2015-05-29 13:03:12 +02:00
Callum Macrae
0fc6816be6 [ticket/13887] Made unreadable code readable
PHPBB3-13887
2015-05-29 13:01:33 +02:00
Callum Macrae
143578ad09 [ticket/13887] Minor JS refactoring
PHPBB3-13887
2015-05-29 12:51:28 +02:00
Callum Macrae
2a83290e7c [ticket/13887] Use correct JSDoc syntax
PHPBB3-13887
2015-05-29 12:09:19 +02:00
Joas Schilling
0e48d250d3 Merge pull request #3648 from marc1706/ticket/13872
[ticket/13872] Remove subsilver2 from md exporter test
2015-05-29 11:41:31 +02:00
Nils Adermann
da68f62d4f Merge pull request #3554 from Nicofuma/ticket/13770
[ticket/13770] Wither interface for container_builder
2015-05-29 10:56:54 +02:00
Callum Macrae
be1d1c7d05 [ticket/13882] Lazy load the notification avatars.
This moves them further down the waterfall, making the page load
quicker.

PHPBB3-13882
2015-05-28 18:05:07 +02:00
Marc Alexander
bfba82cd28 Merge branch '3.1.x' 2015-05-28 16:25:28 +02:00
Marc Alexander
518902ef51 Merge pull request #3640 from callumacrae/ticket/13876
[ticket/13876] Use webfontloader asyncronously.
2015-05-28 16:25:26 +02:00
Marc Alexander
b02700a62f Merge branch '3.1.x' 2015-05-28 16:03:24 +02:00
Marc Alexander
f5801320b7 Merge pull request #3634 from prototech/ticket/13858
[ticket/13858] Make Plupload uploader available in the global namespace.
2015-05-28 16:03:22 +02:00
Callum Macrae
44fcdd007f [ticket/13876] set webfont async to true
PHPBB3-13876
2015-05-28 16:01:47 +02:00
Callum Macrae
8b6c6e794a [ticket/13879] Replaced px with em where appropriate.
We're using ems basically everywhere else so ¯\_(ツ)_/¯

PHPBB3-13879
2015-05-28 15:57:31 +02:00
Marc Alexander
c56e2fa2bf [ticket/13872] Remove subsilver2 from md exporter test
PHPBB3-13872
2015-05-28 15:52:18 +02:00
Marc Alexander
ed064ce0f1 [ticket/13799] Do not rawurlencode category in gallery avatar
Otherwise the directory seperator will incorrectly be transformed to its
HTML replacement.

PHPBB3-13799
2015-05-28 15:36:27 +02:00
Cesar G
2271f6a9da Merge branch '3.1.x'
* 3.1.x:
  [ticket/13878] Display background images when printing topic in webkit
2015-05-28 15:35:04 +02:00
Cesar G
182312010b Merge remote-tracking branch 'marc1706/ticket/13878' into 3.1.x
* marc1706/ticket/13878:
  [ticket/13878] Display background images when printing topic in webkit
2015-05-28 15:34:43 +02:00
Marc Alexander
3ec3dfcf3a [ticket/13878] Display background images when printing topic in webkit
PHPBB3-13878
2015-05-28 14:58:46 +02:00
Callum Macrae
35e5dc46c7 [ticket/13876] Use webfontloader asyncronously.
This PR adds typekit and Google's webfontloader and calls it
asyncronously, removing the SPOF in the header. Now, if google
goes down, some buttons display with a different font.

https://github.com/typekit/webfontloader

PHPBB3-13876
2015-05-28 14:55:27 +02:00
javiexin
e80bb565ce [ticket/13795] Modify core event in posting to include poll data
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
Also include the poll variable in the parameter list for event
core.posting_modify_submission_errors, as it was missing, and any
modification here on post_data for poll related data is silently
ignored.  Added correct @change tags to both events.

PHPBB3-13795
2015-05-28 14:39:22 +02:00
javiexin
9951458ebf [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Remove extra template variable around the new event.

PHPBB3-13786
2015-05-28 14:28:41 +02:00
Marc Alexander
f5037761f0 Merge branch '3.1.x' 2015-05-28 14:18:20 +02:00
Marc Alexander
45d7e18f6b Merge pull request #3637 from callumacrae/ticket/13873
[ticket/13873] Removed broken print stylesheet.
2015-05-28 14:18:18 +02:00
Marc Alexander
615761fdf1 Merge branch '3.1.x' 2015-05-28 14:16:11 +02:00
Marc Alexander
ef39f3a9ab Merge pull request #3633 from nickvergessen/ticket/13872
[ticket/13872] Allow template events to have a changed version
2015-05-28 14:16:08 +02:00
Cesar G
a8ec353a4f Merge branch '3.1.x'
* 3.1.x:
  [ticket/12542] Use more specific CSS for drag-n-drop
  [ticket/12542] Do not use browser specific css for outline
  [ticket/12542] Properly check if textarea is undefined or null
  [ticket/12542] Use extended CSS for all browsers
  [ticket/12542] Rename javascript method and add doc block
  [ticket/12542] Add different outline colors for body & textarea
  [ticket/12542] Add initial drag-n-drop animation
2015-05-28 13:36:31 +02:00
Cesar G
f1e11414e8 Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.x
* marc1706/ticket/12542:
  [ticket/12542] Use more specific CSS for drag-n-drop
  [ticket/12542] Do not use browser specific css for outline
  [ticket/12542] Properly check if textarea is undefined or null
  [ticket/12542] Use extended CSS for all browsers
  [ticket/12542] Rename javascript method and add doc block
  [ticket/12542] Add different outline colors for body & textarea
  [ticket/12542] Add initial drag-n-drop animation
2015-05-28 13:36:15 +02:00
Marc Alexander
ba205a6bce [ticket/13875] Ignore cache, ext, and store folder in lint test
PHPBB3-13875
2015-05-28 13:35:32 +02:00
Nils Adermann
d589142c0b [ticket/13874] Add master to sami API docs
PHPBB3-13874
2015-05-28 13:19:52 +02:00
Joas Schilling
f6d7ea425f Merge branch '3.1.x'
* 3.1.x:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
2015-05-28 12:59:04 +02:00
Joas Schilling
75dd91412b Merge pull request #3469 from brunoais/ticket/13672
[ticket/13672] Allow changing the data from the user-submitted report

* brunoais/ticket/13672:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
2015-05-28 12:58:58 +02:00
Joas Schilling
7278356936 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query

Conflicts:
	phpBB/includes/mcp/mcp_reports.php
2015-05-28 12:56:26 +02:00
Joas Schilling
cf93c6503a Merge pull request #3468 from brunoais/ticket/13668
[ticket/13668] Allow changing the query to obtain the user-submitted report

* brunoais/ticket/13668:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query
2015-05-28 12:55:31 +02:00
Joas Schilling
021a2aeb82 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13661] BUMP version to 3.1.5-dev
  [ticket/13661] Brackets in their own line
  [ticket/13661] Re-Fixed  $log_type -> $log_time
  [ticket/13661] Wrong event @since version
  [ticket/13661] Removed superfluous whitespace
  [ticket/13661] bugfix: The conditional is the log_time, not log_type
  [ticket/13661] Fixed the "FROM" in the built query.
  [ticket/13661] Add event to allow editing the queries used to get the logs
  [ticket/13661] Transform queries to get logs and log count into built queries
2015-05-28 12:52:36 +02:00
Joas Schilling
b1d829c232 Merge pull request #3457 from brunoais/ticket/13661
[ticket/13661] Add event to allow editing the queries used to get the logs

* brunoais/ticket/13661:
  [ticket/13661] BUMP version to 3.1.5-dev
  [ticket/13661] Brackets in their own line
  [ticket/13661] Re-Fixed  $log_type -> $log_time
  [ticket/13661] Wrong event @since version
  [ticket/13661] Removed superfluous whitespace
  [ticket/13661] bugfix: The conditional is the log_time, not log_type
  [ticket/13661] Fixed the "FROM" in the built query.
  [ticket/13661] Add event to allow editing the queries used to get the logs
  [ticket/13661] Transform queries to get logs and log count into built queries
2015-05-28 12:52:19 +02:00
Callum Macrae
39cd228e06 [ticket/13873] Removed broken print stylesheet.
PHPBB3-13873
2015-05-28 12:46:19 +02:00
Marc Alexander
0f689e3cad Merge pull request #3636 from nickvergessen/ticket/13808-master
Ticket/13808 master

Conflicts:
	phpBB/docs/events.md
2015-05-28 12:44:33 +02:00
Marc Alexander
cdc86b3540 Merge branch '3.1.x'
Conflicts:
	phpBB/docs/events.md
2015-05-28 12:42:56 +02:00
Marc Alexander
16deefa7f8 Merge pull request #3635 from nickvergessen/ticket/13808
[ticket/13808] Fix version
2015-05-28 12:40:29 +02:00
Joas Schilling
5bf48bddf8 Merge branch 'ticket/13808' into ticket/13808-master
* ticket/13808:
  [ticket/13808] Fix version

Conflicts:
	phpBB/docs/events.md
2015-05-28 12:35:25 +02:00
Joas Schilling
0daa999fd0 [ticket/13808] Fix version
PHPBB3-13808
2015-05-28 12:34:21 +02:00
Marc Alexander
d917e0140f Merge pull request #3632 from prototech/ticket/13871
Fix call to undefined member function when running database_update.php
2015-05-28 12:34:16 +02:00
Cesar G
30f256102f [ticket/13858] Make Plupload uploader available in the global namespace.
PHPBB3-13858
2015-05-28 12:25:43 +02:00
JoshyPHP
97d05eb235 [ticket/13860] Fixed PHP notices from undeclared vars/properties
PHPBB3-13860
2015-05-28 12:24:14 +02:00
JoshyPHP
e0f7c225bc [ticket/13860] Fixed array-to-string conversion
PHPBB3-13860
2015-05-28 12:24:14 +02:00
Joas Schilling
b00b504343 [ticket/13872] Allow template events to have a changed version
PHPBB3-13872
2015-05-28 12:23:24 +02:00
Cesar G
0f040225d6 [ticket/13871] Fix call to undefined member function on non-object error.
PHPBB3-13871
2015-05-28 11:53:35 +02:00
Cesar G
30d39687de Merge branch '3.1.x'
* 3.1.x:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
2015-05-28 11:17:20 +02:00
Cesar G
080690073a Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.x
* Wolfsblvt/ticket/13787:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
2015-05-28 11:16:22 +02:00
Joas Schilling
c5b2822cf5 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13808] search_body_form_before

Conflicts:
	phpBB/styles/subsilver2/template/search_body.html
2015-05-28 11:09:24 +02:00
Joas Schilling
8fda16527e Merge pull request #3600 from dragosvr92/ticket/13808
[ticket/13808] search_body_form_before
2015-05-28 11:05:32 +02:00
Marc Alexander
abef078ab9 [ticket/12542] Use more specific CSS for drag-n-drop
Otherwise the CSS gets overwritten by other CSS rules.

PHPBB3-12542
2015-05-28 11:04:22 +02:00
Joas Schilling
95b3b4605a Merge branch '3.1.x' 2015-05-28 10:49:45 +02:00
Joas Schilling
7580798a5a Merge pull request #3435 from rxu/ticket/13648
[ticket/13648] Allow extensions using custom bbcode validation methods
2015-05-28 10:49:33 +02:00
Marc Alexander
2ee9baa3d0 Merge branch '3.1.x' 2015-05-28 10:42:43 +02:00
Marc Alexander
cc134d5fed Merge pull request #3631 from rxu/ticket/13868
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
2015-05-28 10:42:40 +02:00
Marc Alexander
c30e0610e9 [ticket/13832] Remove remnant of /e modifier code in check_flash_bbcodes
PHPBB3-13832
2015-05-28 10:30:36 +02:00
rxu
33239183ae [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
PHPBB3-13868
2015-05-27 02:15:12 +07:00
Andreas Fischer
e62eafb77b Merge pull request #3627 from imkingdavid/ticket/13769
[ticket/13769] Move environment check in phpbbcli.php lower

* imkingdavid/ticket/13769:
  [ticket/13769] Move environment check lower in phpbbcli.php
2015-05-26 20:44:26 +02:00
JoshyPHP
64e1824abd [ticket/13847] Updated ucp_pm_compose to use utils when forwarding
PHPBB3-13847
2015-05-25 21:33:17 +02:00
JoshyPHP
2a7a06da2a [ticket/13847] Updated ucp_pm_compose to use the utils service
...when quoting a post

PHPBB3-13847
2015-05-25 21:33:17 +02:00
JoshyPHP
e50d9186ce [ticket/13847] Changed enquote() logic to use whichever is the shortest
Will enclose attribute values in single- or double- quotes depending on
whichever requires the least escaping. Characters that need to be escaped
are always escaped regardless.

PHPBB3-13847
2015-05-25 21:33:17 +02:00
JoshyPHP
8a077e0e94 [ticket/13847] Move quote generation to text_formatter.utils
PHPBB3-13847
2015-05-25 21:33:17 +02:00
alf007
6025c40cab Merge pull request #1 from phpbb/develop-ascraeus
Develop ascraeus
2015-05-25 00:14:48 +02:00
David King
06d31abda9 [ticket/13769] Move environment check lower in phpbbcli.php
PHPBB3-13769
2015-05-23 17:26:52 -04:00
JoshyPHP
3f52429e3d [ticket/11742] Added test
PHPBB3-11742
2015-05-23 19:18:02 +02:00
JoshyPHP
ebda279bea [ticket/11742] Updated s9e\TextFormatter
PHPBB3-11742
2015-05-23 19:17:55 +02:00
Marc Alexander
622d5b2643 [ticket/12542] Do not use browser specific css for outline
Also, the CSS selector for the drag'n'drop was simplified to only use the
class.

PHPBB3-12542
2015-05-23 10:51:04 +02:00
JoshyPHP
adbc45b486 [ticket/11742] Removed whitespace collapsing in codebox [ci skip]
PHPBB3-11742
2015-05-23 01:55:05 +02:00
JoshyPHP
ad84a40c00 [ticket/11742] Updated default formatting tests to match the new default
PHPBB3-11742
2015-05-23 01:55:04 +02:00
JoshyPHP
92078dce33 [ticket/11742] Removed tabs-to-space conversion in [code]
PHPBB3-11742
2015-05-23 01:55:04 +02:00
Marc Alexander
6337407192 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/db/migration/data/v310/style_update_p1.php
2015-05-22 11:51:25 +02:00
Marc Alexander
5ca77df084 Merge pull request #3624 from VSEphpbb/ticket/13861
[ticket/13861] Fix undefined variables in style update migration
2015-05-22 11:49:07 +02:00
Matt Friedman
67502c0d22 [ticket/13861] Fix undefined variables in style update migration
PHPBB3-13861
2015-05-21 15:23:17 -07:00
Joas Schilling
077051fef5 [ticket/13844] Add events
PHPBB3-13844
2015-05-20 20:11:52 +02:00
Marc Alexander
b7a89187b5 [ticket/12542] Properly check if textarea is undefined or null
PHPBB3-12542
2015-05-20 15:47:26 +02:00
Marc Alexander
466b710235 Merge pull request #3608 from Nicofuma/ticket/13829
[ticket/13829] Don't fail if the cache isn't writeable
2015-05-20 10:53:16 +02:00
Marc Alexander
023f15f5fe Merge pull request #3621 from Nicofuma/ticket/13849
[ticket/13849] Fix development environment
2015-05-20 09:32:10 +02:00
Marc Alexander
0e5d1decbf [ticket/13832] Use preg_replace_callback in check_flash_bbcodes
PHPBB3-13832
2015-05-20 09:03:59 +02:00
Marc Alexander
91cace06a5 [ticket/13832] Resolve minor coding issues
PHPBB3-13832
2015-05-20 08:59:19 +02:00
Nicofuma
c5493c2bb8 Merge pull request #3586 from s9e/ticket/13680
[ticket/13680] Updated quote notifications
2015-05-20 00:38:49 +02:00
Nicofuma
fda5a83b6d Merge pull request #3569 from s9e/ticket/13641
[ticket/13641] Proper parsing of custom BBCode for inline code
2015-05-20 00:21:59 +02:00
Nicofuma
b5b7f455b1 Merge pull request #3572 from s9e/ticket/8419
[ticket/8419] Custom tag eats up space character
2015-05-20 00:10:12 +02:00
Nicofuma
15bec23770 Merge pull request #3578 from s9e/ticket/13801
[ticket/13801] Remove user dependency from text_formatter.s9e.parser
2015-05-20 00:02:41 +02:00
Nicofuma
9ccc7f4d65 Merge pull request #3597 from s9e/ticket/13614
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
2015-05-19 23:53:27 +02:00
Nicofuma
5e6c026527 Merge pull request #3617 from s9e/ticket/11530
[ticket/11530] Remove extra quotes when depth limit is exceeded
2015-05-19 23:35:58 +02:00
Nicofuma
b9ff0bbba4 [ticket/13849] Fix tests
PHPBB3-13849
2015-05-19 23:11:14 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs
PHPBB3-13790
2015-05-19 22:19:18 +02:00
Nicofuma
7a65b0cc4e [ticket/13849] Fix development environment
PHPBB3-13849
2015-05-19 21:59:41 +02:00
Marc Alexander
358c634153 [ticket/13832] Remove unused global from bbcode_init()
PHPBB3-13832
2015-05-19 17:26:01 +02:00
Marc Alexander
e8602d4203 [ticket/13832] Use preg_replace_callback in ucp_pm_options
PHPBB3-13832
2015-05-19 16:30:52 +02:00
Marc Alexander
3106195cdd [ticket/13832] Use preg_replace_callback in bbcode class
PHPBB3-13832
2015-05-19 16:29:50 +02:00
Marc Alexander
a430fef05b [ticket/13832] Use preg_replace_callback in acp_bbcodes
PHPBB3-13832
2015-05-19 16:29:10 +02:00
Marc Alexander
5796584611 [ticket/13832] Fix code sniffer errors in message_parser.php
PHPBB3-13832
2015-05-19 14:15:37 +02:00
JoshyPHP
2cc78b2c3b [ticket/11530] Fixed test description [ci skip]
PHPBB3-11530
2015-05-19 11:16:37 +02:00
Tristan Darricau
d7e2f488a4 Merge branch '3.1.x' 2015-05-19 09:44:36 +02:00
Tristan Darricau
1d2a127144 Merge pull request #3619 from javiexin/ticket/13852
[ticket/13852] Consistent tab navigation when login in
2015-05-19 09:43:29 +02:00
Marc Alexander
1494c54803 [ticket/13832] Do not use e modifier for bbcodes in message_parser
PHPBB3-13832
2015-05-18 21:43:25 +02:00
javiexin
cb12a065df [ticket/13852] Consistent tab navigation when login in
Added tabindex attribute to input elements in index_body.html to make
tab navigation consistent with that of login_body.html.

PHPBB3-13852
2015-05-18 19:38:48 +02:00
Marc Alexander
2911c01683 [ticket/13832] Remove e modifier from bold bbcode
PHPBB3-13832
2015-05-18 19:03:25 +02:00
Marc Alexander
8a5c0965d3 [ticket/13832] Allow callables for matching bbcodes
PHPBB3-13832
2015-05-18 19:02:49 +02:00
Marc Alexander
1076b562dd [ticket/13832] Do not use e modifier in message_parser
PHPBB3-13832
2015-05-18 17:59:21 +02:00
Marc Alexander
71f5c9c327 [ticket/13832] Use preg_replace_callback instead of /e modifier
PHPBB3-13832
2015-05-18 17:19:29 +02:00
JoshyPHP
e67c5850e4 [ticket/11530] Updated s9e\TextFormatter
PHPBB3-11530
2015-05-18 06:49:53 +02:00
JoshyPHP
c1777f4811 [ticket/11530] Remove extra quotes when depth limit is exceeded
PHPBB3-11530
2015-05-18 03:57:48 +02:00
JoshyPHP
5772e06b1a [ticket/13801] Updated event description [ci skip]
PHPBB3-13801
2015-05-18 02:58:33 +02:00
JoshyPHP
7b552152b4 [ticket/13801] Updated comments for clarity
PHPBB3-13801
2015-05-18 02:58:33 +02:00
JoshyPHP
deadc06652 [ticket/13801] Removed user dependency from text_formatter.s9e.parser
PHPBB3-13801
2015-05-18 02:58:33 +02:00
Joas Schilling
6dcc14bc58 [ticket/13844] Add unit tests for the help manager
PHPBB3-13844
2015-05-17 21:45:18 +02:00
Joas Schilling
8ce0a64a16 [ticket/13844] Remove hacky code for the help array
PHPBB3-13844
2015-05-17 21:18:17 +02:00
Nicofuma
c967ba7b9b Merge branch '3.1.x' 2015-05-17 20:02:29 +02:00
Nicofuma
309a6b9313 Merge pull request #3601 from nickvergessen/ticket/13827
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
2015-05-17 20:01:18 +02:00
rxu
73fd75abf1 [ticket/13846] Fix softdelete feature workflow in viewtopic
Changes:
- For permanent deletion of softdeleted post, disapprove mode has been changed
to delete mode;
- If post delete and softdelete are allowed, delete button triggers softdelete
mode;
- If a user can't permanently delete posts but can restore softdeleted posts,
delete button won't be displayed for softdeleted posts.
Subsilver2 is unaffected.

PHPBB3-13846
2015-05-17 21:52:30 +07:00
Joas Schilling
80be642a0b [ticket/13844] Fix language file so the tests pass
PHPBB3-13844
2015-05-16 23:13:50 +02:00
Joas Schilling
f6c246f889 [ticket/13844] Add a functional test that browses the help pages
PHPBB3-13844
2015-05-16 23:08:42 +02:00
Joas Schilling
07231e7943 [ticket/13844] FAQ in new controller format
PHPBB3-13844
2015-05-16 22:09:05 +02:00
Joas Schilling
ff7e9dc912 [ticket/13844] Refactor bbcode help to the new system
PHPBB3-13844
2015-05-16 22:09:04 +02:00
Joas Schilling
5586cbbcfe [ticket/13844] Add new versions of the old help_* files
PHPBB3-13844
2015-05-16 22:09:02 +02:00
Joas Schilling
e7321c9e55 [ticket/13844] Add a little develop script to migrate the files
PHPBB3-13844
2015-05-16 22:09:00 +02:00
Joas Schilling
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Joas Schilling
e52bc2d022 Merge pull request #3606 from Nicofuma/ticket/13838
[ticket/13838] Check braces for control structures
2015-05-16 13:39:45 +02:00
Oliver Schramm
cddecec146 Merge pull request #3591 from Nicofuma/ticket/12632
[ticket/12632] Add twig.debug and twig.auto_reload in config.yml
2015-05-16 00:30:19 +02:00
Oliver Schramm
c1ab364e28 Merge branch '3.1.x' 2015-05-15 17:54:10 +02:00
Oliver Schramm
1c0c9c1bca Merge pull request #3563 from rxu/ticket/13791
[ticket/13791] Add more post buttons template events to viewtopic_body.html
2015-05-15 17:52:44 +02:00
JoshyPHP
f7ad2c2b32 [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authors
PHPBB3-13680
2015-05-15 02:12:52 +02:00
JoshyPHP
f5ce9f2738 [ticket/13680] Updated quote notifications
Added get_quote_authors() to text_formatter.utils service to retrieve
the names used in first-level quotes

PHPBB3-13680
2015-05-15 02:10:46 +02:00
Andreas Fischer
10e625d30a Merge pull request #3609 from Nicofuma/ticket/13839
[ticket/13839] Don't be dependent on the phpBB root directory name in tests

* Nicofuma/ticket/13839:
  [ticket/13839] Don't be dependent on the phpBB root directory name in tests
2015-05-14 23:17:29 +02:00
Nicofuma
2b25c5bd35 [ticket/13770] Use dummy cache driver
PHPBB3-13770
2015-05-14 23:04:27 +02:00
Nicofuma
02af9385a1 [ticket/13770] Fix tests
PHPBB3-13770
2015-05-14 23:04:23 +02:00
Tristan Darricau
549fe66d90 [ticket/13770] Update tests
PHPBB3-13770
2015-05-14 23:04:18 +02:00
Tristan Darricau
c96e7ef171 [ticket/13770] Wither interface for container_builder
PHPBB3-13770
2015-05-14 23:04:03 +02:00
Marc Alexander
0b8632e750 Merge branch '3.1.x' 2015-05-14 18:14:34 +02:00
Marc Alexander
dcb36d572d Merge pull request #3607 from Nicofuma/ticket/13830
[ticket/13830] Fix unsused used statements and catch blocks
2015-05-14 18:14:26 +02:00
Joas Schilling
502214bf06 [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()
PHPBB3-13827
2015-05-14 17:13:47 +02:00
Nicofuma
a3e487e0f8 Merge pull request #3582 from s9e/ticket/13805
[ticket/13805] Updated generate_text_for_storage() to match message_parser
2015-05-14 17:13:33 +02:00
Nicofuma
ba9ac01dc0 Merge pull request #3581 from MateBartus/ticket/13804
[ticket/13804] Make template's user dependency optional
2015-05-14 17:03:12 +02:00
Nicofuma
a26ab86dc6 Merge pull request #3577 from MateBartus/ticket/13800
[ticket/13800] Make router's extension manager dependency optional
2015-05-14 16:47:18 +02:00
Nicofuma
737affcbb2 [ticket/13839] Don't be dependent on the phpBB root directory name in tests
PHPBB3-13839
2015-05-14 16:33:39 +02:00
Nicofuma
d48e95bb3a [ticket/13829] Don't fail if the cache isn't writeable
PHPBB3-13829
2015-05-14 16:08:21 +02:00
Nicofuma
3bc2b54128 [ticket/13830] Fix unsused used statements and catch blocks
PHPBB3-13830
2015-05-14 16:02:05 +02:00
Marc Alexander
11167f6060 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
2015-05-14 15:57:41 +02:00
Marc Alexander
d004a1c6b8 Merge pull request #3540 from RMcGirr83/ticket/13699
[ticket/13699] Add event before and after forum title in viewforum
2015-05-14 15:56:05 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style
PHPBB3-13838
2015-05-14 15:43:44 +02:00
Nicofuma
e4b30c474b [ticket/13838] Check braces for control structures
PHPBB3-13838
2015-05-14 15:40:52 +02:00
Marc Alexander
2d9bb285f9 Merge branch '3.1.x' 2015-05-14 12:57:23 +02:00
Marc Alexander
4527789e50 Merge pull request #3605 from Nicofuma/ticket/13830
[ticket/13830] Check class used in catch statements
2015-05-14 12:53:29 +02:00
JoshyPHP
f31483242b [ticket/13614] Added phpbb_pcre_utf8_support() dummy for BC
PHPBB3-13614
2015-05-11 20:48:05 +02:00
JoshyPHP
8b7a42f338 [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code.

PHPBB3-13614
2015-05-11 20:43:47 +02:00
MateBartus
281f2ef2da [ticket/13804] Remove unnecessary array_merge
PHPBB3-13804
2015-05-11 16:59:26 +02:00
Nicofuma
084aa56777 [ticket/13830] Check class used in catch statements
PHPBB3-13830
2015-05-10 21:13:36 +02:00
Marc Alexander
799d887015 Merge pull request #3602 from s9e/ticket/13828
[ticket/13828] Renamed testing doubles to avoid PHP7 keywords
2015-05-10 11:22:37 +02:00
JoshyPHP
e2bc6c8024 [ticket/13828] Renamed testing doubles to avoid PHP7 keywords
PHPBB3-13828
2015-05-10 03:04:12 +02:00
Joas Schilling
66279e1a57 [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
PHPBB3-13827
2015-05-09 20:48:14 +02:00
dragosvr92
345c25c367 [ticket/13808] search_body_form_before
Extensions may be designed to add secondary search options,
such as Google search in the search_body.html.
There are no events in the searchbody, so this should be merged.

PHPBB3-13808
2015-05-09 16:41:18 +03:00
Nicofuma
98db63e8cc Merge pull request #3599 from marc1706/ticket/13825
[ticket/13825] Correctly call phpbb_filesystem in create_thumbnail
2015-05-08 17:37:52 +02:00
brunoais
4119be5a3d [ticket/13672] Removed bogus sting concatenation
PHPBB3-13672
2015-05-08 10:43:48 +01:00
brunoais
d4fb3996d3 [ticket/13668] Removed bogus sting concatenation
PHPBB3-13668
2015-05-08 10:41:42 +01:00
Marc Alexander
83e9cdeebc Merge branch '3.1.x' 2015-05-08 11:19:59 +02:00
Marc Alexander
b3b7f8e925 Merge pull request #3530 from VSEphpbb/ticket/13753
[ticket/13753] Add template events to forum category row headers
2015-05-08 11:19:53 +02:00
Marc Alexander
ce3aafaf1b Merge branch '3.1.x' 2015-05-08 11:16:45 +02:00
Marc Alexander
7f5f5c216b Merge pull request #3529 from rxu/ticket/13752
[ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
2015-05-08 11:16:40 +02:00
Marc Alexander
2341b28f14 Merge branch '3.1.x' 2015-05-08 11:14:23 +02:00
Marc Alexander
d741ab57a8 Merge pull request #3526 from rxu/ticket/13750
[ticket/13750] Add core event to allow modifying navlinks text
2015-05-08 11:14:17 +02:00
Marc Alexander
b1a52a5ef3 Merge branch '3.1.x' 2015-05-08 11:07:56 +02:00
Marc Alexander
7a478b27dd Merge pull request #3459 from brunoais/ticket/13664
[ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
2015-05-08 11:07:50 +02:00
Marc Alexander
571f6dc9b5 [ticket/13825] Correctly call phpbb_filesystem in create_thumbnail
PHPBB3-13825
2015-05-08 11:05:01 +02:00
Marc Alexander
3f84473306 Merge branch '3.1.x' 2015-05-08 11:00:22 +02:00
Marc Alexander
4fc6e7dbc7 Merge pull request #3598 from VSEphpbb/ticket/13822
[ticket/13822] Correctly display softdelete and post detail perms
2015-05-08 10:59:40 +02:00
Matt Friedman
350786c969 [ticket/13822] Correctly display softdelete and post detail perms
PHPBB3-13822
2015-05-07 21:10:16 -07:00
Marc Alexander
d275586689 Merge branch '3.1.x' 2015-05-08 00:17:24 +02:00
Marc Alexander
1e28748c0c Merge pull request #3455 from brunoais/ticket/13660
[ticket/13660] Allow changing the query for total reports in mcp_front
2015-05-08 00:17:10 +02:00
rxu
aa1b427e45 [ticket/13648] Allow extensions using custom bbcode validation methods
PHPBB3-13648
2015-05-07 22:01:10 +07:00
rxu
a67db63a18 [ticket/13750] Add core event to allow modifying navlinks text
Add generate_forum_nav() core event in includes/functions_display.php
to allow modifying navlinks text. Use case example: extension(s) implementing
multilanguage boards including translated forum names and so on.

PHPBB3-13750
2015-05-07 21:57:27 +07:00
Andreas Fischer
d73c5f1292 Merge pull request #3568 from s9e/ticket/10268
[ticket/10268] Added regression test

* s9e/ticket/10268:
  [ticket/10268] Added regression test
2015-05-07 15:59:21 +02:00
Andreas Fischer
25f3fdebfd Merge pull request #3573 from s9e/ticket/9073
[ticket/9073] Word censoring in URLs

* s9e/ticket/9073:
  [ticket/9073] Added regression test
2015-05-07 15:52:00 +02:00
Andreas Fischer
2ebf4aa151 Merge pull request #3571 from s9e/ticket/13425
[ticket/13425] Smiley code at start of text being quoted doesn't show smiley image in quote

* s9e/ticket/13425:
  [ticket/13425] Added regression test
2015-05-07 15:46:06 +02:00
brunoais
603726371c [ticket/13660] BUMP version to 3.1.5-RC1
PHPBB3-13660
2015-05-06 23:08:07 +01:00
brunoais
c701e8a131 [ticket/13694] BUMP version to 3.1.5-dev
PHPBB3-13694
2015-05-06 23:05:30 +01:00
brunoais
5465c594ca [ticket/13691] BUMP version to 3.1.5-dev
PHPBB3-13691
2015-05-06 23:03:23 +01:00
brunoais
f2fb8e339d [ticket/13686] BUMP version to 3.1.5-dev
PHPBB3-13686
2015-05-06 23:02:21 +01:00
brunoais
9833eb4f13 [ticket/13672] BUMP version to 3.1.5-dev
PHPBB3-13672
2015-05-06 23:00:26 +01:00
brunoais
b8a31241a3 [ticket/13689] BUMP version to 3.1.5-dev
PHPBB3-13689
2015-05-06 22:59:05 +01:00
brunoais
9e06beb48d [ticket/13668] BUMP version to 3.1.5-dev
PHPBB3-13668
2015-05-06 22:56:22 +01:00
brunoais
70cbe67105 [ticket/13664] BUMP version to 3.1.5-dev
PHPBB3-13664
2015-05-06 22:55:30 +01:00
brunoais
684a050916 [ticket/13661] BUMP version to 3.1.5-dev
PHPBB3-13661
2015-05-06 22:53:43 +01:00
brunoais
59a1f4e8ac [ticket/13693] BUMP version to 3.1.5-dev
PHPBB3-13693
2015-05-06 22:50:52 +01:00
Marc Alexander
d025581f49 Merge branch '3.1.x' 2015-05-06 21:47:10 +02:00
Marc Alexander
a8c033f655 Merge pull request #3521 from rxu/ticket/13745
[ticket/13745] Add viewtopic.php core event to allow manipulating poll data
2015-05-06 21:47:07 +02:00
Nicofuma
5f18cf4cfb Merge branch '3.1.x' 2015-05-06 01:14:08 +02:00
Nicofuma
5e99c09abe Merge pull request #3583 from nickvergessen/ticket/13807
Ticket/13807 Allow building changesets for the event list
2015-05-06 01:13:33 +02:00
Andreas Fischer
636524fa56 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13819] Add missing sql_freeresult() to files in includes/

Conflicts:
	phpBB/includes/acp/acp_database.php
2015-05-06 01:06:21 +02:00
Andreas Fischer
65b40f15f5 Merge pull request #3595 from marc1706/ticket/13819
[ticket/13819] Add missing sql_freeresult() to files in includes/

* marc1706/ticket/13819:
  [ticket/13819] Add missing sql_freeresult() to files in includes/
2015-05-06 00:46:57 +02:00
Marc Alexander
de90dd25b2 [ticket/13819] Add missing sql_freeresult() to files in includes/
PHPBB3-13819
2015-05-05 23:55:13 +02:00
Richard McGirr
c2b4636008 [ticket/13699] Add event before and after forum title in viewforum
PHPBB3-13699
2015-05-05 13:37:46 -04:00
MateBartus
7b301e22f3 [ticket/13804] Make template's user dependency optional
PHPBB3-13804
2015-05-05 19:16:49 +02:00
Joas Schilling
740be0507e [ticket/13807] Add version to the usage output
PHPBB3-13807
2015-05-05 18:35:57 +02:00
Joas Schilling
de687f32ed Merge pull request #3432 from Nicofuma/ticket/13638
[ticket/13638] Prepend the assets path phpbb root
2015-05-05 18:17:14 +02:00
Nicofuma
51376a4391 [ticket/13638] Inject $filesystem in \phpbb\template\asset
PHPBB3-13638
2015-05-05 17:07:11 +02:00
Nicofuma
321ed2a3dd [ticket/13638] Add tests
PHPBB3-13638
2015-05-04 23:23:54 +02:00
Nicofuma
f097f84f16 [ticket/13638] Handle assets outside of phpbb_root_path
PHPBB3-13638
2015-05-04 23:23:40 +02:00
Nicofuma
3b631cb40d [ticket/13638] Prepend the assets path phpbb root
PHPBB3-13638
2015-05-04 23:23:18 +02:00
Nicofuma
ba53901ffb Merge branch '3.1.x' 2015-05-04 22:53:21 +02:00
Nicofuma
ab3e4b8abc Merge pull request #3564 from VSEphpbb/ticket/13516
[ticket/13516] Do not search ICC profiles in extension vendors
2015-05-04 22:52:28 +02:00
javiexin
6e0d12094a [ticket/13795] Modify core event in posting to include poll data
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
Also include the poll variable in the parameter list for event
core.posting_modify_submission_errors, as it was missing, and any
modification here on post_data for poll related data is silently
ignored.

PHPBB3-13795
2015-05-04 20:34:54 +02:00
Matt Friedman
5a107d9dc1 [ticket/13516] Update image search script
PHPBB3-13516
2015-05-04 10:33:14 -07:00
Matt Friedman
c7a0b4479d [ticket/13771] Only handle valid JQHXR response objects
PHPBB3-13771
2015-05-04 10:27:11 -07:00
Tristan Darricau
f821130c3a [ticket/12632] Add twig.debug and twig.auto_reload in config.yml
PHPBB3-13206
PHPBB3-12632
2015-05-04 14:43:58 +02:00
Tristan Darricau
6be8841a57 Merge pull request #3590 from rxu/ticket/13814
[ticket/13814] Prevent phpbb_is_writable() method from truncating files
2015-05-04 14:39:36 +02:00
rxu
0d2c8b5961 [ticket/13814] Prevent phpbb_is_writable() method from truncating files
phpbb_is_writable() of filesystem class uses 'w' mode to fopen files
which causes checked files to be truncated. Use the 'c' mode instead.

PHPBB3-13814
2015-05-04 16:53:27 +07:00
Tristan Darricau
1a42ec64c8 Merge pull request #3589 from marc1706/ticket/13782
[ticket/13782] Rename classes that use reserved PHP7 keywords
2015-05-04 11:16:33 +02:00
Tristan Darricau
98546a738b Merge branch '3.1.x' 2015-05-04 10:57:17 +02:00
Tristan Darricau
0e7448e2b3 Merge pull request #3562 from VSEphpbb/ticket/11521
[ticket/11521] Add missing lang strings for migration exceptions
2015-05-04 10:56:41 +02:00
Marc Alexander
292d0ab382 [ticket/13782] Rename null driver test to dummy driver test
PHPBB3-13782
2015-05-04 10:13:04 +02:00
Marc Alexander
232f71dae4 [ticket/13782] Rename null log to dummy for PHP7 compatibility
PHPBB3-13782
2015-05-04 10:11:28 +02:00
Marc Alexander
b3cc20a575 [ticket/13782] Rename null driver to dummy for PHP7 compatibility
PHPBB3-13782
2015-05-04 10:10:12 +02:00
Nicofuma
da68cfb775 Merge branch '3.1.x' 2015-05-03 22:44:39 +02:00
Nicofuma
1b75411e81 Merge pull request #3588 from nickvergessen/ticket/13809-asc
[ticket/13809] Perform the lint test prior to normal tests
2015-05-03 22:43:57 +02:00
Joas Schilling
923fdb0aa0 [ticket/13809] Test each file individually
PHPBB3-13809
2015-05-03 20:08:02 +02:00
Joas Schilling
b73b9f1dec [ticket/13809] Perform the lint test prior to normal tests
PHPBB3-13809
2015-05-03 20:07:51 +02:00
Joas Schilling
36abb61d39 Merge branch '3.1.x'
Conflicts:
	build/build.xml
2015-05-03 18:44:34 +02:00
Joas Schilling
f42a737419 Merge branch 'prep-release-3.1.4' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-05-03 18:44:01 +02:00
Joas Schilling
005c27e73d [prep-release-3.1.4] Add security issue to changelog 2015-05-03 17:14:55 +02:00
Joas Schilling
429b99922e [prep-release-3.1.4] Add migration 2015-05-03 17:12:12 +02:00
Joas Schilling
199d823f7a [prep-release-3.1.4] Update version to 3.1.4 2015-05-03 17:07:35 +02:00
Andreas Fischer
9074738a10 Merge branch '3.1.x'
* 3.1.x:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.
2015-05-03 16:45:10 +02:00
Andreas Fischer
713fe496ce Merge branch '3.0.x' into 3.1.x
* 3.0.x:

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-05-03 16:44:55 +02:00
Andreas Fischer
cfeb2bec80 Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml
2015-05-03 16:43:32 +02:00
Andreas Fischer
52aafb4dea Merge branch 'prep-release-3.0.14' into 3.0.x
* prep-release-3.0.14:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-05-03 16:41:58 +02:00
Andreas Fischer
dde72c58b0 Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-05-03 16:39:51 +02:00
Andreas Fischer
11242dd07d [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. 2015-05-03 16:22:28 +02:00
Andreas Fischer
5382552fc8 [prep-release-3.0.14] Bump version numbers for 3.0.14 release. 2015-05-03 14:40:50 +02:00
MateBartus
74dbaac039 [ticket/13800] Make router's extension manager dependency optional
PHPBB3-13800
2015-05-02 23:45:45 +02:00
Tristan Darricau
8596742579 Merge pull request #3535 from MateBartus/ticket/13762
[ticket/13762] Moving language related functionality into a service
2015-05-02 22:51:43 +02:00
Joas Schilling
45baaf6022 [ticket/13807] Only output the header for diff
PHPBB3-13807
2015-05-02 17:29:55 +02:00
Joas Schilling
34141b576e [ticket/13807] Fix minor coding flaws
PHPBB3-13807
2015-05-02 16:55:35 +02:00
Joas Schilling
2226043325 [ticket/13807] Fix "changed version" to match our version numbering
PHPBB3-13807
2015-05-02 14:41:59 +02:00
Joas Schilling
96d97ae2d2 [ticket/13807] Add an option to generate a diff for the release highlights
PHPBB3-13807
2015-05-02 14:41:59 +02:00
Joas Schilling
bdad879508 [ticket/13807] Allow filtering template events
PHPBB3-13807
2015-05-02 14:35:26 +02:00
Joas Schilling
e0180991bf [ticket/13807] Allow filtering events by phpBB version
PHPBB3-13807
2015-05-02 14:35:18 +02:00
MateBartus
9a99c9e4b1 [ticket/13762] Replace user service with lang in twig extension
PHPBB3-13762
2015-05-02 13:37:13 +02:00
MateBartus
9f1f6f96ce [ticket/13762] Optional DI injectable default language module array
PHPBB3-13762
2015-05-02 13:37:13 +02:00
MateBartus
179a470022 [ticket/13762] Moving language related functionality into a separate class
PHPBB3-13762
2015-05-02 13:37:12 +02:00
Tristan Darricau
2f480be02d Merge pull request #3565 from MateBartus/ticket/13793
[ticket/13793] Remove translation on throwing exceptions
2015-05-02 13:21:21 +02:00
Tristan Darricau
e51571eaa3 Merge branch '3.1.x' 2015-05-02 11:54:50 +02:00
Tristan Darricau
af3cde98f4 Merge branch '3.0.x' into 3.1.x 2015-05-02 11:54:09 +02:00
Tristan Darricau
9c320ccdce Merge pull request #3575 from marc1706/ticket/13792
[ticket/13792] Use hhvm instead of manually installing nightlys for now
2015-05-02 11:45:05 +02:00
JoshyPHP
e5a167e6c2 [ticket/13805] Updated generate_text_for_storage() to match message_parser
PHPBB3-13805
2015-05-02 01:53:11 +02:00
Marc Alexander
7f820ee962 [ticket/13792] Use hhvm instead of manually installing nightlys for now
Nightly builds are currently not supported because packages for precise
no longer exist and travis is still running on it.

PHPBB3-13792
2015-05-01 15:45:40 +02:00
MateBartus
57072a1e28 [ticket/13793] Remove translation on throwing exceptions
PHPBB3-13793
2015-05-01 12:40:53 +02:00
rxu
aef5be3d17 [ticket/13791] Add more post buttons template events to viewtopic_body.html
The purpose is to allow adding custom post buttons outside of original post
buttons conditionals/list in prosilver (for subsilver2 it's not the issue).

PHPBB3-13791
2015-05-01 10:59:18 +07:00
JoshyPHP
66ad805127 [ticket/9073] Added regression test
PHPBB3-9073
2015-04-30 00:35:32 +02:00
JoshyPHP
abb4a2f6de [ticket/8419] Added regression test
PHPBB3-8419
2015-04-30 00:21:43 +02:00
JoshyPHP
71660301d6 [ticket/13425] Added regression test
PHPBB3-13425
2015-04-30 00:09:35 +02:00
JoshyPHP
c56726e9da [ticket/13641] Added regression test
PHPBB3-13641
2015-04-29 23:59:55 +02:00
JoshyPHP
2bbd78ec7d [ticket/10268] Added regression test
PHPBB3-10268
2015-04-29 23:01:19 +02:00
javiexin
34602037dc [ticket/13795] Modify core event in posting to include poll data
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.

PHPBB3-13795
2015-04-29 20:15:20 +02:00
Joas Schilling
d67fdfa02b Merge branch '3.1.x' 2015-04-29 17:16:21 +02:00
Joas Schilling
9cd0295dd8 Merge branch 'prep-release-3.1.4' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-04-29 17:15:56 +02:00
Marc Alexander
818df0ec68 [ticket/12542] Use extended CSS for all browsers
PHPBB3-12542
2015-04-29 12:30:35 +02:00
Marc Alexander
c018b3bbc7 [ticket/12542] Rename javascript method and add doc block
PHPBB3-12542
2015-04-29 12:24:12 +02:00
Joas Schilling
1ad09d9c8b [prep-release-3.1.4] Increase version number to 3.1.4-RC2 2015-04-29 09:59:40 +02:00
Marc Alexander
ae8129b699 [ticket/12542] Add different outline colors for body & textarea
PHPBB3-12542
2015-04-29 00:12:55 +02:00
Andreas Fischer
39f1e8c009 Merge branch '3.1.x'
* 3.1.x:
  [ticket/security-180] Use language variable for redirect error in 3.1+
  [ticket/security-180] Merge if statement with previous one in 3.1.x
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:51 +02:00
Andreas Fischer
95add752b7 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
2015-04-28 22:17:44 +02:00
Andreas Fischer
aa0c55ed8f Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
  [ticket/security-180] Use language variable for redirect error in 3.1+
  [ticket/security-180] Merge if statement with previous one in 3.1.x
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:37 +02:00
Andreas Fischer
c1702b8e19 Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into prep-release-3.1.4
* phpbb-security/ticket/security-180-asc:
  [ticket/security-180] Use language variable for redirect error in 3.1+
  [ticket/security-180] Merge if statement with previous one in 3.1.x
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:11 +02:00
Matt Friedman
acaa10de52 [ticket/13516] Do not search ICC profiles in extension vendors
PHPBB3-13516
2015-04-28 13:12:48 -07:00
Marc Alexander
d7c96cc60c [ticket/security-180] Use language variable for redirect error in 3.1+
SECURITY-180
2015-04-28 22:12:04 +02:00
Marc Alexander
416728fc17 Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
	tests/security/redirect_test.php
2015-04-28 22:12:03 +02:00
Marc Alexander
ec207d0a71 [ticket/security-180] Merge if statement with previous one in 3.1.x
SECURITY-180
2015-04-28 22:08:19 +02:00
Marc Alexander
89723b17d9 Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
	tests/security/redirect_test.php
2015-04-28 22:08:15 +02:00
Andreas Fischer
2fb7ef2668 Merge branch 'prep-release-3.0.14' into 3.0.x
* prep-release-3.0.14:
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
2015-04-28 21:55:15 +02:00
Andreas Fischer
1a3350619f Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-release-3.0.14
* phpbb-security/ticket/security-180:
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
2015-04-28 21:54:50 +02:00
Andreas Fischer
ae2707db13 Merge branch '3.1.x'
* 3.1.x:
  [3.0.x] Increment version number to 3.0.15-dev.
2015-04-28 21:48:51 +02:00
Andreas Fischer
98c9734db4 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
  [3.0.x] Increment version number to 3.0.15-dev.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-04-28 21:48:42 +02:00
Andreas Fischer
0f707ddb99 Merge branch '3.1.x'
* 3.1.x:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:43:46 +02:00
Andreas Fischer
62abead26d Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:42:39 +02:00
Andreas Fischer
969718fc91 Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2015-04-28 21:40:23 +02:00
Andreas Fischer
6d8df7332c [3.0.x] Increment version number to 3.0.15-dev. 2015-04-28 20:40:20 +02:00
Andreas Fischer
d833f29069 [3.0.x] Add changelog for 3.0.14 release. 2015-04-28 18:57:03 +02:00
JoshyPHP
5c78be56ec [ticket/10922] Added test
PHPBB3-10922
2015-04-28 16:17:54 +02:00
Marc Alexander
46a789de5c [ticket/12542] Add initial drag-n-drop animation
PHPBB3-12542
2015-04-28 16:12:58 +02:00
JoshyPHP
d242610d0f [ticket/10922] Added test data
PHPBB3-10922
2015-04-28 15:36:51 +02:00
Matt Friedman
c818873d48 [ticket/11521] Add missing lang strings for migration exceptions
PHPBB3-11521
2015-04-28 00:02:42 -07:00
JoshyPHP
6dc14f4cf0 [ticket/10922] Added tests
PHPBB3-10922
2015-04-28 03:23:21 +02:00
JoshyPHP
3f54fd49b5 [ticket/10922] Replaced urlencode() with rawurlencode()
RFC-6068 asks for percent-encoding so that seems more correct.
Not sure about that one.

PHPBB3-10922
2015-04-28 02:53:40 +02:00
JoshyPHP
102b6c2df3 [ticket/10922] Added support for body and subject in email BBCode
PHPBB3-10922
2015-04-28 02:40:33 +02:00
Andreas Fischer
ce74a0bd6c [3.0.x] Bump version numbers for 3.0.14-RC1 release. 2015-04-27 23:22:44 +02:00
Andreas Fischer
cd6c0427fb [3.0.x] Bumping version numbers to final for 3.0.14 releases. 2015-04-27 23:13:56 +02:00
Andreas Fischer
0bc352ea7e Merge pull request #3557 from VSEphpbb/ticket/13778
[ticket/13778] Update wording of the reCaptcha instructions

* VSEphpbb/ticket/13778:
  [ticket/13778] Update wording of the reCaptcha instructions
2015-04-27 22:56:35 +02:00
Andreas Fischer
6870293a9e Merge branch '3.1.x'
* 3.1.x:
  [ticket/13778] Update wording of the reCaptcha instructions
2015-04-27 22:56:35 +02:00
Andreas Fischer
7c2115d95a Merge branch '3.1.x'
* 3.1.x:
  [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
2015-04-27 22:15:57 +02:00
Andreas Fischer
78c0221855 Merge pull request #3555 from akoeplinger/ticket/12101
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver

* akoeplinger/ticket/12101:
  [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
2015-04-27 22:15:56 +02:00
javiexin
f80dc9dc16 [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix another typo.

PHPBB3-13786
2015-04-27 17:36:43 +02:00
Tristan Darricau
734b89e75c Merge pull request #3524 from marc1706/ticket/8672
[ticket/8672] Add class for retrieving imagesize without download
2015-04-27 16:26:40 +02:00
javiexin
18e8f281be [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix typo.

PHPBB3-13786
2015-04-27 15:35:09 +02:00
javiexin
e98a5afd07 [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html

PHPBB3-13786
2015-04-27 13:21:23 +02:00
Matt Friedman
281661c23e [ticket/13778] Update wording of the reCaptcha instructions
PHPBB3-13778
2015-04-26 20:57:56 -07:00
Wolfsblvt
55a3d88793 [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
When options are shown and poll delete is allowed, the option to
delete
polls is shown twice. This is fixed here by moving the if poll
delete
check out of the outer if, wich makes it also more consistent
with the
new event.

PHPBB3-13787
2015-04-27 02:27:29 +02:00
Alexander Köplinger
e25e411e2b [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
The code was added as a workaround for bugs in very old versions of IIS,
dating back to 2002: see commit 849d766974.

Newer IIS versions handle the 'Location' header just fine, so we can avoid
the unnecessary HTML page for redirects. Given that it seems to work fine
since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special
check for earlier versions as they are no longer supported by MS as well.

PHPBB3-12101
2015-04-26 22:10:06 +02:00
Andreas Fischer
e7d2977401 Merge pull request #3548 from s9e/ticket/12745
[ticket/12745] Allow Unicode characters from the SMP to be used in text

* s9e/ticket/12745:
  [ticket/12745] Added HTML entity test
  [ticket/12745] Added support for Unicode characters outside BMP
  [ticket/12745] Updated s9e\TextFormatter
2015-04-26 20:25:14 +02:00
Marc Alexander
03eae6fddd Merge branch '3.1.x' 2015-04-26 09:24:09 +02:00
Marc Alexander
59a178f3cb Merge pull request #3532 from prototech/ticket/13755
[ticket/13755] Ignore dots in path when determining file extension.
2015-04-26 09:24:03 +02:00
rxu
2308472eb0 [ticket/13779] Set new auth options to the role only if matching the role type
Migrations' permission tool allows setting permissions to the role which
doesn't match the role type, e.g. m_ permissions for u_ role types and so on.
As one of side effects, this may lead to granting users moderative/admin
permissions silently.
With this patch the only new permissions matching the role type will be set.

PHPBB3-13779
2015-04-26 11:57:02 +07:00
JoshyPHP
98bdcd0cde [ticket/12745] Added HTML entity test
https://github.com/phpbb/phpbb/pull/3548#issuecomment-96219167

PHPBB3-12745
2015-04-25 23:43:38 +02:00
JoshyPHP
25acba2259 [ticket/12745] Added support for Unicode characters outside BMP
PHPBB3-12745
2015-04-25 23:43:32 +02:00
JoshyPHP
572a905c02 [ticket/12745] Updated s9e\TextFormatter
PHPBB3-12745
2015-04-25 23:42:54 +02:00
Andreas Fischer
3305885fc8 Merge branch '3.1.x'
* 3.1.x:
2015-04-25 18:19:49 +02:00
Andreas Fischer
887f83589f Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
2015-04-25 18:19:43 +02:00
Andreas Fischer
eae592691c Merge pull request #3550 from bantu/ticket/13765-3.1.4
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:19:24 +02:00
Andreas Fischer
80d4fb1847 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:19 +02:00
Andreas Fischer
196eb98ba8 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
2015-04-25 18:11:12 +02:00
Andreas Fischer
0fc70d4b15 Merge pull request #3550 from bantu/ticket/13765-3.1.4
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:07 +02:00
Andreas Fischer
4d63032024 Merge pull request #3549 from bantu/ticket/13765
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:10:45 +02:00
Andreas Fischer
901875a1fb Merge branch 'ticket/13765' into ticket/13765-3.1.4
* ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

Conflicts:
	phpBB/includes/functions.php
	phpBB/includes/startup.php
2015-04-25 17:41:17 +02:00
Joas Schilling
463c62df18 [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
PHPBB3-13765
2015-04-25 17:22:10 +02:00
Marc Alexander
c5178a19b2 [ticket/13564] Add tests for unlinking account upon deleting user
PHPBB3-13564
2015-04-25 15:48:24 +02:00
Marc Alexander
9088f44863 [ticket/8672] Update hash of lock file
PHPBB3-8672
2015-04-24 13:39:15 +02:00
Marc Alexander
55c5bc126d [ticket/8672] User $user->lang() instead of sprintf
PHPBB3-8672
2015-04-24 13:34:18 +02:00
Marc Alexander
31bcdb23a2 [ticket/8672] Remove unnecessary lines from clean-vendor-dir
The new version of fastImageSize already makes sure that these files
and/or folders do not exist.

PHPBB3-8672
2015-04-24 13:33:17 +02:00
Marc Alexander
2665e68592 [ticket/8672] Update fastImageSize to 1.0.2
PHPBB3-8672
2015-04-24 13:33:16 +02:00
Marc Alexander
19011cb842 [ticket/8672] Add fastImageSize to clean-vendor-dir in build.xml
PHPBB3-8672
2015-04-24 13:33:16 +02:00
Marc Alexander
0a6ac0226d [ticket/8672] Update fastImageSize to 1.0.1
PHPBB3-8672
2015-04-24 13:33:15 +02:00
Marc Alexander
f92d894470 [ticket/8672] Remove outdated imagesize class
PHPBB3-8672
2015-04-24 13:33:14 +02:00
Marc Alexander
39d6180c68 [ticket/8672] Use fastImageSize in classes
PHPBB3-8672
2015-04-24 13:33:14 +02:00
Marc Alexander
3fc7a352ff [ticket/8672] Add fast-image-size library to composer.json
PHPBB3-8672
2015-04-24 13:33:13 +02:00
JoshyPHP
245d042e43 [ticket/8672] Updated the text_formatter.s9e service
PHPBB3-8672
2015-04-24 13:31:37 +02:00
Marc Alexander
2fa99602c6 [ticket/8672] Add class for retrieving imagesize without download
getimagesize() always downloads the complete file before checking
the actual image dimensions. This class will be able to do the same
without having to download possibly large files.

PHPBB3-8672
2015-04-24 13:31:36 +02:00
Marc Alexander
18fc621d73 [ticket/security-180] Add tests for redirecting to main URL
SECURITY-180
2015-04-23 15:27:30 +02:00
Andreas Fischer
746a33b57b Merge pull request #3541 from s9e/ticket/13767
[ticket/13767] Remove vendor/s9e/text-formatter/.git during build

* s9e/ticket/13767:
  [ticket/13767] Remove vendor/s9e/text-formatter/.git during build
2015-04-22 23:31:40 +02:00
Andreas Fischer
b334121eeb Merge pull request #3547 from s9e/ticket/13774
[ticket/13774] Update s9e\TextFormatter

* s9e/ticket/13774:
  [ticket/13774] Updated s9e\TextFormatter
2015-04-22 23:22:19 +02:00
JoshyPHP
72596429bd [ticket/13774] Updated s9e\TextFormatter
PHPBB3-13774
2015-04-22 22:35:47 +02:00
Andreas Fischer
eba5b59533 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
2015-04-22 15:15:09 +02:00
Andreas Fischer
552f35952a Merge pull request #3546 from brunoais/ticket/13772
[ticket/13772] Fix typo in phpbb\passwords\manager::__construct()

* brunoais/ticket/13772:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
2015-04-22 15:15:08 +02:00
Andreas Fischer
6381c5a731 Merge pull request #3544 from Nicofuma/ticket/13768
[ticket/13768] Update to symfony 2.8.*@dev

* Nicofuma/ticket/13768:
  [ticket/13768] Fix deprecations
  [ticket/13768] Update to symfony 2.8.*@dev
2015-04-22 14:01:20 +02:00
RMcGirr83
a53b57c8a2 [ticket/13759] Take post_time into account
PHPBB3-13759
2015-04-21 06:11:13 -04:00
brunoais
8769f185f5 [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
PHPBB3-13772
2015-04-21 10:00:30 +01:00
Matt Friedman
4a7f905c6a [ticket/13771] Allow AJAX errors to support exceptions messages
PHPBB3-13771
2015-04-21 00:19:41 -07:00
Tristan Darricau
de5a5c41f8 [ticket/13768] Fix deprecations
PHPBB3-13768
2015-04-19 17:41:29 +02:00
Tristan Darricau
9939ced81f [ticket/13768] Update to symfony 2.8.*@dev
PHPBB3-13768
2015-04-19 17:33:06 +02:00
JoshyPHP
14333f6ebc [ticket/13767] Remove vendor/s9e/text-formatter/.git during build
PHPBB3-13767
2015-04-19 13:54:21 +02:00
Tristan Darricau
ecc65f564d Merge pull request #3539 from MateBartus/ticket/13766
[ticket/13766] Add style_parent_id in textformater's data_access::get_st...
2015-04-17 00:07:04 +02:00
MateBartus
f23fe9e69d [ticket/13766] Add style_parent_id in textformater's data_access::get_styles()
PHPBB3-13766
2015-04-16 23:28:52 +02:00
Tristan Darricau
c89384eb86 Merge pull request #3446 from MateBartus/ticket/13654
[ticket/13654] Moving reporting into controller
2015-04-16 21:30:52 +02:00
Tristan Darricau
f077b72d0d Merge pull request #3487 from MateBartus/ticket/13697
[ticket/13697] Moving filesystem related functions to filesystem service
2015-04-16 20:44:02 +02:00
Andreas Fischer
c46024bfa2 Merge pull request #3537 from RMcGirr83/ticket/13763
[ticket/13763] Fix typo in extension lang file

* RMcGirr83/ticket/13763:
  [ticket/13763] Fix typo in extension lang file
2015-04-16 13:38:48 +02:00
Andreas Fischer
db9ef52fdd Merge branch '3.1.x'
* 3.1.x:
  [ticket/13763] Fix typo in extension lang file
2015-04-16 13:38:48 +02:00
MateBartus
4bdef6fd21 [ticket/13697] Moving filesystem related functions to filesystem service
* Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service

PHPBB3-13697
2015-04-16 13:24:10 +02:00
MateBartus
a089ff5eb0 [ticket/13654] Moving reporting into controller
Moving report.php's content into different services and controllers to
better comply with the MVC model.

Also implementing:
 * Replacement for reasons_display()
 * Adding assign_meta_refresh_var() to \controller\helper
 * Adding separate routes for easy configuration
 * Updating unit tests to expect to correct results
 * Add BC tests

PHPBB3-13654
2015-04-16 11:29:11 +02:00
Richard McGirr
60f31d48e2 [ticket/13763] Fix typo in extension lang file
PHPBB3-13763
2015-04-15 07:35:42 -04:00
rxu
615e5c1076 [ticket/13745] Add viewtopic.php core events to allow manipulating poll data
PHPBB3-13745
2015-04-15 14:12:49 +07:00
Dhruv
2c0b1252c8 Merge branch '3.1.x' 2015-04-14 09:10:47 +05:30
Dhruv Goel
ba1e3fd661 Merge pull request #3533 from Elsensee/ticket/13756
[ticket/13756] Fix resize after upload with plupload
2015-04-14 09:09:14 +05:30
Oliver Schramm
366dfce846 [ticket/13756] Add test for generate_resize_string()
PHPBB3-13756
2015-04-12 14:20:07 +02:00
Oliver Schramm
70c74df009 [ticket/13756] Fix resize after upload with plupload
PHPBB3-13756
2015-04-11 23:08:45 +02:00
Joas Schilling
ee658bfe7b [ticket/security-180] Always fail when redirecting to an insecure URL
SECURITY-180
2015-04-11 17:08:28 +02:00
Marc Alexander
bca1b96b2e [ticket/security-180] Make sure that redirect goes to full URL plus slash
SECURITY-180
2015-04-11 16:41:20 +02:00
Cesar G
47514ca2df [ticket/13755] Ignore dots in path when determining file extension.
PHPBB3-13755
2015-04-10 16:23:51 -07:00
Marc Alexander
eed355b798 [ticket/security-180] Check if redirect URL contains board URL
SECURITY-180
2015-04-10 18:10:32 +02:00
Joas Schilling
bf107ba1af Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-04-10 10:06:07 +02:00
Joas Schilling
a151ad912a [3.1.x] Update development version to 3.1.5-dev 2015-04-10 09:56:20 +02:00
Joas Schilling
fcc7e7d333 Merge branch 'prep-release-3.1.4' into 3.1.x 2015-04-10 09:53:58 +02:00
Joas Schilling
073f3e4470 [prep-release-3.1.4] Add changelog for 3.1.4-RC1 2015-04-09 21:11:08 +02:00
Matt Friedman
ef0838e931 [ticket/13753] Fix event documentation
PHPBB3-13753
2015-04-09 12:00:33 -07:00
Joas Schilling
bc04581b80 [prep-release-3.1.4] Add migration for 3.1.4-RC1 2015-04-09 20:28:28 +02:00
Joas Schilling
313a224c68 Update version to 3.1.4-RC1 2015-04-09 20:26:12 +02:00
Matt Friedman
96339b7c86 [ticket/13753] Add template events to forum category row headers
PHPBB3-13753
2015-04-09 11:04:25 -07:00
rxu
b0f5ef0b1a [ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
PHPBB3-13752
2015-04-09 23:20:07 +07:00
Richard McGirr
77c2b2a51d [ticket/13598] Allow topic lock on topic creation
PHPBB3-13598
2015-04-09 08:44:40 -04:00
Oliver Schramm
afc3730cca Merge branch '3.1.x' 2015-04-06 23:54:40 +02:00
Oliver Schramm
17620bba46 Merge pull request #3525 from marc1706/ticket/13749
[ticket/13749] Add missing slash to base uri in helper route tests
2015-04-06 23:54:27 +02:00
Marc Alexander
9d181daa71 [ticket/13749] Add missing slash to base uri in helper route tests
PHPBB3-13749
2015-04-06 22:59:34 +02:00
Joas Schilling
201f5cb3fb Merge branch '3.1.x' 2015-04-06 16:54:54 +02:00
Joas Schilling
53ed8a3cd9 Merge pull request #3392 from marc1706/ticket/13493
[ticket/13493] Append page name to base url if it doesn't contain it
2015-04-06 16:54:35 +02:00
Joas Schilling
a11994d424 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2015-04-06 14:45:20 +02:00
Joas Schilling
02202b1503 Merge pull request #3492 from RMcGirr83/ticket/13710
[ticket/13710] Allow template events near smilies display
2015-04-06 14:44:37 +02:00
Joas Schilling
4ce0d88ffd Merge branch '3.1.x' 2015-04-06 14:43:11 +02:00
Joas Schilling
b16a56394b Merge pull request #3488 from Crizz0/ticket/13701
[ticket/13701] Adds two new events to posting_pm_layout.html

Conflicts:
	phpBB/docs/events.md
2015-04-06 14:42:59 +02:00
Joas Schilling
370fce1651 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
2015-04-06 14:27:48 +02:00
Joas Schilling
7d08bf5b3e Merge pull request #3517 from Wolfsblvt/ticket/13739
[ticket/13739] Add template core event posting_poll_body_options_after
2015-04-06 14:26:35 +02:00
Joas Schilling
478fed7ee1 Merge branch '3.1.x' 2015-04-06 14:22:18 +02:00
Joas Schilling
84df225038 Merge pull request #3523 from Nicofuma/ticket/13747
[ticket/13747] Add assertions to test_validate_path_linux
2015-04-06 14:21:47 +02:00
MateBartus
cc29638bcc [ticket/13636] Fix coding style
PHPBB3-13636
2015-04-06 13:15:39 +02:00
Tristan Darricau
8575cc69d1 [ticket/13747] Add assertions to test_validate_path_linux
PHPBB3-13747
2015-04-06 13:09:07 +02:00
Oliver Schramm
126886ef27 Merge pull request #3522 from nickvergessen/ticket/13522
[ticket/13522] Fix globals for 3.2 in Q&A tests
2015-04-06 13:07:25 +02:00
Joas Schilling
477f7823e5 [ticket/13522] Fix globals for 3.2 in Q&A tests
PHPBB3-13522
2015-04-06 12:08:55 +02:00
Tristan Darricau
8523031141 Merge branch '3.1.x' 2015-04-06 11:49:18 +02:00
Tristan Darricau
73a0988f59 Merge pull request #3458 from nickvergessen/ticket/8494
[ticket/8494] Ignore errors from the database schema preparation
2015-04-06 11:47:46 +02:00
Joas Schilling
2962d5d7fd Merge branch '3.1.x' 2015-04-06 11:36:04 +02:00
Joas Schilling
90025ae3e7 Merge pull request #3437 from marc1706/ticket/12368
[ticket/12368] Correctly check if avatars migration is installed
2015-04-06 11:36:00 +02:00
Joas Schilling
34b768cfaf Merge branch '3.1.x' 2015-04-06 11:31:58 +02:00
Joas Schilling
23db98276f Merge pull request #3409 from Senky/ticket/11424
[ticket/11424] Quick-Mod Tools race condition results in NO_MODE
2015-04-06 11:31:53 +02:00
Joas Schilling
96e212ef0c Merge branch '3.1.x' 2015-04-06 11:14:02 +02:00
Joas Schilling
c60497f009 Merge pull request #3402 from brunoais/ticket/13621
[ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return
2015-04-06 11:13:33 +02:00
Joas Schilling
3af61075a8 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/captcha/plugins/qa.php
2015-04-06 11:09:20 +02:00
Joas Schilling
009a8cb2d5 Merge pull request #3333 from marc1706/ticket/13522
[ticket/13522] Remove empty answers from possible answers in Q&A
2015-04-06 11:04:35 +02:00
Joas Schilling
197369e3f9 Merge branch '3.1.x' 2015-04-06 10:59:46 +02:00
Joas Schilling
9ab27fe129 Merge pull request #3284 from Elsensee/ticket/13469
[ticket/13469] Fall back to soft_delete if no permissions for delete
2015-04-06 10:59:33 +02:00
Tristan Darricau
3a6a61a8dd Merge pull request #3461 from s9e/ticket/11768
[3.2][ticket/11768] Integrate s9e\TextFormatter
2015-04-05 23:32:38 +02:00
Tristan Darricau
5ac13c7ddc Merge branch '3.1.x' 2015-04-05 23:22:41 +02:00
Tristan Darricau
d49f70fbc7 Merge pull request #3520 from rxu/ticket/13743
[ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php
2015-04-05 23:14:05 +02:00
Tristan Darricau
30cf75a011 Merge pull request #3430 from MateBartus/ticket/12466
[ticket/12466] Move classes from acp_database.php to their own files
2015-04-05 20:13:38 +02:00
rxu
3521e74939 [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php
message_parser.php performs include of bbcode.php at the very start using
$phpbb_root_path and $phpEx vars, so there's a possibility those can be
undefined at that point, especially when message_parser.php is being included
in event listener or another extension file where $phpbb_root_path and $phpEx
don't exist. This can be fixed by adding the appropriate vars definitions.

PHPBB3-13743
2015-04-05 18:48:43 +07:00
Marc Alexander
c900dcdc2a Merge branch '3.1.x' 2015-04-04 11:04:31 +02:00
Marc Alexander
558d604d83 Merge pull request #3518 from marc1706/ticket/13703
[ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
2015-04-04 11:04:29 +02:00
Marc Alexander
2ebab2ed5f Merge branch '3.1.x' 2015-04-04 11:02:06 +02:00
Marc Alexander
55907c1724 Merge pull request #3519 from marc1706/ticket/13742
[ticket/13742] Use correct avatar path for local avatar
2015-04-04 11:02:03 +02:00
Kevin Roy
ddff81c21f [ticket/13742] Use correct avatar path for local avatar
Prior to this change, the path might have been incorrect when using
PHPBB_USE_BOARD_URL_PATH.

PHPBB3-13742
2015-04-03 23:08:26 +02:00
Kevin Roy
a875802c06 [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
This change makes the uploaded avatars use the PHPBB_USE_BOARD_URL_PATH
constant, which is needed when trying to use the get_user_avatar()
function in a listener for index changes.

PHPBB3-13703
2015-04-03 23:04:52 +02:00
Wolfsblvt
1d34968967 [ticket/13739] Add template core event posting_poll_body_options_after
Fixing order of if statement and event

PHPBB3-13739
2015-04-03 19:20:16 +02:00
Wolfsblvt
284a5671c5 [ticket/13739] Add template core event posting_poll_body_options_after
Fixing if else construct in prosilver so that the event is placed correctly

PHPBB3-13739
2015-04-03 18:56:53 +02:00
Joas Schilling
7541fab408 Merge branch '3.1.x' 2015-04-03 18:56:23 +02:00
Joas Schilling
71177c38dc Merge pull request #3515 from cyberalien/ticket/13741
Ticket/13741 Remove outdated comments and references in css files
2015-04-03 18:56:15 +02:00
Joas Schilling
6889248cdf Merge branch '3.1.x' 2015-04-03 18:42:25 +02:00
Joas Schilling
81c92a7de9 Merge branch '3.0.x' into 3.1.x 2015-04-03 18:42:06 +02:00
Joas Schilling
35d2467c94 Merge pull request #3512 from bantu/ticket/13738
[ticket/13738] Use new branch names in sami-all.conf.php.
2015-04-03 18:41:41 +02:00
Wolfsblvt
d5021aeda4 [ticket/13739] Add template core event posting_poll_body_options_after
Template event added for the poll options while posting a topic
so that you may add additional options for polls.

PHPBB3-13739
2015-04-03 17:02:43 +02:00
Marc Alexander
ca1ac36c20 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
2015-04-03 16:50:20 +02:00
Marc Alexander
55f6329c1d Merge pull request #3467 from dragosvr92/patch-5
[ticket/13602] Adding a new event overall_header_navbar_before
2015-04-03 16:48:26 +02:00
cyberalien
e120e6ac97 [ticket/13741] Remove outdated references to tweaks.css
PHPBB3-13741
2015-04-03 11:14:20 +03:00
cyberalien
9f54d2b590 [ticket/13741] Remove reference to unused body font-size declaration
Remove reference to font-size declaration that is no longer used in prosilver

PHPBB3-13741
2015-04-03 11:04:47 +03:00
cyberalien
6c308d81bd [ticket/13741] Remove reference to oudated rollover code that no longer exists
Rollover code referenced in that comment has been removed in 3.1

PHPBB3-13741
2015-04-03 11:03:47 +03:00
Marc Alexander
f86c5d905b Merge branch '3.1.x' 2015-04-02 21:22:15 +02:00
Marc Alexander
418aabb46e Merge pull request #3508 from cyberalien/ticket/13726
[ticket/13726] Fix function that calculates responsive breadcrumbs width
2015-04-02 21:22:12 +02:00
Marc Alexander
8546ed0fbc Merge branch '3.1.x' 2015-04-02 20:03:02 +02:00
Marc Alexander
335520fc45 Merge pull request #3509 from cyberalien/ticket/13727
[ticket/13727] Fix JS that resizes breadcrumbs
2015-04-02 20:01:47 +02:00
JoshyPHP
4e80565fe7 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
b24e0f4f69 [ticket/11768] Stylistic change. No functional change intended
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
1d90daf969 [ticket/11768] Added some default template parameters
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
09c19718c0 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
76088d64a6 [ticket/11768] Moved the routine that replaces tabs with spaces
...to its own method. Also added a quick stripos() check for performance.

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
d8e7e11ee3 [ticket/11768] Renamed service vars
The name of the variable that holds the service instance is now consistent
across events.

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
3e04e643df [ticket/11768] Restored get_parser() / get_renderer()
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
0f30301a0c [ticket/11768] Moved parser/renderer setup events
Moved down the setup events to make them happen after the service is
configured and ready to be used

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
c1bc05a860 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
55c3fc02cf [ticket/11768] Updated utils service
Updated docblocks.
Removed remove_formatting() because it overlaps with clean_formatting()

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
f75f63b264 [ticket/11768] Added parser events
Added core.text_formatter_s9e_parse_before and
core.text_formatter_s9e_parse_after

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
a04fca86ee [ticket/11768] Added renderer events
Added core.text_formatter_s9e_render_before and
core.text_formatter_s9e_render_after

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
af4f9b860f [ticket/11768] Added core.text_formatter_s9e_renderer_setup event
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
c891881321 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
7f9639fd24 [ticket/11768] Fixed service config
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
a7a53d5a30 [ticket/11768] Added core.text_formatter_s9e_parser_setup event
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
2a462bb7e4 [ticket/11768] Removed get_parser() / get_renderer() accessors
There's no need to access the s9e\TextFormatter objects outside of events.

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
37fedc656f [ticket/11768] Updated the text_formatter.s9e.utils service
Made it use s9e\TextFormatter\Utils. Refactored some tests to make
them more readable.

PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
5b2d3fddfd [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:04 +02:00
JoshyPHP
c165eaa37c [ticket/11768] Removed superfluous whitespace [ci skip]
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
69dae16ba7 [ticket/11768] Preserve comments in custom BBCodes
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
3cd5ca8de1 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
49b9e8e4ea [ticket/11768] Added configurator events
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
f4f5bdbaee [ticket/11768] Removed whitespace
No functional change intended

PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
8971805e57 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
718ace2121 [ticket/11768] Updated annotation [ci skip]
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
4398da234e [ticket/11768] Updated merge_templates(). No functional change intended
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
37106bae7a [ticket/11768] Reverted change to bbcode_uid
On the off-chance some other routine expect bbcode_uid to never be empty.

PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
b46bf9f02f [ticket/11768] Updated merge_templates(). No functional change intended
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
709d502332 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
b021225148 [ticket/11768] Removed unused var
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
40c54898cc [ticket/11768] Updated various annotations
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
1b4bdff3b3 [ticket/11768] Fixed test double
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
89d87a99db [ticket/11768] Replaced array access with call to $user->lang()
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
20a1646fc6 [ticket/11768] Renamed utils
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
44fc3d64da [ticket/11768] Made capturing code blocks a bit more flexible
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
a611366bd3 [ticket/11768] Whitespace [ci skip]
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
8411db6257 [ticket/11768] Renamed interfaces
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
ec77ff7838 [ticket/11768] Invalidate the text_formatter cache whenever a style is installed
The acp_styles module purges the cache every time a style is uninstalled,
modified or made default, but it does not purge the cache when a new style
is installed. Here we invalidate the text_formatter cache (not purge the
whole cache) so that new styles take effect immediately.

PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
1a133d5487 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
aed9ece1bc [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
78b544920c [ticket/11768] Added support for creating unsafe BBCodes
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
dc9a28d346 [ticket/11768] Replaced extract() calls
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
40340004aa [ticket/11768] Replaced some references
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
5fe8c6b6f5 [ticket/11768] Removed unused var
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
d37f2d10f0 [ticket/11768] Removed the cached renderer
We don't need to cache an instance of the renderer, we can just instantiate
it every time we need one.

PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
6cb3fb6140 [ticket/11768] Replaced FQNs in annotations
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
462696aa47 [ticket/11768] Replaced headers in test files
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
ed29972e76 [ticket/11768] Removed require_once calls that target mock classes
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
0dd5e62382 [ticket/11768] Replaced headers in test files
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
70b7e57497 [ticket/11768] Renamed property
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
458cf95b1e [ticket/11768] Replaced class names in annotations with their FQN
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
825bc45983 [ticket/11768] Removed comments
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
3d9596be79 [ticket/11768] Updated renderer annotation
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
694e515f7c [ticket/11768] Replaced \phpbb\textformatter\parser with an interface
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
b12043d4b0 [ticket/11768] Renamed get_words() to get_censored_words()
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
baadc2a6e5 [ticket/11768] Removed unused annotations
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
5fe74cd394 [ticket/11768] Updated censor to apply to XML values
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
73ce09b73a [ticket/11768] Fixed censored words being escaped twice
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
c1ba3a678d [ticket/11768] Added methods to access the library's parser/renderer
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
414dcae422 [ticket/11768] Updated the cache dir to point to the current environment
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
3e5ee87b15 [ticket/11768] Allowed text in places where text is not valid HTML
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
93c53ed52d [ticket/11768] Fixed test
PHPBB3-11768
2015-04-02 19:16:02 +02:00
JoshyPHP
f721b85a78 [ticket/11768] Replaced the Censor plugin
...with something that is run at rendering time.

PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
6578e1c6ec [ticket/11768] Added limited support for [url] in [quote] author
PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
42c1297345 [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
6bd86a8e8a [ticket/11768] Updated phpbb\textformatter\s9e\factory::regenerate()
Returns an associative array rather than a numerically-indexed array. Feels
cleaner and more extensible.

PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
f6e3e41717 [ticket/11768] Added support for magic links that start with "www."
PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
63753bbf1a [ticket/11768] Uncommented disabled test
PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
6540918ffa [ticket/11768] Added test files
PHPBB3-11768
2015-04-02 19:16:01 +02:00
JoshyPHP
cfbf02bcba [ticket/11768] Re-added the code that got lost in rebase
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
3b115a903a [ticket/11768] Removed unused use statements
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
90d1a431bd [ticket/11768] Updated tests to use the new constructor signature
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
c4a58bce89 [ticket/11768] Updated test case helper with new signature
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
72fb380c9f [ticket/11768] Updated constructors with explicit dependencies
The trade-off is that an instance of phpbb\textformatter\s9e\factory and
phpbb\textformatter\data_access is created on any page that uses the
parser or the renderer, even when neither need to be regenerated. It has
no measureable impact on performance and costs ~20KB of RAM.

PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
e0bb446c57 [ticket/11768] Reorganized code for readability
No functional change intended

PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
dc303cbc99 [ticket/11768] Toggled Unicode modifier in relative URL filter
get_preg_expression('relative_url') returns an expression that requires it

PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
cf39b02891 [ticket/11768] Updated annotations to pass sniff
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
ca9f534409 [ticket/11768] Restored blank line from develop
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
d779ae340a [ticket/11768] Updated s9e\TextFormatter
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
261f7eec9c [ticket/11768] Updated composer.lock
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
147a713cc0 [ticket/11768] This commit integrates s9e\TextFormatter
This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467

PHPBB3-11768
2015-04-02 19:16:01 +02:00
Oliver Schramm
bbd0a8985c [ticket/13469] Extract test to new method
PHPBB3-13469
2015-04-02 16:36:09 +02:00
Andreas Fischer
5fc92a03b2 Merge pull request #3513 from bantu/ticket/13736
[ticket/13736] Missing four colon in Contact us page

* bantu/ticket/13736:
  [ticket/13736] Missing four colon in Contact us page
2015-04-02 13:31:31 +02:00
Andreas Fischer
eb7e6d7c23 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13736] Missing four colon in Contact us page
2015-04-02 13:31:31 +02:00
Raphaël M
40c79f2a26 [ticket/13736] Missing four colon in Contact us page
Replacing of four ```:``` with four {L_COLON} in Contact us page.

PHPBB3-13736
2015-04-02 12:48:31 +02:00
Andreas Fischer
18d3dd54a1 Merge pull request #3507 from VSEphpbb/ticket/13725
[ticket/13725] Coding guidelines: static public

* VSEphpbb/ticket/13725:
  [ticket/13725] Coding guidelines: static public
2015-04-02 12:37:34 +02:00
Andreas Fischer
d6d9ff51b2 [ticket/13738] Use new branch names in sami-all.conf.php.
PHPBB3-13738
2015-04-02 12:30:39 +02:00
Marc Alexander
fbfcbd5aa7 Merge branch '3.1.x' 2015-04-01 15:51:30 +02:00
Marc Alexander
42d831f472 Merge pull request #3510 from Nicofuma/ticket/13732
[ticket/13732] Update composer to be php7 compliant
2015-04-01 15:51:26 +02:00
Tristan Darricau
be472cc7bb [ticket/13732] Update composer to be php7 compliant
Updated to Composer version 1.0-dev
(f10c71475167a4661225b14560ca0a400d730829) 2015-03-29 14:37:42

PHPBB3-13732
2015-03-30 21:48:28 +02:00
Nicofuma
a3f7e0f441 Merge branch '3.1.x' 2015-03-29 19:50:58 +02:00
Nicofuma
1a484f08bb Merge branch '3.0.x' into 3.1.x 2015-03-29 19:50:38 +02:00
Nicofuma
d9f4964d91 Merge pull request #3376 from marc1706/ticket/13568-asc
[ticket/13568] Validate imagick path as readable absolute path

closes #3376
2015-03-29 19:50:19 +02:00
Nicofuma
b9db47e3f5 Merge pull request #3359 from marc1706/ticket/13568
[ticket/13568] Validate imagick path as readable absolute path

closes #3359
2015-03-29 19:41:13 +02:00
cyberalien
0b52eb2298 [ticket/13727] Fix JS that resizes breadcrumbs
PHPBB3-13727
2015-03-28 19:59:38 +02:00
cyberalien
90b82d1a5f [ticket/13726] Fix function that calculates responsive breadcrumbs width
Do not calculate width of hidden elements.
Set minimum width to make sure breadcrumbs are always shown.

PHPBB3-13726
2015-03-28 11:36:15 +02:00
Matt Friedman
dbb538afbd [ticket/13725] Coding guidelines: static public
PHPBB3-13725
2015-03-27 00:02:20 -07:00
Andreas Fischer
67d81a1ce6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13555] Render poll options separately when previewing.
2015-03-26 11:15:37 +01:00
Andreas Fischer
499088b62f Merge branch '3.0.x' into 3.1.x
* 3.0.x:
  [ticket/13555] Render poll options separately when previewing.
2015-03-26 11:15:37 +01:00
Andreas Fischer
1efbb5b3bb Merge pull request #3493 from prototech/ticket/13555
[ticket/13555] Render poll options separately when previewing.

* prototech/ticket/13555:
  [ticket/13555] Render poll options separately when previewing.
2015-03-26 11:15:36 +01:00
Marc Alexander
9eab4ba740 [ticket/12368] Fix comment in docblock
PHPBB3-12368
2015-03-26 11:01:22 +01:00
Oliver Schramm
784ccdf0b0 Merge branch '3.1.x' 2015-03-25 22:03:15 +01:00
Oliver Schramm
9d75f3fca8 Merge branch '3.0.x' into 3.1.x 2015-03-25 21:49:11 +01:00
Oliver Schramm
407b9d3c6b Merge pull request #3506 from Nicofuma/ticket/13723-31x
[ticket/13723-Ascraeus] Add Elsensee to authors list
2015-03-25 21:48:05 +01:00
Oliver Schramm
84d77d6cd5 Merge pull request #3505 from Nicofuma/ticket/13723
[ticket/13723] Add Elsensee to authors list
2015-03-25 21:44:09 +01:00
Nicofuma
7f2b932a1b [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x
Conflicts:
	phpBB/docs/AUTHORS

PHPBB3-13723
2015-03-25 21:40:12 +01:00
Nicofuma
44540b6112 [ticket/13723] Add Elsensee to authors list
PHPBB3-13723
2015-03-25 21:31:50 +01:00
Nicofuma
9e66a10bac Merge branch '3.1.x' 2015-03-24 23:57:26 +01:00
Nicofuma
50b3c2b49e Merge pull request #3398 from marc1706/ticket/13612
[ticket/13612] Run meta refresh until extension is fully enabled
2015-03-24 23:32:29 +01:00
Nicofuma
9a5aefd4c2 Merge branch '3.1.x' 2015-03-24 23:20:03 +01:00
Nicofuma
4a08d74571 Merge pull request #3501 from prototech/ticket/13698
[ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
2015-03-24 23:19:46 +01:00
Nicofuma
673435a0fc Merge branch '3.1.x' 2015-03-24 22:37:01 +01:00
Nicofuma
285e35992a Merge pull request #3410 from Senky/ticket/13467
[ticket/13467] Add a CONTRIBUTING file to the project on Github
2015-03-24 22:35:34 +01:00
Marc Alexander
2e7a60d986 [ticket/13564] Try to unlink user account for every auth provider
PHPBB3-13564
2015-03-24 17:09:52 +01:00
Marc Alexander
4d7cb7ca73 [ticket/13564] Use user_id from link_data for unlinking account in oauth
PHPBB3-13564
2015-03-24 17:08:55 +01:00
Marc Alexander
ca883f1196 [ticket/13564] Allow to specify user id for retrieving auth link data
PHPBB3-13564
2015-03-24 17:08:55 +01:00
Marc Alexander
b67b0056e8 Merge branch '3.1.x' 2015-03-24 11:00:29 +01:00
Marc Alexander
3d0153de60 Merge pull request #3499 from Elsensee/ticket/13721
[ticket/13271] Fix URL Rewriting on IIS7
2015-03-24 11:00:26 +01:00
Cesar G
0bc2f9f242 [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid
while hitting the LOGIN_ERROR_ATTEMPTS error.

PHPBB3-13698
2015-03-23 17:52:17 -07:00
Oliver Schramm
476b762542 [ticket/13271] Fix URL Rewriting on IIS7
PHPBB3-13271
2015-03-23 18:23:12 +01:00
Cesar G
8a6e3f208a Merge branch '3.1.x'
* 3.1.x:
  [ticket/13719] Remove superfluous $search_options in acp_search.
2015-03-23 09:43:43 -07:00
Cesar G
a32f4869de Merge remote-tracking branch 'brunoais/ticket/13719' into 3.1.x
* brunoais/ticket/13719:
  [ticket/13719] Remove superfluous $search_options in acp_search.
2015-03-23 09:43:27 -07:00
Cesar G
8423ae1201 Merge remote-tracking branch 's9e/ticket/13718'
* s9e/ticket/13718:
  [ticket/13718] Added missing global declaration
2015-03-23 08:49:43 -07:00
brunoais
754b5d6349 [ticket/13719] Remove superfluous $search_options in acp_search.
PHPBB3-13719
2015-03-23 12:58:05 +00:00
JoshyPHP
fd230cd9c5 [ticket/13718] Added missing global declaration
PHPBB3-13718
2015-03-23 01:51:04 +01:00
Oliver Schramm
eca0128d0a [ticket/13469] Add tests
PHPBB3-13469
2015-03-22 21:30:05 +01:00
JoshyPHP
1df97c205d [ticket/13555] Render poll options separately when previewing.
This prevents an option from being split into two when a line break is present
inside of it.

PHPBB3-13555
2015-03-19 15:32:31 -07:00
RMcGirr83
d4ca81f23f [ticket/13710] Allow template events near smilies display
PHPBB3-13710
2015-03-19 07:25:45 -04:00
Cesar G
9a9a665a0a Merge branch '3.1.x'
* 3.1.x:
  [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
2015-03-18 19:39:13 -07:00
Cesar G
4276f49efa Merge remote-tracking branch 'Senky/ticket/9457' into 3.1.x
* Senky/ticket/9457:
  [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
2015-03-18 19:37:29 -07:00
brunoais
fe132f19e8 [feature/sql-bool-builder] Improved tests output to show the SQL error.
PHPBB3-13652
2015-03-17 20:33:10 +00:00
brunoais
576eaa0cff [feature/sql-bool-builder] Adding the IS operator to predicted operators
PHPBB3-13652
2015-03-17 20:31:26 +00:00
brunoais
bc6ea5796d [feature/sql-bool-builder] test_single_not_like
PHPBB3-13652
2015-03-16 23:16:49 +00:00
brunoais
c342531872 [feature/sql-bool-builder] test_single_like
PHPBB3-13652
2015-03-16 23:16:48 +00:00
brunoais
d60d596f25 [feature/sql-bool-builder] test_single_not_in
PHPBB3-13652
2015-03-16 23:16:47 +00:00
brunoais
1754f1832d [feature/sql-bool-builder] test_single_in
PHPBB3-13652
2015-03-16 23:16:47 +00:00
brunoais
5f63d685f6 [feature/sql-bool-builder] test_and_of_or_of_and
PHPBB3-13652
2015-03-16 23:16:46 +00:00
brunoais
e6eab35a64 [feature/sql-bool-builder] test_triple_and_with_in
PHPBB3-13652
2015-03-16 23:16:43 +00:00
brunoais
5d3b22c21e [feature/sql-bool-builder] test_double_and_with_not_of_and
PHPBB3-13652
2015-03-16 23:16:01 +00:00
brunoais
d10a0ca1ca [feature/sql-bool-builder] test_triple_and_with_is_null
PHPBB3-13652
2015-03-16 23:15:58 +00:00
Marc Alexander
038b27abba Merge branch '3.1.x' 2015-03-16 14:43:22 +01:00
Marc Alexander
ee70b364c7 Merge pull request #3490 from prototech/ticket/13550
[ticket/13550] Improve checks for Plupload temp directory writability
2015-03-16 14:43:19 +01:00
brunoais
5bc03c9610 [feature/sql-bool-builder] Prepare testing class
PHPBB3-13652
2015-03-16 11:14:34 +00:00
brunoais
298d86009e [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations
PHPBB3-13652
2015-03-16 11:14:33 +00:00
brunoais
5d70f612be [feature/sql-bool-builder] Explain better the code in the first
Explain what that if and check is for in the first method that is called.

PHPBB3-13652
2015-03-16 11:14:32 +00:00
brunoais
51737be616 [feature/sql-bool-builder] Also use parenthesis for the NOT operator
Be on the safe side, also use parenthesis for the NOT operator

PHPBB3-13652
2015-03-16 11:14:32 +00:00
brunoais
5c1850e10e [feature/sql-bool-builder] AS keyword must be lowercase;
AS keyword must be lowercase; expected "as" but found "AS"

PHPBB3-13652
2015-03-16 11:14:31 +00:00
brunoais
46de946904 [feature/sql-bool-builder] Added code to use this feature for the WHERE clause
PHPBB3-13652
2015-03-16 11:14:25 +00:00
brunoais
b54adaaabe [feature/sql-bool-builder] Removed non-necessary spaces
PHPBB3-13652
2015-03-16 11:13:50 +00:00
brunoais
5c77e43819 [feature/sql-bool-builder] First working version
PHPBB3-13652
2015-03-16 11:13:49 +00:00
Cesar G
7f7d8d9101 [ticket/13550] Check that the Plupload temp directory is writable before moving
This prevents a PHP warning from being issued that results in an invalid JSON
response being returned to the user.

PHPBB3-13550
2015-03-15 16:06:35 -07:00
Dhruv
cf8e431334 Merge branch '3.1.x' 2015-03-15 16:59:58 +08:00
Dhruv
faf267c419 Merge branch 'ticket/13702' into 3.1.x 2015-03-15 16:59:21 +08:00
Dhruv
24f26478c4 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/search/fulltext_native.php
2015-03-14 23:44:58 +08:00
Dhruv Goel
f0619b481f Merge pull request #3476 from brunoais/ticket/13674
[ticket/13674] Change MySQL native total search results calculation
2015-03-14 23:28:31 +08:00
cyberalien
7e8274c345 [ticket/13702] Add initial-scale to viewport in page header
PHPBB3-13702
2015-03-14 10:00:28 +02:00
Crizzo
0a52d732e4 [ticket/13701] Adds two new events to posting_pm_layout.html
These events wrap the includes of posting_pm_header.html to add some
content before and after it.

PHPBB3-13701
2015-03-13 23:37:07 +01:00
brunoais
cfdaf2d63f [ticket/13694] Allow modifying the Postgres native author search query
PHPBB3-13694
2015-03-12 22:14:20 +00:00
brunoais
29ccbd8098 [ticket/13693] Allow modifying the MySQL author search query
PHPBB3-13693
2015-03-12 12:23:53 +00:00
brunoais
1a001fc233 [ticket/13691] Allow changing query to search for posts by author in native
PHPBB3-13691
2015-03-12 12:23:29 +00:00
brunoais
d5dd9c929d [ticket/13689] Allow modifying the query for postgres native fulltext search
PHPBB3-13689
2015-03-12 12:22:45 +00:00
brunoais
3bda9a3c11 [ticket/13686] Allow modify query used for counting in fulltext_native
PHPBB3-13686
2015-03-12 12:22:07 +00:00
brunoais
7112058d7b [ticket/13685] Fix tests for fulltext search
PHPBB3-13685
2015-03-12 12:21:29 +00:00
brunoais
c3a0e09ddb [ticket/13685] Add phpbb_dispatcher to fulltext search constructors
PHPBB3-13685
2015-03-12 12:21:15 +00:00
Marc Alexander
a2454285bd Merge branch '3.1.x' 2015-03-11 13:49:44 +01:00
Marc Alexander
e132e9ba76 Merge pull request #3428 from prototech/ticket/13463
[ticket/13463] Correctly position notification mark read icon in RTL.
2015-03-11 13:49:42 +01:00
brunoais
94da39cd88 [ticket/13660] Fix @since version.
PHPBB3-13660
2015-03-10 15:42:07 +00:00
Marc Alexander
72d9cf3a95 Merge branch '3.1.x' 2015-03-10 15:23:29 +01:00
Marc Alexander
5b9fe33b1b Merge pull request #3477 from n-aleha/ticket/13679
[ticket/13679] Add template event overall_header_searchbox_before
2015-03-10 15:23:27 +01:00
Marc Alexander
6f3ca35ae7 Merge branch '3.1.x' 2015-03-10 15:20:28 +01:00
Marc Alexander
3cb1907e76 Merge pull request #3445 from RMcGirr83/ticket/13650
[ticket/13650] Move core event
2015-03-10 15:20:26 +01:00
n-aleha
aeafb90208 [ticket/13679] Add template event overall_header_searchbox_before
PHPBB3-13679
2015-03-08 21:54:01 +02:00
Marc Alexander
3a4e1ce215 Merge branch '3.1.x' 2015-03-07 21:23:59 +01:00
Marc Alexander
2348580255 Merge pull request #3452 from RobertHeim/ticket/13658
[ticket/13658] add event before and after topics are deleted
2015-03-07 21:23:57 +01:00
brunoais
9b030fd174 [ticket/13674] Missing space after "if"
PHPBB3-13674
2015-03-07 14:57:42 +00:00
brunoais
f4c423cea1 [ticket/13674] Change MySQL native total search results calculation
This changes how the native FULLTEXT search calculates the total
match number for MySQL.
This should improve performance as there is one less query being made
and it is being searched using the technique mentioned in the manual

PHPBB3-13674
2015-03-06 22:23:45 +00:00
Marc Alexander
85c860c581 Merge pull request #3471 from Nicofuma/ticket/13132
[ticket/13132] Twig: Add the loops content to the root context
2015-03-06 21:34:19 +01:00
Dragos-Valentin Radulescu
4ccba99047 [ticket/13602] Adding event overall_header_navbar_before
PHPBB3-13602
2015-03-06 19:41:02 +02:00
Marc Alexander
5e7560845b Merge branch '3.1.x' 2015-03-06 14:36:22 +01:00
Marc Alexander
d7f4715b96 Merge pull request #3473 from RMcGirr83/ticket/13675
[ticket/13675] Add validate to acp_profile event and add template events
2015-03-06 14:36:20 +01:00
Marc Alexander
bd22b8319b Merge branch '3.1.x' 2015-03-06 14:30:14 +01:00
Marc Alexander
3d7def4196 Merge pull request #3450 from brunoais/ticket/13142
[ticket/13142] Before query to get the total number of reports
2015-03-06 14:30:11 +01:00
Marc Alexander
2eb7c21ae0 Merge branch '3.1.x' 2015-03-06 13:50:44 +01:00
Marc Alexander
d087d85618 Merge pull request #3426 from kinerity/ticket/13637
[ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event
2015-03-06 13:50:18 +01:00
Marc Alexander
f2a048e5ae Merge branch '3.1.x' 2015-03-06 13:45:12 +01:00
Marc Alexander
d5a79ad555 Merge pull request #3405 from brunoais/ticket/13625
[ticket/13625] Adding multiple variables to core.viewforum_get_topic_data
2015-03-06 13:42:26 +01:00
Richard McGirr
6b87e06292 [ticket/13675] Add validate to acp_profile event and add template events
for acp users profile

PHPBB3-13675
2015-03-06 07:26:35 -05:00
Cesar G
3ae0bb23b6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
2015-03-05 15:08:22 -08:00
Cesar G
f3ab7aae9e Merge remote-tracking branch 'marc1706/ticket/13666' into 3.1.x
* marc1706/ticket/13666:
  [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
2015-03-05 15:08:04 -08:00
brunoais
52b83bd5e9 [ticket/13625] Added forum_id to allow more flexibility and possibilities.
PHPBB3-13625
2015-03-05 22:52:03 +00:00
Marc Alexander
bbfbb3f1fa [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
PHPBB3-13666
2015-03-05 22:26:13 +01:00
Nicofuma
54753e926d [ticket/13132] Enable twig expressions tests
PHPBB3-13132
2015-03-05 21:53:48 +01:00
Tristan Darricau
cf39cfc593 [ticket/13132] Twig: Add loops content to the root context
PHPBB3-13132
2015-03-05 21:38:59 +01:00
brunoais
4cdcb6d5d3 [ticket/13672] Allow changing the data from the user-submitted report
PHPBB3-13672
2015-03-05 18:31:11 +00:00
Kailey Truscott
0f13635fb8 [ticket/13637] Update msg_id docblock
Change topic_id to post_id

PHPBB3-13637
2015-03-05 13:28:19 -05:00
Andreas Fischer
70990bc86f Merge branch '3.1.x'
* 3.1.x:
  [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
2015-03-05 19:06:28 +01:00
Andreas Fischer
323167bb94 Merge pull request #3466 from marc1706/ticket/13670
[ticket/13670] Modify variable-variable syntax in common avatar test for PHP/

* marc1706/ticket/13670:
  [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
2015-03-05 19:06:28 +01:00
Cesar G
c6b2039540 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
2015-03-05 08:42:08 -08:00
Cesar G
c0104d0243 Merge remote-tracking branch 'cyberalien/ticket/13667' into 3.1.x
* cyberalien/ticket/13667:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
2015-03-05 08:41:33 -08:00
brunoais
8a6d55520d [ticket/13668] Allow changing the query to obtain the user-submitted report.
PHPBB3-13668
2015-03-05 16:21:23 +00:00
brunoais
fa474c4378 [ticket/13668] Convert the mcp report_details query to a built query
PHPBB3-13668
2015-03-05 16:19:36 +00:00
Marc Alexander
a33c99b3fd Merge branch '3.1.x' 2015-03-05 16:02:48 +01:00
Marc Alexander
d0ab101c32 Merge pull request #3453 from RMcGirr83/ticket/13477
[ticket/13477] Update file cache driver for extension paths
2015-03-05 16:02:46 +01:00
Marc Alexander
f85d49aada Merge branch '3.1.x' 2015-03-05 15:47:04 +01:00
Marc Alexander
8f09ff210f Merge pull request #3413 from kasimi/ticket/13540
[ticket/13540] Add topic info and total posts count to mcp_topic_review_modify_row event
2015-03-05 15:46:33 +01:00
Andreas Fischer
3166d9126c Merge branch '3.1.x'
* 3.1.x:
  [ticket/13657] Run travis builds on PHP 7.0
2015-03-05 15:42:49 +01:00
Andreas Fischer
149a2dd91a Merge pull request #3465 from marc1706/ticket/13657
[ticket/13657] Run travis builds on PHP 7.0

* marc1706/ticket/13657:
  [ticket/13657] Run travis builds on PHP 7.0
2015-03-05 15:42:47 +01:00
Marc Alexander
7c26cd25c7 Merge pull request #3434 from nickvergessen/ticket/13647
[ticket/13647] Move FAQ page to a controller
2015-03-05 15:25:30 +01:00
Marc Alexander
33738fa3db [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
PHPBB3-13670
2015-03-05 15:10:37 +01:00
Marc Alexander
87ca5ef7e5 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
	phpBB/styles/subsilver2/theme/stylesheet.css
2015-03-05 14:23:50 +01:00
Marc Alexander
70f1741331 Merge pull request #3454 from RMcGirr83/ticket/13590
[ticket/13590] Headers of remember me login keys are not centered
2015-03-05 13:56:01 +01:00
Marc Alexander
160ff3471d [ticket/13657] Run travis builds on PHP 7.0
PHPBB3-13657
2015-03-05 11:26:53 +01:00
RMcGirr83
4618a3e2f8 [ticket/13477] rename function and fix doc blocks
PHPBB3-13477
2015-03-04 14:20:27 -05:00
RMcGirr83
c3720739cb [ticket/13590] Headers of remember me login keys are not centered
Corrected a few other files as well

PHPBB3-13590
2015-03-04 06:00:27 -05:00
cyberalien
5d8bea9060 [ticket/13667] Fix buttons alignment in Chrome for Windows
PHPBB3-13667
2015-03-03 16:47:30 +02:00
RMcGirr83
5cd4941c55 [ticket/13477] Update file cache driver for filenames
Replace slashes on file name

PHPBB3-13477
2015-03-03 09:31:30 -05:00
brunoais
134a5e0391 [ticket/13661] Brackets in their own line
I didn't even notice that I used my own coding guidelines there...
Thanks to MGaetan89 for pointing it out.

PHPBB3-13661
2015-03-02 12:06:24 +00:00
brunoais
c7cc8a098e [ticket/13661] Re-Fixed $log_type -> $log_time
Thanks to goof for pointing it out...

PHPBB3-13661
2015-03-01 21:17:06 +00:00
brunoais
21cc1fda85 [ticket/13664] Added alias to table to make modding easier.
PHPBB3-13664
2015-03-01 20:57:06 +00:00
brunoais
d53b584c9a [ticket/13661] Wrong event @since version
PHPBB3-13661
2015-03-01 20:44:30 +00:00
brunoais
5fa6871ebf [ticket/13664] Add event to allow changing number of unapproved posts listed
PHPBB3-13664
2015-03-01 20:26:12 +00:00
brunoais
772bbdfeae [ticket/13661] Removed superfluous whitespace
PHPBB3-13661
2015-03-01 19:58:57 +00:00
brunoais
5ad69bbecf [ticket/13664] From string query in mcp_front unapproved posts to built query
PHPBB3-13664
2015-03-01 19:55:43 +00:00
brunoais
d0a1650a04 [ticket/13661] bugfix: The conditional is the log_time, not log_type
I mistakenly made the log_type the conditional instead of log_time.
Thankfully, the automated tests helped finding this mistake.

PHPBB3-13661
2015-03-01 18:41:20 +00:00
Joas Schilling
fb71e6dde6 [ticket/8494] Ignore errors from the database schema preparation
This allows installing phpBB twice in the same database with a different
prefix

PHPBB3-8494
2015-03-01 17:37:26 +01:00
brunoais
c887eedaa5 [ticket/13661] Fixed the "FROM" in the built query.
I was doing it wrong by giving a string to the FROM clause in the built query.

PHPBB3-13661
2015-03-01 14:07:32 +00:00
brunoais
d66a53a531 [ticket/13661] Add event to allow editing the queries used to get the logs
PHPBB3-13661
2015-03-01 11:56:38 +00:00
brunoais
dbc09bf0d4 [ticket/13661] Transform queries to get logs and log count into built queries
PHPBB3-13661
2015-02-28 20:34:25 +00:00
brunoais
8b23272c33 [ticket/13660] Allow changing the query for total reports in mcp_front
PHPBB3-13660
2015-02-28 08:57:43 +00:00
brunoais
c37d5f9b7c [ticket/13142] Default $total to -1 before the event for more flexibility
PHPBB3-13142
2015-02-27 22:51:32 +00:00
Joas Schilling
7e0d54a331 [ticket/13647] Use the Symfony way for redirecting
PHPBB3-13647
2015-02-27 22:58:51 +01:00
Joas Schilling
8ec18b10c3 Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/session.php
2015-02-27 22:47:02 +01:00
Joas Schilling
18de60c0e0 Merge branch '3.0.x' into 3.1.x 2015-02-27 22:44:13 +01:00
Joas Schilling
8abf259273 Merge pull request #3444 from naderman/ticket/13617-ascraeus
[ticket/13617] Enforce column size limit for session_forum_id
2015-02-27 22:44:04 +01:00
Joas Schilling
62973faf4b Merge pull request #3443 from naderman/ticket/13617
[ticket/13617] Enforce column size limit for session_forum_id
2015-02-27 22:43:32 +01:00
Marc Alexander
5d6f86800f Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-02-27 22:10:27 +01:00
Marc Alexander
a7b1b71921 Merge pull request #3451 from RMcGirr83/ticket/13510
[ticket/13510] Add template even viewtopic_body_pagination_after
2015-02-27 22:08:51 +01:00
Robert Heim
2ad87c662f [ticket/13658] renamed events and added table_ary parameter
- added suffix '_query' to event names
- added table_ary to before event

PHPBB3-13658
2015-02-27 21:04:08 +01:00
RobertHeim
71828ee8df [ticket/13658] add event before and after topics are deleted
PHPBB3-13658
2015-02-27 18:01:26 +01:00
MateBartus
193c5b86b4 [ticket/12466] Move classes from acp_database.php to their own files
* Moving classes from acp_database.php to phpbb/db/extractor namespace,
   also into separate files
 * Adding DocBlocks and property visibility to classes
 * Removing globals from code
 * Passing former globals to base_extractor's constructor
 * Adding DB extractor as a service, also implementing the extractor interface
   as well as the extractor factory.

PHPBB3-12466
2015-02-27 16:18:50 +01:00
Marc Alexander
f526e81ddf Merge branch '3.1.x' 2015-02-27 12:21:46 +01:00
Marc Alexander
e15b9dc782 Merge pull request #3388 from rxu/ticket/13596
[ticket/13596] Add display_forums() event to allow modifying forums list data
2015-02-27 12:20:50 +01:00
Marc Alexander
a11181b5dd Merge branch '3.1.x' 2015-02-27 12:00:27 +01:00
Marc Alexander
0daf148aaa Merge pull request #3384 from brunoais/ticket/13592
[ticket/13592] Allow changing get_visibility_sql's result
2015-02-27 12:00:09 +01:00
brunoais
df9331084b [ticket/13142] Removed surperfulous space
PHPBB3-13142
2015-02-27 10:42:27 +00:00
brunoais
1e73f8d5ea [ticket/13142] Removed surperfulous new line
PHPBB3-13142
2015-02-27 08:34:28 +00:00
RMcGirr83
8c73f63529 [ticket/13510] Add template even viewtopic_body_pagination_after
PHPBB3-13510
2015-02-26 18:29:02 -05:00
Joas Schilling
e5595ca216 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
2015-02-26 22:53:26 +01:00
Joas Schilling
c814ecc143 Merge pull request #3449 from prototech/ticket/13649
[ticket/13649] Fix incorrect subforum tooltip title when unread.
2015-02-26 22:53:06 +01:00
Joas Schilling
48d208a3a6 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/functions_mcp.php
2015-02-26 22:48:52 +01:00
Joas Schilling
4928afedc6 Merge pull request #3447 from brunoais/ticket/13143
[ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorting()
2015-02-26 22:47:51 +01:00
Joas Schilling
72f7c5e9c2 Merge branch '3.1.x' 2015-02-26 22:40:03 +01:00
Joas Schilling
ea4b993516 Merge pull request #2992 from prototech/ticket/12599
[ticket/12599] Update documentation style
2015-02-26 22:34:05 +01:00
Joas Schilling
b75a0d9a11 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
2015-02-26 22:32:32 +01:00
Joas Schilling
6647d390b0 Merge pull request #3448 from prototech/ticket/13563
[ticket/13563] Remove PM column from subsilver2's memberlist_body.html.
2015-02-26 22:32:03 +01:00
Jakub Senko
6b1cd2d312 [ticket/13467] Add coding guidelines link
PHPBB3-13467
2015-02-26 20:51:36 +01:00
brunoais
ec855f1817 [ticket/13142] Place the event in the most meaningful place
The event now has nearly all variables and it is in the place where it can
most influence this method's outcome without requiring the extension
to re-process phpBB's code.

PHPBB3-13142
2015-02-26 13:07:35 +00:00
Marc Alexander
c9df29d680 Merge pull request #3303 from Nicofuma/ticket/13513
[ticket/13513] Use paths relative to the phpBB root in the router
2015-02-26 13:41:51 +01:00
brunoais
3e451cbe75 [ticket/13142] Delete event in order to move it.
PHPBB3-13142
2015-02-26 10:05:12 +00:00
Cesar G
4df853abcc [ticket/12599] Remove empty line at end of code boxes.
PHPBB3-12599
2015-02-25 20:08:08 -08:00
Cesar G
a07b29c1df [ticket/12599] Place standalone text in a box.
PHPBB3-12599
2015-02-25 20:08:03 -08:00
Cesar G
6e5f33e5fb [ticket/12599] Get the font sizes under control.
PHPBB3-12599
2015-02-25 20:02:40 -08:00
Cesar G
62f69224a4 [ticket/12599] Add padding on the sides of the inline code boxes.
PHPBB3-12599
2015-02-25 20:02:28 -08:00
Cesar G
5cd3e7627c [ticket/12599] Use the back to top icon instead of text.
PHPBB3-12599
2015-02-25 20:02:16 -08:00
Cesar G
14fecb2f02 [ticket/12599] Move images to assets/ and update the phpBB logo.
PHPBB3-12599
2015-02-25 20:02:06 -08:00
Cesar G
4565cac049 [ticket/12599] Move documentation stylesheet to assets directory.
PHPBB3-12599
2015-02-25 20:01:53 -08:00
Cesar G
e29e0e5018 [ticket/12599] Remove corner images from documentation style.
PHPBB3-12599
2015-02-25 20:01:25 -08:00
Cesar G
335d88cdbb [ticket/13649] Fix incorrect subforum tooltip title when unread.
PHPBB3-13649
2015-02-25 19:36:28 -08:00
Cesar G
37b919142f [ticket/13563] Remove PM column from subsilver2's memberlist_body.html.
The PM link was intentionally dropped due to excessive query requirements,
thus the column is without purpose now. See PHPBB3-13229

PHPBB3-13563
2015-02-25 19:15:11 -08:00
brunoais
c8be24fd5e [ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorting()
PHPBB3-13652
2015-02-25 23:28:42 +00:00
RMcGirr83
0442957420 [ticket/13650] Move core event
PHPBB3-13650
2015-02-25 11:28:00 -05:00
Nils Adermann
106bc1c232 [ticket/13617] Document magic number for forum_id
PHPBB3-13617
2015-02-25 17:00:22 +01:00
Nils Adermann
c5a15c0635 [ticket/13617] Use request->variable instead of request_var
PHPBB3-13617
2015-02-25 16:58:38 +01:00
Nils Adermann
d08d988df4 Merge branch 'ticket/13617' into ticket/13617-ascraeus
* ticket/13617:
  [ticket/13617] Enforce column size limit for session_forum_id

Conflicts:
	phpBB/phpbb/session.php
2015-02-25 16:25:20 +01:00
Nils Adermann
6f3f6282d1 [ticket/13617] Enforce column size limit for session_forum_id
PHPBB3-13617
2015-02-25 16:20:50 +01:00
Joas Schilling
261c3bc1d0 Merge branch '3.1.x' 2015-02-24 21:57:14 +01:00
Joas Schilling
3ac583271f Merge pull request #3381 from rxu/ticket/13591
[ticket/13591] Add core events to the function obtain_users_online_string()
2015-02-24 21:56:34 +01:00
Joas Schilling
06d6bcbe00 Merge branch '3.1.x' 2015-02-24 21:53:05 +01:00
Joas Schilling
9f9e392c7d Merge pull request #3436 from RMcGirr83/ticket/13650
[ticket/13650] Validate ucp profile data changes
2015-02-24 21:53:01 +01:00
MateBartus
19fe32d5b2 [ticket/13636] Deleting inactive user in acp_users gives unexpected link
Change "referer" to "redirect" in variable names and GET params as well.

PHPBB3-13636
2015-02-24 21:23:58 +01:00
MateBartus
b8dfbfe390 [ticket/13636] Deleting inactive user in acp_users gives unexpected link
Success message did not provide the expected "previous page" link
(acp_inactive was expected, but the link took users to acp_users) if the
acp_users module was accessed by navigating from the inactive user list to
acp_users and then deleting inactive user.

PHPBB3-13636
2015-02-24 21:06:53 +01:00
Joas Schilling
17b00812a7 Merge branch '3.1.x' 2015-02-24 20:44:37 +01:00
Joas Schilling
56cbff720d Merge pull request #3439 from RMcGirr83/ticket/13587
[ticket/13587] SQL syntax errors in get_prune_users()
2015-02-24 20:44:15 +01:00
RMcGirr83
80e1c233d9 [ticket/13587] SQL syntax errors in get_prune_users()
PHPBB3-13587
2015-02-24 13:28:47 -05:00
Marc Alexander
b650f45d55 [ticket/12368] Correctly check if avatars migration is installed
Try to set the avatar type to string value to check if new avatar
types are supported.

PHPBB3-12368
2015-02-24 11:43:33 +01:00
Richard McGirr
03ded5853b [ticket/13650] Validate ucp profile data changes
PHPBB3-13650
2015-02-23 21:19:10 -05:00
Andreas Fischer
525a62f72e Merge pull request #3433 from Nicofuma/ticket/13643
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000

* Nicofuma/ticket/13643:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Andreas Fischer
b57e00226a Merge branch '3.1.x'
* 3.1.x:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Joas Schilling
9c6fba558c [ticket/13647] Switch FAQ handling in view online to controller
PHPBB3-13647
2015-02-22 22:57:14 +01:00
Joas Schilling
19a236205f [ticket/13647] Generate route links for faq
PHPBB3-13647
2015-02-22 22:44:50 +01:00
Joas Schilling
9bd6535a7d [ticket/13647] Send 301 status
PHPBB3-13647
2015-02-22 22:44:31 +01:00
Joas Schilling
0357a4d89b Merge branch '3.1.x' 2015-02-22 22:27:59 +01:00
Joas Schilling
269dee4189 Merge pull request #3415 from RMcGirr83/ticket/13578
[ticket/13578] Add ucp_register.php core events
2015-02-22 22:27:41 +01:00
Nicofuma
ffc5a73a0c [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
PHP_INT_MIN isn't a defined constant but it can be calculed by
~PHP_INT_MAX (two's complement of PHP_INT_MAX)

PHPBB3-13643
2015-02-22 21:53:05 +01:00
Joas Schilling
0595ab959c [ticket/13647] Move FAQ page to a controller
PHPBB3-13647
2015-02-22 20:20:28 +01:00
Andreas Fischer
71eb981a81 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:36 +01:00
Andreas Fischer
d152bbc727 Merge pull request #3427 from prototech/ticket/13551
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN

* prototech/ticket/13551:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00
Andreas Fischer
677337348f Merge branch '3.1.x'
* 3.1.x:
  [ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Andreas Fischer
702a51b01c Merge pull request #3431 from Nicofuma/ticket/13644
[ticket/13644] Always type hint dispatch_interface

* Nicofuma/ticket/13644:
  [ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Nicofuma
9b5493372d [ticket/13644] Always type hint dispatch_interface
PHPBB3-13644
2015-02-22 17:01:37 +01:00
RMcGirr83
7bfb8686d9 [ticket/13578] Add ucp_register.php core events
PHPBB3-13578
2015-02-22 08:52:19 -05:00
Marc Alexander
c63bc6ee93 [ticket/13522] Fix QA tests for request_var() use
PHPBB3-13522
2015-02-21 17:53:25 +01:00
Marc Alexander
94b72cfbdb [ticket/13522] Add captcha to test file class name
PHPBB3-13522
2015-02-21 17:46:39 +01:00
Marc Alexander
8e737e483e [ticket/13522] Remove unneeded variables and correctly output input on error
PHPBB3-13522
2015-02-21 17:46:37 +01:00
Marc Alexander
4167be1e2c [ticket/13522] Add tests for acp_get_question_input and set/get name
PHPBB3-13522
2015-02-21 17:45:20 +01:00
Marc Alexander
5bfcc7e707 [ticket/13522] Add test file for Q&A captcha
PHPBB3-13522
2015-02-21 17:45:20 +01:00
Marc Alexander
d15e5372ca [ticket/13522] Use acp_get_question_input() for retrieving input data
PHPBB3-13522
2015-02-21 17:45:17 +01:00
Marc Alexander
12fe882741 [ticket/13522] Trim array elements before processing further
PHPBB3-13522
2015-02-21 17:43:15 +01:00
Kailey Truscott
b8c388f184 [ticket/13637] Update event name and docblock
Update the event name to core.ucp_pm_compose_modify_data
Change description of to_group_id and submit dockblock

PHPBB3-13637
2015-02-20 20:36:17 -05:00
Joas Schilling
3657d7a85a Merge branch '3.1.x' 2015-02-20 22:26:47 +01:00
Joas Schilling
379eae1a92 Merge pull request #3418 from brunoais/ticket/13631
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
Joas Schilling
7f3ad29c47 Merge branch '3.1.x' 2015-02-20 21:00:49 +01:00
Joas Schilling
e6e7d7040a Merge pull request #3423 from RMcGirr83/ticket/13635
[ticket/13635] Add sql_ary to ucp profile event
2015-02-20 21:00:39 +01:00
Joas Schilling
33ea266daf Merge branch '3.1.x' 2015-02-20 20:55:55 +01:00
Joas Schilling
059790f386 Merge pull request #3425 from dragosvr92/patch-4
Update colours.css
2015-02-20 20:55:23 +01:00
Joas Schilling
76d22f3e53 Merge branch '3.1.x' 2015-02-20 20:53:03 +01:00
Joas Schilling
835ee2ba63 Merge pull request #3380 from n-aleha/ticket/13586
[ticket/13586] Allow '0' as username with Jabber notifications
2015-02-20 20:52:54 +01:00
Joas Schilling
275d6bec6a Merge branch '3.1.x' 2015-02-20 20:50:18 +01:00
Joas Schilling
5e215aef26 Merge pull request #3369 from marc1706/ticket/13577
[ticket/13577] Skip tests requiring fileinfo if not enabled
2015-02-20 20:50:10 +01:00
Joas Schilling
61fa9dcb9f Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/search_results.html
2015-02-20 20:42:52 +01:00
Joas Schilling
461ce3f892 Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x 2015-02-20 20:41:55 +01:00
Wolfsblvt
cba12aca2a [ticket/13533] Add template core event to search results
PHPBB3-13533
2015-02-20 20:41:17 +01:00
Joas Schilling
0dab7e2552 Merge branch '3.1.x' 2015-02-20 20:29:45 +01:00
Joas Schilling
c24a840048 Merge pull request #3277 from dhruvgoel92/ticket/13472
[ticket/13472] Delete admin activation notification when deleting user
2015-02-20 20:29:05 +01:00
Joas Schilling
a1ecb10c5c Merge branch '3.1.x' 2015-02-20 20:22:18 +01:00
Joas Schilling
8a06f21ea9 Merge branch 'ticket/13640' into 3.1.x 2015-02-20 20:22:03 +01:00
Dragos-Valentin Radulescu
5c3ca7404d [ticket/13640] Rearrange css in a better order
PHPBB3-13640
2015-02-20 20:21:31 +01:00
Joas Schilling
de061b5e11 Merge branch '3.1.x' 2015-02-20 19:56:36 +01:00
Joas Schilling
31ae574830 Merge pull request #3197 from brunoais/ticket/13142
[ticket/13142] Before query to list unapproved and deleted posts
2015-02-20 19:54:02 +01:00
Dragos-Valentin Radulescu
eff928c29b [ticket/13639] Update colours.css
The rule is a left over from development. it should be removed from colours.css

.icon-search-advanced { background-image: url("./images/icon_search_adv.gif");}

Area21 ticket: https://area51.phpbb.com/phpBB/viewtopic.php?f=81&p=275166

PHPBB3-13639
2015-02-20 20:26:33 +02:00
Scout4all
3f4dcc6920 [ticket/13463] Correctly position notification mark read icon in RTL.
PHPBB3-13463
2015-02-19 19:07:07 -08:00
Cesar G
71d3ddc623 [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
PHPBB3-13551
2015-02-19 18:38:35 -08:00
Kailey Truscott
d28d90bd90 [ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event
Add a new PHP event to ucp_pm_compose to alter the default vars

PHPBB3-13637
2015-02-19 20:50:51 -05:00
Jakub Senko
8d6ab63fea [ticket/11424] Add space between control flow keywords and parenthesis
PHPBB3-11424
2015-02-19 22:07:26 +01:00
Andreas Fischer
19f8e25515 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13634] Update links to travis build icons
  [ticket/13634] Update branch names on README
2015-02-19 19:27:15 +01:00
Andreas Fischer
3db7ac0aad Merge pull request #3422 from VSEphpbb/ticket/13634-3.0.x
[ticket/13634] Update branch names on README

* VSEphpbb/ticket/13634-3.0.x:
  [ticket/13634] Update links to travis build icons
  [ticket/13634] Update branch names on README
2015-02-19 19:27:14 +01:00
Andreas Fischer
e4b4428173 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
  [ticket/13634] Update links to travis build icons
  [ticket/13634] Update branch names on README
2015-02-19 19:27:14 +01:00
RMcGirr83
1f345a8cf9 [ticket/13635] Add sql_ary to ucp profile event
PHPBB3-13635
2015-02-19 05:45:10 -05:00
Marc Alexander
a43c1a46c3 Merge branch '3.1.x' 2015-02-18 21:11:04 +01:00
Marc Alexander
7fd3767bbd Merge pull request #3417 from nickvergessen/ticket/13600
[ticket/13600] Allow extensions to create a custom help page
2015-02-18 21:10:43 +01:00
Marc Alexander
5ad4685f00 Merge branch '3.1.x' 2015-02-18 18:04:46 +01:00
Marc Alexander
098854a822 Merge pull request #3395 from s9e/ticket/13595
[ticket/13595] Remove unused instances of the bbcode class
2015-02-18 18:02:23 +01:00
Matt Friedman
bbf4bcc986 [ticket/13634] Update links to travis build icons
PHPBB3-13634
2015-02-18 08:42:14 -08:00
Matt Friedman
03f9c69e60 [ticket/13634] Update branch names on README
PHPBB3-13634
2015-02-18 08:37:36 -08:00
Marc Alexander
21c6223eb3 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
2015-02-18 17:35:03 +01:00
Marc Alexander
60f60acea3 Merge pull request #3420 from marc1706/ticket/13628
[ticket/13628] Allow ability for extension to add entries to user's profile
2015-02-18 17:30:13 +01:00
RMcGirr83
153d1691ae [ticket/13628] Allow ability for extension to add entries to user's profile
PHPBB3-13628
2015-02-18 16:35:10 +01:00
brunoais
f0850f1915 [ticket/13631] Better, more explicit comment explanation
PHPBB3-13631
2015-02-18 10:36:29 +00:00
brunoais
997b229723 [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
I don't get this... I was positive I, at some point, had it right... I don't get
what happened...

PHPBB3-13631
2015-02-18 10:33:49 +00:00
Marc Alexander
ddc96a7d07 Merge branch '3.1.x' 2015-02-18 00:19:10 +01:00
Marc Alexander
13948718c6 Merge pull request #3414 from rxu/ticket/13433
[ticket/13433] Fix parsing of email addresses
2015-02-18 00:03:25 +01:00
Joas Schilling
02d28c28cd [ticket/13600] Allow extensions to create a custom help page
PHPBB3-13600
2015-02-17 23:57:30 +01:00
Andreas Fischer
978b96cbf5 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
Andreas Fischer
f3d332b78f Merge pull request #3411 from Senky/ticket/13570
[ticket/13570] Mysqli extension supports persistent connection since PHP 5.3.0

* Senky/ticket/13570:
  [ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
rxu
950c72a8a5 [ticket/13433] Add make_clickable() test for emails
PHPBB3-13433
2015-02-18 01:03:07 +07:00
Marc Alexander
b84dee2667 Merge branch 'develop-ascraeus' into develop 2015-02-17 17:13:34 +01:00
Marc Alexander
6322970766 Merge pull request #3412 from Senky/ticket/13618
[ticket/13618] Small grammatical typo in the English FAQ
2015-02-17 17:13:13 +01:00
rxu
fa1c61f608 [ticket/13433] Fix parsing of email addresses
Currently email addresses are parsed incorrectly due to the regex structure.
Namely, if localpart consists of several dot separated parts, only the last
part with the trailing dot will be captured.
The patch change this behavior to capture the whole localpart.

PHPBB3-13433
2015-02-17 17:24:30 +07:00
kasimi
c7ce6cd26f [ticket/13540] Add total post count to mcp_topic_review_modify_row event
PHPBB3-13540
2015-02-17 00:48:04 +01:00
Jakub Senko
ec8aeaf2cd [ticket/13618] Fix typo in English FAQ
PHPBB3-13618
2015-02-16 20:27:52 +01:00
Jakub Senko
f23d2ec42f [ticket/13570] Remove unnecessary ternary condition from mysqli driver
PHPBB3-13570
2015-02-16 20:25:11 +01:00
Jakub Senko
e31720bb6e [ticket/13467] Add a CONTRIBUTING file
PHPBB3-13467
2015-02-16 20:17:33 +01:00
kasimi
f9d34a16dd [ticket/13540] Add topic_info to mcp_topic_review_modify_row event
PHPBB3-13540
2015-02-16 20:11:19 +01:00
Jakub Senko
6f56dc8568 [ticket/11424] Handle race condition properly for Quick-Mod Tools
PHPBB3-11424
2015-02-16 19:51:09 +01:00
Jakub Senko
bf86553daa [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
PHPBB3-9457
2015-02-16 18:02:16 +01:00
brunoais
b934617a3b [ticket/13625] Adding multiple variables to core.viewforum_get_topic_data
Added topics_count, sort_days, sort_key and sort_dir to
core.viewforum_get_topic_data and adjusted the event's comment explaining
it's possible extended purpose now that it has more variables.

PHPBB3-13625
2015-02-16 11:31:05 +00:00
Joas Schilling
c489c6090b Merge pull request #3401 from marc1706/ticket/13619
[ticket/13619] Remove unneeded files and folders from vendor in release package
2015-02-16 09:25:22 +01:00
Marc Alexander
9b6e57de3d Merge pull request #3394 from nickvergessen/ticket/10748-postgresql
[ticket/10748][Part2] Split postgres DB tools into it's own class
2015-02-15 22:32:39 +01:00
brunoais
957b23765f [ticket/13621] Prepend $where_sql and postpend closing parentheses on return
Prepend $where_sql and postpend closing parentheses on statements with return

PHPBB3-13621
2015-02-15 18:50:13 +00:00
Marc Alexander
2042bfc5db Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
2015-02-15 18:52:05 +01:00
Marc Alexander
088907fe8e Merge pull request #3403 from marc1706/ticket/13615
[ticket/13615] Correctly display images for gallery avatar in subsilver2
2015-02-15 18:50:58 +01:00
kamijoutouma
4398a51dc6 [ticket/13615] Correctly display images for gallery avatar in subsilver2
Avatar Gallery shows categories but no images in subsilver2.
The ID was not specified in the template. Also, the correct parent template
loop is called avatar_local_row and not avatar_local_col.

PHPBB3-13615
2015-02-15 18:18:56 +01:00
Joas Schilling
1e3175cca3 [ticket/10748] Fix class type hinting
PHPBB3-10748
2015-02-15 17:01:20 +01:00
Marc Alexander
8793d2f2c8 [ticket/13619] Remove unneeded files and folders from vendor in release package
PHPBB3-13619
2015-02-15 14:52:12 +01:00
Marc Alexander
27cfda74fc [ticket/13612] Always display success message if extension was enabled
An error will already be triggered if enable_step() is not successful.
Redirecting for no obvious reason will just confuse users.

PHPBB3-13612
2015-02-14 23:41:53 +01:00
Marc Alexander
8314ce6871 [ticket/13612] Run meta refresh until extension is fully enabled
PHPBB3-13612
2015-02-14 17:59:59 +01:00
JoshyPHP
4559aca723 [ticket/13595] Removed unused code
PHPBB3-13595
2015-02-13 22:55:04 +01:00
Joas Schilling
ec1fb0423d [ticket/10748] Split postgres DB tools into it's own class
PHPBB3-10748
2015-02-13 22:49:29 +01:00
Marc Alexander
e5104b5d53 Merge pull request #3285 from MGaetan89/ticket/13497
[ticket/13497] Change get_tables() calls with $db_tools->sql_list_tables()
2015-02-13 12:09:40 +01:00
Marc Alexander
4756fa5262 Merge branch 'develop-ascraeus' into develop 2015-02-13 12:06:42 +01:00
Marc Alexander
9e3bc9a3f9 Merge branch 'develop-olympus' into develop-ascraeus
Conflicts:
	.travis.yml
	travis/phpunit-mysqli-travis.xml
2015-02-13 12:06:07 +01:00
Marc Alexander
877774a296 Merge pull request #3393 from bantu/ticket/13599
[ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
2015-02-13 12:02:25 +01:00
Andreas Fischer
0a775e0433 [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
PHPBB3-13599
2015-02-12 22:12:32 +01:00
Gaëtan Muller
50478e68b0 [ticket/13497] Update calls to get_tables()
PHPBB3-13497
2015-02-11 21:28:11 +01:00
Andreas Fischer
39a3f4f6c8 Merge pull request #3391 from marc1706/ticket/13597
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7

* marc1706/ticket/13597:
  [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
2015-02-11 16:53:25 +01:00
Andreas Fischer
069738a1f2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
2015-02-11 16:53:25 +01:00
Marc Alexander
25b54791f9 [ticket/13493] Append page name to base url if it doesn't contain it
PHPBB3-13493
2015-02-11 13:03:22 +01:00
brunoais
93185574b5 [ticket/13142] BUMPed version
PHPBB3-13142
2015-02-11 11:42:43 +00:00
Marc Alexander
3df25babce [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
PHPBB3-13597
2015-02-11 12:03:54 +01:00
brunoais
bf20fb03ef [ticket/13592] The name didn't make proper sense
PHPBB3-13592
2015-02-11 10:56:36 +00:00
rxu
67a963ac42 [ticket/13596] Add display_forums() event to allow modifying forums list data
Add display_forums() core event in includes/functions_display.php to allow
modifying forums list data before the list is being generated and dumped
to the template.

PHPBB3-13596
2015-02-10 10:05:44 +07:00
Nicofuma
acf3744297 Merge pull request #3332 from nickvergessen/ticket/10748-mssql
[ticket/10748] Split MS SQL from the db tools file into it's own
2015-02-09 17:11:09 +01:00
brunoais
74385b8fce [ticket/13592] Empty line before event comment block.
I had forgotten this one

PHPBB3-13592
2015-02-09 11:58:35 +00:00
brunoais
6111f5fa74 [ticket/13592] Removed unwanted space in self line.
PHPBB3-13592
2015-02-09 11:56:53 +00:00
brunoais
bb7d294190 [ticket/13592] Allow full override of get_visibility_sql()
PHPBB3-13592
2015-02-09 10:44:12 +00:00
brunoais
8a4df90dac [ticket/13592] Allow changing get_visibility_sql's result
PHPBB3-13592
2015-02-09 08:42:37 +00:00
brunoais
1bcce75633 [ticket/13592] Allow changing get_visibility_sql's result
PHPBB3-13592
2015-02-08 23:52:27 +00:00
Marc Alexander
c76d797cb2 [ticket/9109] Improve docblock and fix spelling errors
PHPBB3-9109
2015-02-08 21:16:05 +01:00
Marc Alexander
5cc0488f74 [ticket/9109] Only query database once in phpbb_get_max_setting_from_group
More test cases have been added, too.

PHPBB3-9109
2015-02-08 21:16:05 +01:00
Joas Schilling
291143fe6a [ticket/9109] Properly document and calculate the group settings with value 0
PHPBB3-9109
2015-02-08 21:16:04 +01:00
rxu
072df2217c [ticket/13591] Add core events to the function obtain_users_online_string()
Add functions.php core events to the function obtain_users_online_string()
to allow extensions adding/modifying online users data.

PHPBB3-13591
2015-02-08 12:28:28 +07:00
n-aleha
e1eac80b8f [ticket/13586] Allow '0' as username with Jabber notifications
PHPBB3-13586
2015-02-07 19:33:19 +02:00
Joas Schilling
74d1b1812f [ticket/10748] Overwrite the type map correctly
PHPBB3-10748
2015-02-07 14:41:40 +01:00
Joas Schilling
37ae99c75d [ticket/10748] Replace direct creations of tools();
PHPBB3-10748
2015-02-07 14:41:39 +01:00
Joas Schilling
4ea90ca44d [ticket/10748] Split MS SQL from the db tools file into it's own
PHPBB3-10748
2015-02-07 14:36:26 +01:00
Joas Schilling
b0c910e49c Merge branch 'develop-ascraeus' into develop 2015-02-07 14:33:37 +01:00
Joas Schilling
c6a371531b Merge pull request #3379 from Crizz0/ticket/13588
[ticket/13588] Fixes wrong message in info fsockopen() disabled
2015-02-07 14:33:34 +01:00
Crizzo
fbc603861d [ticket/13588] Fixes wrong message in info fsockopen() disabled
PHPBB3-13588
2015-02-07 13:50:08 +01:00
Marc Alexander
1da6b30cf0 [ticket/13568] Add unit tests for validating absolute path
PHPBB3-13568
2015-02-06 10:39:55 +01:00
Marc Alexander
cd85f1b632 Merge branch 'ticket/13568' into ticket/13568-asc
Conflicts:
	phpBB/adm/index.php
	phpBB/includes/acp/acp_attachments.php
2015-02-06 10:19:39 +01:00
Marc Alexander
7c5d872344 [ticket/13568] Also check if absolute_path_writable is writable
PHPBB3-13568
2015-02-06 10:15:36 +01:00
Marc Alexander
48b64b0a61 [ticket/13577] Skip filespec test requiring mimetype check on windows
PHPBB3-13577
2015-02-05 13:37:34 +01:00
Andreas Fischer
e4064ca839 Merge pull request #3207 from Nicofuma/ticket/13407
[ticket/13407] Update Symfony to 2.7.*@dev

* Nicofuma/ticket/13407:
  [ticket/13407] Update composer.lock file
  [ticket/13407] Bump minimal version to php 5.3.9
  [ticket/13407] Introduce a request_stack service
  [ticket/13407] Remove the last occurence of pattern in routing files
  [ticket/13407] Update Symfony to 2.7.*@dev
2015-02-04 21:14:01 +01:00
Andreas Fischer
3267c6a61a Merge pull request #3257 from MGaetan89/ticket/13455
[ticket/13455] Change request_var() calls with $request->variable()

* MGaetan89/ticket/13455:
  [ticket/13455] Remove `request_var()` references from comments
  [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`
  [ticket/13455] Update calls to `request_var()`
2015-02-04 21:09:54 +01:00
Nicofuma
e323c7c23a [ticket/13407] Update composer.lock file
PHPBB3-13407
2015-02-04 17:48:10 +01:00
Nicofuma
b8939da242 [ticket/13407] Bump minimal version to php 5.3.9
PHPBB3-13407
2015-02-04 17:40:18 +01:00
Nicofuma
73d3d02af1 [ticket/13407] Introduce a request_stack service
PHPBB3-13407
2015-02-04 17:40:14 +01:00
Nicofuma
216fb13c2a [ticket/13407] Remove the last occurence of pattern in routing files
PHPBB3-13407
2015-02-04 17:40:11 +01:00
Nicofuma
9e104b0915 [ticket/13407] Update Symfony to 2.7.*@dev
PHPBB3-13407
2015-02-04 17:40:06 +01:00
Marc Alexander
c1d644769f [ticket/13577] Skip functional tests requiring fileinfo if not enabled
PHPBB3-13577
2015-02-04 15:24:25 +01:00
Gaëtan Muller
52446c8327 [ticket/13455] Remove request_var() references from comments
PHPBB3-13455
2015-02-03 20:56:48 +01:00
Gaëtan Muller
abcb2680ee [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Andreas Fischer
f9ab676530 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13348] Remove unnecessary global $cache
  [ticket/13348] Use close method to free query result handle
2015-02-03 20:36:53 +01:00
Andreas Fischer
1e4853507a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2015-02-03 20:36:46 +01:00
Andreas Fischer
8832851b8e Merge pull request #3366 from marc1706/ticket/13348
[ticket/13348] Use close method to free feed query result handle

* marc1706/ticket/13348:
  [ticket/13348] Remove unnecessary global $cache
  [ticket/13348] Use close method to free query result handle
2015-02-03 20:36:41 +01:00
Andreas Fischer
2787e799e1 Merge pull request #3365 from marc1706/ticket/13348-olympus
[ticket/13348] Use close method to free query result handle

* marc1706/ticket/13348-olympus:
  [ticket/13348] Remove unnecessary global $cache
  [ticket/13348] Use close method to free query result handle
2015-02-03 20:36:27 +01:00
Marc Alexander
a09d022d5e Merge branch 'ticket/13348-olympus' into ticket/13348
Conflicts:
	phpBB/feed.php
2015-02-03 18:30:45 +01:00
Marc Alexander
4e06ab16f0 [ticket/13348] Remove unnecessary global $cache
$cache is not used in the method get_item().

PHPBB3-13348
2015-02-03 18:24:16 +01:00
Marc Alexander
1f2cb69c8a [ticket/13348] Use close method to free query result handle
PHPBB3-13348
2015-02-03 18:23:13 +01:00
Andreas Fischer
284aa8c496 Merge pull request #3281 from MGaetan89/ticket/13496
[ticket/13496] Change set_config_count() calls with $config->increment()

* MGaetan89/ticket/13496:
  [ticket/13496] Update calls to `set_config_count()`
2015-02-03 18:13:20 +01:00
Andreas Fischer
3fb6d5b838 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13538] Add tests for double nested pagination loop
  [ticket/13538] Fix tests for pagination in nested loop
  [ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:47 +01:00
Andreas Fischer
5347eac69c Merge pull request #3328 from marc1706/ticket/13538
[ticket/13538] Add tests for pagination in nested loops

* marc1706/ticket/13538:
  [ticket/13538] Add tests for double nested pagination loop
  [ticket/13538] Fix tests for pagination in nested loop
  [ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:46 +01:00
Andreas Fischer
63d863a883 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:02 +01:00
Andreas Fischer
2864e77d6c Merge pull request #3361 from marc1706/ticket/13569
[ticket/13569] Add missing sql_freeresults and remove unneeded results

* marc1706/ticket/13569:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:00 +01:00
Marc Alexander
a3be531020 [ticket/13568] Use correct data provider on windows
PHPBB3-13568
2015-02-03 16:34:41 +01:00
Andreas Fischer
ceaba8aaf9 Merge pull request #3028 from Nicofuma/ticket/13139
[ticket/13139] Update Twig to 1.18.0

* Nicofuma/ticket/13139:
  [ticket/13139] Fix tests
  [ticket/13139] Update Twig to 1.8.0
  [ticket/13139] Update Twig to 1.16.2
2015-02-03 15:08:36 +01:00
Nicofuma
f4b42c961f [ticket/13139] Fix tests
PHPBB3-13139
2015-02-03 13:37:52 +01:00
Nicofuma
199e7cf5a1 [ticket/13139] Update Twig to 1.8.0
PHPBB3-13139
2015-02-03 13:34:59 +01:00
Tristan Darricau
e1f983d3cf [ticket/13139] Update Twig to 1.16.2
PHPBB3-13139
2015-02-03 13:34:53 +01:00
Andreas Fischer
427d2de3ea Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:03 +01:00
Andreas Fischer
7e91320995 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:03 +01:00
Andreas Fischer
e86b7ce562 Merge pull request #3363 from Nicofuma/ticket/13572
[ticket/13572] Update composer to version 1.0.0-alpha9

* Nicofuma/ticket/13572:
  [ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:02 +01:00
Nicofuma
f4f983c0f6 [ticket/13572] Update composer to version 1.0.0-alpha9
PHPBB3-13572
2015-02-03 10:25:39 +01:00
Joas Schilling
529820b620 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:30:15 +01:00
Joas Schilling
bbb6d6a452 Merge pull request #3330 from kasimi/ticket/13540
[ticket/13540] Add core event for modifying topic review block data
2015-02-02 23:30:06 +01:00
Joas Schilling
677ff632c4 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/includes/mcp/mcp_queue.php
2015-02-02 23:27:19 +01:00
Joas Schilling
efee422707 Merge pull request #3326 from Wolfsblvt-Test/ticket/13537
Add core events on mcp_queue for approval and disapproval
2015-02-02 23:25:53 +01:00
Joas Schilling
917a5ce0df Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
2015-02-02 23:23:26 +01:00
Joas Schilling
7330c0afd3 Merge pull request #3325 from rxu/ticket/13536
[ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
2015-02-02 23:22:23 +01:00
Joas Schilling
7e7b337d27 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:19:49 +01:00
Joas Schilling
6678570f49 Merge pull request #3324 from rxu/ticket/13336
[ticket/13336] Add core events to the function user_active_flip()
2015-02-02 23:19:44 +01:00
Joas Schilling
2f060b8299 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:18:24 +01:00
Joas Schilling
e9eafece3f Merge pull request #3323 from rxu/ticket/13535
[ticket/13535] Add core event to allow modifying account settings on editing
2015-02-02 23:18:15 +01:00
Joas Schilling
eadacaa3ad Merge branch 'develop-ascraeus' into develop 2015-02-02 23:12:47 +01:00
Joas Schilling
0e6cd94fb4 Merge pull request #3317 from Wolfsblvt/ticket/13532
Add core event to get_unread_topics() in functions.php
2015-02-02 23:12:42 +01:00
Joas Schilling
517549eae6 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:09:41 +01:00
Joas Schilling
0aea283ab0 Merge pull request #3305 from Wolfsblvt/ticket/13518
Add core event to markread() in functions.php
2015-02-02 23:09:34 +01:00
Joas Schilling
7f8a726702 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-02-02 23:07:33 +01:00
Joas Schilling
b1336ae016 Merge pull request #3302 from rxu/ticket/13512
[ticket/13512] Add template events before/after the post details
2015-02-02 23:05:50 +01:00
Joas Schilling
f31d12ddf2 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:00:48 +01:00
Joas Schilling
7254a52812 Merge pull request #3282 from Elsensee/ticket/13313
[ticket/13313] Add event core.acp_email_display
2015-02-02 23:00:29 +01:00
Gaëtan Muller
a633f3484c [ticket/13496] Update calls to set_config_count()
PHPBB3-13496
2015-02-02 21:52:59 +01:00
Marc Alexander
8569e1c77a Merge branch 'develop-ascraeus' into develop 2015-02-02 21:06:02 +01:00
Marc Alexander
5182d02da5 Merge pull request #3334 from paul999/ticket/13542
[ticket/13542] Update core.ucp_prefs_personal_data to include $error
2015-02-02 21:05:44 +01:00
Marc Alexander
ffe0e46e82 [ticket/13568] Add imagick tests for windows
PHPBB3-13568
2015-02-02 20:39:58 +01:00
Andreas Fischer
df77174a2b Merge pull request #3280 from MGaetan89/ticket/13494
[ticket/13494] Change set_config() calls with $config->set()

* MGaetan89/ticket/13494:
  [ticket/13494] Update calls to `set_config()`
2015-02-02 20:07:46 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config()
PHPBB3-13494
2015-02-02 19:28:23 +01:00
Marc Alexander
d50cec998c [ticket/13568] Correctly check rpath and rwpath validation options
PHPBB3-13568
2015-02-02 18:44:48 +01:00
Marc Alexander
b53fd867be [ticket/13568] Add more test cases for imagick path
PHPBB3-13568
2015-02-02 18:33:53 +01:00
Marc Alexander
a93df0e511 [ticket/13568] Use more descriptive validation names and merge with path block
PHPBB3-13568
2015-02-02 18:30:05 +01:00
Marc Alexander
a166f6f42c [ticket/13569] Add missing sql_freeresults and remove unneeded results
PHPBB3-13569
2015-02-02 17:36:39 +01:00
Marc Alexander
99574cf5e5 [ticket/13568] Add functional test for imagick path setting
PHPBB3-13568
2015-02-02 16:11:00 +01:00
Marc Alexander
19421fcdef [ticket/13568] Validate imagick path as readable absolute path
PHPBB3-13568
2015-02-02 15:59:52 +01:00
Joas Schilling
6e2838a4ca Merge branch 'develop-ascraeus' into develop
Conflicts:
	build/build.xml
2015-02-01 20:24:32 +01:00
Joas Schilling
9f59aa59d9 Merge branch 'prep-release-3.1.3' into develop-ascraeus
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-02-01 20:23:16 +01:00
Joas Schilling
7f99e1c857 [prep-release-3.1.3] Add migration for 3.1.3 2015-02-01 19:18:30 +01:00
Joas Schilling
036b5c4244 [prep-release-3.1.3] Update version to 3.1.3 2015-02-01 19:15:42 +01:00
Marc Alexander
a893dfa46b Merge pull request #3352 from VSEphpbb/ticket/10388
Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
2015-01-31 12:59:40 +01:00
Joas Schilling
bacb38b161 Merge branch 'develop-ascraeus' into develop
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2015-01-31 12:12:56 +01:00
Joas Schilling
3c23242bfe Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 12:11:43 +01:00
Matt Friedman
9f4c2effe9 [ticket/10388] Update deprecation comment
PHPBB3-10388
2015-01-31 01:11:28 -08:00
Joas Schilling
be30d8251a [prep-release-3.1.3] Add changelog for 3.1.3-RC2 2015-01-31 01:08:29 +01:00
Joas Schilling
9232367b35 [prep-release-3.1.3] Add migration for 3.1.3-RC2 2015-01-31 01:06:23 +01:00
Joas Schilling
dd182c5433 [prep-release-3.1.3] Update version to 3.1.3-RC2 2015-01-31 01:03:55 +01:00
Joas Schilling
c14cf0457d Merge branch 'develop-ascraeus' into develop 2015-01-31 00:57:32 +01:00
Joas Schilling
67478a0f94 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 00:57:25 +01:00
Joas Schilling
e72c1540cb Merge branch 'ticket/13553' into prep-release-3.1.3 2015-01-31 00:57:15 +01:00
Matt Friedman
e6bbde2bff [ticket/13553] Use defined title value in page headers too
PHPBB3-13553
2015-01-31 00:56:59 +01:00
Matt Friedman
ab4b1afd98 [ticket/13553] Make title var accept a lang key var
PHPBB3-13553
2015-01-31 00:56:54 +01:00
Matt Friedman
7127d08c8f [ticket/13553] Message helper should accept a lang key var
PHPBB3-13553
2015-01-31 00:56:47 +01:00
Joas Schilling
14ab007128 Merge branch 'develop-ascraeus' into develop 2015-01-31 00:43:30 +01:00
Joas Schilling
b16854ab8c Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 00:43:20 +01:00
Joas Schilling
bb4287ab2d Merge pull request #3355 from nickvergessen/ticket/13557
[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
2015-01-31 00:43:04 +01:00
Joas Schilling
9628e8df3b [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
PHPBB3-13557
2015-01-30 22:57:15 +01:00
Andreas Fischer
7531bfb291 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13556] Fix exception translation with filedownloader
2015-01-30 19:00:15 +01:00
Andreas Fischer
2690038d40 Merge branch 'prep-release-3.1.3' into develop-ascraeus
* prep-release-3.1.3:
  [ticket/13556] Fix exception translation with filedownloader
2015-01-30 19:00:15 +01:00
Andreas Fischer
3fef570950 Merge pull request #3354 from nickvergessen/ticket/13556
[ticket/13556] Fix exception translation with filedownloader

* nickvergessen/ticket/13556:
  [ticket/13556] Fix exception translation with filedownloader
2015-01-30 19:00:15 +01:00
Joas Schilling
69450c7152 [ticket/13556] Fix exception translation with filedownloader
PHPBB3-13556
2015-01-30 18:05:13 +01:00
Joas Schilling
1b185413bf Merge branch 'develop-ascraeus' into develop 2015-01-30 17:48:54 +01:00
Joas Schilling
3e710fe393 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 17:48:45 +01:00
Joas Schilling
e5f2eee167 Merge pull request #3341 from brunoais/ticket/13544
[ticket/13544] Fixing wrong SQL query for permission_unset() for roles
2015-01-30 17:45:21 +01:00
Andreas Fischer
3d4555296d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
2015-01-30 13:43:14 +01:00
Andreas Fischer
899173eebd Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-01-30 13:43:05 +01:00
Andreas Fischer
7273591560 Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
  [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
  [prep-release-3.0.13] Also update version in references to files.
  [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
  [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
  [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-01-30 13:40:44 +01:00
Andreas Fischer
0b8a4e04d3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
  [prep-release-3.0.13] Also update version in references to files.
  [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
  [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
  [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.

Conflicts:
	build/build.xml
2015-01-30 13:36:55 +01:00
Andreas Fischer
c46a6443be Merge branch 'prep-release-3.1.3' into develop-ascraeus
* prep-release-3.1.3:
  [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
  [prep-release-3.0.13] Also update version in references to files.
  [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
  [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
  [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
2015-01-30 13:36:20 +01:00
Andreas Fischer
b6786f8ba1 Merge branch 'prep-release-3.0.13' into prep-release-3.1.3
* prep-release-3.0.13:
  [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
  [prep-release-3.0.13] Also update version in references to files.
  [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
  [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
  [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
  [ticket/12933] Handle case when * is last character of word
  [ticket/13554] Show feature release upgrades in blue rather than red.

Conflicts:
	build/build.xml
	phpBB/adm/style/acp_update.html
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/includes/startup.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	tests/security/trailing_path_test.php
2015-01-30 13:34:40 +01:00
Andreas Fischer
b78ae290e8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13553] Add a method to the controller helper to display a message
  [prep-release-3.1.3] Add changelog for 3.1.3-RC1
  [prep-release-3.1.3] Prepare Changelog
  [prep-release-3.1.3] Add migration for 3.1.3-RC1
  [prep-release-3.1.3] Update version to 3.1.2-RC1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-01-30 13:14:33 +01:00
Dhruv
ab07be8157 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 13:10:38 +05:30
Dhruv Goel
c130165bfa Merge pull request #3353 from nickvergessen/ticket/13553
[ticket/13553] Add a method to the controller helper to display a message
2015-01-30 13:09:14 +05:30
Andreas Fischer
5f237a0426 [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. 2015-01-30 01:32:34 +01:00
Andreas Fischer
1e94b0ae71 [prep-release-3.0.13] Also update version in references to files. 2015-01-29 23:32:05 +01:00
Andreas Fischer
5fea945b5b [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. 2015-01-29 23:27:12 +01:00
Andreas Fischer
1642e560dc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13554] Show feature release upgrades in blue rather than red.
2015-01-29 23:22:48 +01:00
Andreas Fischer
05d8264de6 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13554] Show feature release upgrades in blue rather than red.

Conflicts:
	phpBB/adm/style/acp_update.html
2015-01-29 23:21:59 +01:00
Andreas Fischer
208923563e [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. 2015-01-29 23:16:34 +01:00
Joas Schilling
afe99f9050 [ticket/13553] Add a method to the controller helper to display a message
PHPBB3-13553
2015-01-29 19:08:32 +01:00
Andreas Fischer
40e676ad03 [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. 2015-01-29 18:17:29 +01:00
Matt Friedman
5b7d1f1b43 [ticket/10388] Update deprecation date for addslashes
PHPBB3-10388
2015-01-29 01:50:13 -08:00
Matt Friedman
2671306304 [ticket/10388] Update tests
PHPBB3-10388
2015-01-29 01:41:52 -08:00
Matt Friedman
a62adfc115 [ticket/10388] Use TWIG escape JS filter instead of addslashes
PHPBB3-10388
2015-01-29 01:41:28 -08:00
Matt Friedman
fc412a97ca [ticket/10388] Convert LA usages to L when not in javascript context
PHPBB3-10388
2015-01-29 01:40:54 -08:00
Dhruv
cc210b1842 Merge remote-tracking branch 'upstream/prep-release-3.0.13' into develop-olympus 2015-01-29 11:51:33 +05:30
Dhruv Goel
36f8fb2b37 Merge pull request #3347 from bantu/ticket/13554
[ticket/13554] Show feature release upgrades in blue rather than red.
2015-01-29 11:47:37 +05:30
Andreas Fischer
182e7f55cc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
2015-01-29 00:09:28 +01:00
Andreas Fischer
5b96d30540 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.

Conflicts:
	phpBB/includes/startup.php
	tests/security/trailing_path_test.php
2015-01-29 00:09:12 +01:00
Andreas Fischer
6f5524de26 Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
2015-01-29 00:08:23 +01:00
Andreas Fischer
872caf805c Merge pull request #3348 from bantu/ticket/13549
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME...

* bantu/ticket/13549:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
2015-01-29 00:06:00 +01:00
Andreas Fischer
69a4c36e82 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:04:33 +01:00
Andreas Fischer
ef10b02f78 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:03:31 +01:00
Andreas Fischer
f48cc8bbe9 Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:03:16 +01:00
Andreas Fischer
8da3a6f117 Merge pull request #3349 from bantu/ticket/12933
[ticket/12933] Handle case when * is last character of word

* bantu/ticket/12933:
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:03:05 +01:00
Andreas Fischer
d7741cea60 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12933] Add test cases for * wildcard searches
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:02:42 +01:00
Andreas Fischer
f0f88c287c Merge pull request #3338 from dhruvgoel92/ticket/12933
[ticket/12933] Handle *wildcard character in native search

* dhruvgoel92/ticket/12933:
  [ticket/12933] Add test cases for * wildcard searches
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:02:41 +01:00
Marc Alexander
7495055907 [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
The ORIG_PATH_INFO on IIS also contains the script name. Only use that
for killing the script after removing the script name from ORIG_PATH_INFO.

PHPBB3-13549
2015-01-28 22:07:16 +01:00
Dhruv
5eb0d422c8 [ticket/12933] Handle case when * is last character of word
PHPBB3-12933
2015-01-28 21:59:58 +01:00
Andreas Fischer
dff1ea6b85 [ticket/13554] Show feature release upgrades in blue rather than red.
PHPBB3-13554
2015-01-28 21:59:03 +01:00
Andreas Fischer
91ff42d501 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13414] Set Content-Length header only if status is not 304
2015-01-28 19:57:29 +01:00
Andreas Fischer
e3e427fa24 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13414] Set Content-Length header only if status is not 304

Conflicts:
	phpBB/download/file.php
2015-01-28 19:56:47 +01:00
Andreas Fischer
9d72463824 Merge pull request #3343 from marc1706/ticket/13414
[ticket/13414] Set Content-Length header only if status is not 304

* marc1706/ticket/13414:
  [ticket/13414] Set Content-Length header only if status is not 304
2015-01-28 19:48:42 +01:00
Dhruv
35edd7a043 [ticket/12933] Add test cases for * wildcard searches
PHPBB3-12933
2015-01-28 21:46:38 +05:30
Dhruv
252018b813 Merge branch 'ticket/12933-olympus' into ticket/12933 2015-01-28 21:41:24 +05:30
Dhruv
be90e97452 [ticket/12933] Handle case when * is last character of word
PHPBB3-12933
2015-01-28 21:37:03 +05:30
Marc Alexander
a9fa20bb91 [ticket/13414] Set Content-Length header only if status is not 304
PHPBB3-13414
2015-01-28 15:50:48 +01:00
Tristan Darricau
0bdb4c1ed6 Merge pull request #3263 from MGaetan89/ticket/13468
[ticket/13468] Change add_log() calls with $phpbb_log->add()

* MGaetan89/ticket/13468:
  [ticket/13468] Update calls to `add_log()`
2015-01-28 09:27:16 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
brunoais
4b16add055 [ticket/13544] Use integer case because $role_id is an int
PHPBB3-13544
2015-01-26 22:00:20 +00:00
brunoais
73d1bf9fea [ticket/13544] Fixing wrong SQL query for permission_unset for roles
PHPBB3-13544
2015-01-26 19:21:22 +00:00
Joas Schilling
b2b5addd09 [prep-release-3.1.3] Add changelog for 3.1.3-RC1 2015-01-26 20:09:46 +01:00
Joas Schilling
513b2f8296 [prep-release-3.1.3] Prepare Changelog 2015-01-26 20:00:11 +01:00
Joas Schilling
32b25d7b11 [prep-release-3.1.3] Add migration for 3.1.3-RC1 2015-01-26 19:43:36 +01:00
Joas Schilling
acfb9b9539 [prep-release-3.1.3] Update version to 3.1.2-RC1 2015-01-26 19:42:06 +01:00
Nils Adermann
828aa34ff9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.0.13] Bump version numbers for 3.0.13 release
  [prep-release-3.0.13] Highlight security relevant changes
2015-01-26 19:01:47 +01:00
Nils Adermann
1c6ebcf02b Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [prep-release-3.0.13] Bump version numbers for 3.0.13 release
  [prep-release-3.0.13] Highlight security relevant changes

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
2015-01-26 19:01:34 +01:00
Nils Adermann
ebd5aace3f Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
  [prep-release-3.0.13] Bump version numbers for 3.0.13 release
  [prep-release-3.0.13] Highlight security relevant changes

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-01-26 18:57:06 +01:00
Nils Adermann
5ce89ae82f [prep-release-3.0.13] Bump version numbers for 3.0.13 release 2015-01-26 18:08:31 +01:00
Nils Adermann
4b42589cfa [prep-release-3.0.13] Highlight security relevant changes 2015-01-26 17:53:43 +01:00
Andreas Fischer
7081b3e382 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:39 +01:00
Andreas Fischer
ffbe8cdc96 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:38 +01:00
Andreas Fischer
4c11ea97d5 Merge pull request #3339 from nickvergessen/ticket/12089
[ticket/12089] Add assert message on HTTP status code check

* nickvergessen/ticket/12089:
  [ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:36 +01:00
Joas Schilling
ed2d080551 [ticket/12089] Add assert message on HTTP status code check
PHPBB3-12089
2015-01-25 23:06:56 +01:00
kasimi
33d7eb69ef [ticket/13540] Added var row to both events
PHPBB3-13540
2015-01-25 13:01:02 +01:00
Marc Alexander
2e32fbd090 Merge branch 'develop-ascraeus' into develop 2015-01-24 21:53:20 +01:00
Marc Alexander
a2fbde44c0 Merge pull request #3336 from nickvergessen/ticket/13543
Ticket/13543
2015-01-24 21:52:56 +01:00
Joas Schilling
b2674cf1f6 [ticket/13543] Fix broken slow test
PHPBB3-13543
2015-01-24 21:10:53 +01:00
Joas Schilling
c423038587 [ticket/13543] Add slow tests to travis matrix
PHPBB3-13543
2015-01-24 21:10:35 +01:00
paulsohier
0cfa977953 [ticket/13542] Added sentenence of what is changed in the event
PHPBB3-13542
2015-01-24 20:26:51 +01:00
kasimi
12fba95892 [ticket/13540] Add core event for MCP topic review block data
Similar to the previous event, this event triggers for each post in the
MCP topic review.

PHPBB3-13540
2015-01-24 19:41:27 +01:00
paulsohier
c86e5e8514 [ticket/13542] Merge result of validation into existing $error
Because extensions can set a entry in $error, the result of the validate
needs to be merged into it.

PHPBB3-13542
2015-01-24 19:04:26 +01:00
paulsohier
b0383a90e1 [ticket/13542] Update core.ucp_prefs_personal_data to include $error
Update the event so extensions will be able to validate (and deny) changes.

PHPBB3-13542
2015-01-24 18:53:33 +01:00
Marc Alexander
a5c65449de [ticket/13538] Add tests for double nested pagination loop
PHPBB3-13538
2015-01-24 14:35:49 +01:00
Marc Alexander
ee03b4f1ef [ticket/13538] Fix tests for pagination in nested loop
PHPBB3-13538
2015-01-24 14:27:04 +01:00
Marc Alexander
874f3584e2 [ticket/13522] Remove unused variables and unexpected returns
PHPBB3-13522
2015-01-24 13:40:42 +01:00
Marc Alexander
9a03b3aab6 [ticket/13522] Remove empty answers from possible answers in Q&A
PHPBB3-13522
2015-01-24 13:09:00 +01:00
kasimi
a35fbdb3e9 [ticket/13540] Updated @since version to 3.4.1-RC1, fixed @var indentations
PHPBB3-13540
2015-01-24 12:23:10 +01:00
Marc Alexander
e2786c37dc Merge pull request #3179 from Nicofuma/ticket/13372
[ticket/13372] Fix Url Generator/Matcher generation
2015-01-24 10:05:34 +01:00
kasimi
40798ae616 [ticket/13540] Add core event for modifying topic review block data
Added event core.topic_review_modify_row in function topic_review() in
functions_posting for modifying template data blocks for topic reviews.

PHPBB3-13540
2015-01-24 02:09:29 +01:00
Joas Schilling
fc91616fad Merge branch 'develop-ascraeus' into develop 2015-01-23 17:32:57 +01:00
Joas Schilling
9cdbb69f9e Merge pull request #3321 from marc1706/ticket/13282
[ticket/13282] Use 0 as default for integer type columns in postgresql
2015-01-23 17:32:28 +01:00
Wolfsblvt
8a0c227bf9 [ticket/13537] Add core events on mcp_queue for approval and disapproval
Events added for the functions approve_posts(), approve_topics()
and disapprove_posts() in mcp_queue.php, so that you can send notifications
during approval and disapproval.

PHPBB3-13537
2015-01-23 13:01:34 +01:00
Wolfsblvt
b88b8305fd [ticket/13518] Add core event to markread() in functions.php
Adding core event core.markread_before to to funtion markread()
in functions.php, so that you now are able to add additional
stuff inside the markread process, for example notifications designed
in extensions.

PHPBB3-13518
2015-01-23 12:53:46 +01:00
Wolfsblvt
1dce9576e9 [ticket/13532] Add core event to get_unread_topics() in functions.php
Adding core event core.get_unread_topics_modify_sql to to funtion
get_unread_topics() in functions.php, so that you now are able to modify
the sql query that retrieves the unread topics.

PHPBB3-13532
2015-01-23 12:48:57 +01:00
Marc Alexander
7014d824f0 [ticket/13538] Add test for pagination in nested loop
PHPBB3-13538
2015-01-23 11:48:05 +01:00
rxu
25b013f781 [ticket/13336] Add core events to the function user_active_flip()
Add core events to the function user_active_flip() in
includes/functions_user.php to allow checking/modifying data while
activating/deactivating users.

PHPBB3-13336
2015-01-23 08:20:00 +07:00
Marc Alexander
eb4594d8ee [ticket/13282] Add unit test for adding integer column with default null
PHPBB3-13282
2015-01-22 23:17:59 +01:00
rxu
be1b114114 [ticket/13536] Add core events to allow modifying user profile data on editing
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744

PHPBB3-13536
2015-01-23 00:35:02 +07:00
Marc Alexander
bcf13551be Merge pull request #3275 from nickvergessen/ticket/13487
[ticket/13487] Add factory for db tool class
2015-01-22 18:16:30 +01:00
rxu
e08cd70a89 [ticket/13535] Add core event to allow modifying account settings on editing
Add ucp_profile.php core event to allow modifying account settings on editing.

PHPBB3-13535
2015-01-22 23:10:05 +07:00
Nils Adermann
f9f43141a9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13361] Rename exception to runtime_exception
  [ticket/13361] Fix the JsonResponse in the exception listener
  [ticket/13361] Add tests
  [ticket/13361] Support ajax request (send a json response)
  [ticket/13361] Improve the exception listener
2015-01-22 16:17:26 +01:00
Nils Adermann
40ab75478e Merge pull request #3173 from Nicofuma/ticket/13361
[ticket/13361] Improve the exception listener
2015-01-22 16:16:21 +01:00
Marc Alexander
47f04d7620 [ticket/13282] Add functional tests for adding profilefields
PHPBB3-13282
2015-01-22 10:30:24 +01:00
Marc Alexander
816465bfe9 [ticket/13282] Use strpos() instead of preg_match()
PHPBB3-13282
2015-01-22 10:11:08 +01:00
Marc Alexander
1367fc234f [ticket/13282] Use 0 as default for integer type columns in postgresql
PHPBB3-13282
2015-01-22 00:06:48 +01:00
Andreas Fischer
3bbddbb963 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13534] Set imagick path to empty string to prevent failing path check
2015-01-21 16:59:26 +01:00
Andreas Fischer
a737eeb6ce Merge pull request #3320 from marc1706/ticket/13534
[ticket/13534] Set imagick path to empty string to prevent failing path ...

* marc1706/ticket/13534:
  [ticket/13534] Set imagick path to empty string to prevent failing path check
2015-01-21 16:59:26 +01:00
Andreas Fischer
768d0a0641 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [develop-olympus] Increment version number to 3.0.14-dev.
  [develop-olympus] Add changelog for 3.0.13 release.
  [develop-olympus] Bump version numbers for 3.0.13-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.13 releases.
2015-01-21 16:07:22 +01:00
Andreas Fischer
7ed065a630 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.14-dev.
  [develop-olympus] Add changelog for 3.0.13 release.
  [develop-olympus] Bump version numbers for 3.0.13-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.13 releases.

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2015-01-21 16:07:12 +01:00
Marc Alexander
7d6fdcfaa5 [ticket/13534] Set imagick path to empty string to prevent failing path check
The imagick path defaults to /usr/bin. If it doesn't exist for some reason,
for example on travis, the form won't be submitted and the settings won't be
changed.

PHPBB3-13534
2015-01-21 15:18:25 +01:00
Andreas Fischer
14585fcb4f [develop-olympus] Increment version number to 3.0.14-dev. 2015-01-21 15:15:30 +01:00
Tristan Darricau
7fef91afd2 [ticket/13361] Rename exception to runtime_exception
PHPBB3-13361
2015-01-21 08:41:02 +01:00
Andreas Fischer
2c9e178a42 [develop-olympus] Add changelog for 3.0.13 release. 2015-01-21 01:45:23 +01:00
Andreas Fischer
9f7f366573 [develop-olympus] Bump version numbers for 3.0.13-RC1 release. 2015-01-21 01:32:18 +01:00
Andreas Fischer
c09023d1db [develop-olympus] Bumping version numbers to final for 3.0.13 releases. 2015-01-21 01:25:50 +01:00
Nils Adermann
28b2bbca16 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13531] Send 404 Not Found.
  [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
2015-01-21 01:07:46 +01:00
Nils Adermann
ddeb696b25 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13531] Send 404 Not Found.
  [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
2015-01-21 01:07:30 +01:00
Nils Adermann
eaeb88133f Merge pull request #3316 from bantu/ticket/13531
[ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
2015-01-21 01:05:13 +01:00
Andreas Fischer
e34b92882a [ticket/13531] Send 404 Not Found.
PHPBB3-13531
2015-01-21 01:02:16 +01:00
Marc Alexander
4b9434bf1b [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
PHPBB3-13531
2015-01-21 01:02:08 +01:00
Tristan Darricau
5307f47654 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13133] Fix variable name in set_custom_style()
2015-01-20 23:48:24 +01:00
Tristan Darricau
08e186af8e Merge pull request #3314 from VSEphpbb/ticket/13133
[ticket/13133] Fix variable name in set_custom_style()

* VSEphpbb/ticket/13133:
  [ticket/13133] Fix variable name in set_custom_style()
2015-01-20 23:47:44 +01:00
Tristan Darricau
fd25d00fac Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13530] Fix undefined variables
2015-01-20 23:44:17 +01:00
Tristan Darricau
f6057c5eab Merge pull request #3315 from nickvergessen/ticket/13530
[ticket/13530] Fix undefined variables

* nickvergessen/ticket/13530:
  [ticket/13530] Fix undefined variables
2015-01-20 23:43:57 +01:00
Tristan Darricau
f8c3440344 Merge pull request #3313 from nickvergessen/ticket/13528
[ticket/13528] Return correct translation instead of is_set()

* nickvergessen/ticket/13528:
  [ticket/13528] Return correct translation instead of is_set()
2015-01-20 23:37:38 +01:00
Joas Schilling
ed6b8f84ad [ticket/13530] Fix undefined variables
PHPBB3-13530
2015-01-20 23:36:45 +01:00
Tristan Darricau
9334100cb3 Merge pull request #3313 from nickvergessen/ticket/13528
[ticket/13528] Return correct translation instead of is_set()

* nickvergessen/ticket/13528:
  [ticket/13528] Return correct translation instead of is_set()
2015-01-20 23:36:23 +01:00
Joas Schilling
b566686b51 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php
2015-01-20 23:32:36 +01:00
Joas Schilling
a5fae1b1f0 Merge pull request #3293 from Nicofuma/ticket/13489
[ticket/13489] Disable the event dispatcher in the migrator
2015-01-20 23:27:54 +01:00
Matt Friedman
41966c481f [ticket/13133] Fix variable name in set_custom_style()
PHPBB3-13133
2015-01-20 14:21:02 -08:00
Andreas Fischer
c71e8ffb29 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.
  [ticket/13526] Correctly validate the ucp_pm_options form key.
2015-01-20 23:15:29 +01:00
Andreas Fischer
d0e5c0a187 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.

Conflicts:
	phpBB/includes/acp/acp_update.php
2015-01-20 23:15:21 +01:00
Andreas Fischer
d17904884e Merge pull request #3312 from bantu/ticket/13527
[ticket/13527] Escape information received from version server

* bantu/ticket/13527:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.
2015-01-20 23:14:38 +01:00
Andreas Fischer
6e00529f36 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13526] Correctly validate the ucp_pm_options form key.
2015-01-20 23:12:53 +01:00
Andreas Fischer
a8027c542f Merge pull request #3311 from bantu/ticket/13526
[ticket/13526] Correctly validate the ucp_pm_options form key.

* bantu/ticket/13526:
  [ticket/13526] Correctly validate the ucp_pm_options form key.
2015-01-20 23:12:00 +01:00
Andreas Fischer
5069da8d52 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13519] Correctly validate imagick path as path and not string
2015-01-20 23:11:40 +01:00
Andreas Fischer
4d0b04a397 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string

Conflicts:
	phpBB/includes/acp/acp_attachments.php
2015-01-20 23:11:29 +01:00
Andreas Fischer
3134b6b70e Merge pull request #3306 from marc1706/ticket/13519
[ticket/13519] Correctly validate imagick path as path and not string

* marc1706/ticket/13519:
  [ticket/13519] Correctly validate imagick path as path and not string
2015-01-20 23:10:19 +01:00
Joas Schilling
d1bff80dd1 [ticket/13528] Return correct translation instead of is_set()
PHPBB3-13528
2015-01-20 22:56:33 +01:00
Joas Schilling
5d69f6159c Merge branch 'develop-ascraeus' into develop 2015-01-20 22:50:30 +01:00
Joas Schilling
f02dc44a23 Merge pull request #3138 from prototech/ticket/12642
[ticket/12642] Ensure CPF type specific options are set when editing booleans.
2015-01-20 22:46:08 +01:00
Andreas Fischer
92b5222295 [ticket/13527] Apply htmlspecialchars() to data from version server.
PHPBB3-13527
2015-01-20 22:40:39 +01:00
Andreas Fischer
251868dd7e [ticket/13527] Remove two unused variables.
PHPBB3-13527
2015-01-20 22:34:14 +01:00
Joas Schilling
23069a13e2 [ticket/13526] Correctly validate the ucp_pm_options form key.
PHPBB3-13526
2015-01-20 22:16:24 +01:00
Joas Schilling
358ca14ade Merge branch 'develop-ascraeus' into develop 2015-01-20 20:58:21 +01:00
Joas Schilling
40006376f2 Merge pull request #3226 from prototech/ticket/13420
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
2015-01-20 20:58:12 +01:00
Joas Schilling
e289f7fa20 Merge branch 'develop-ascraeus' into develop 2015-01-20 20:50:10 +01:00
Joas Schilling
e66a28eb14 Merge branch 'develop-olympus' into develop-ascraeus
Conflicts:
	.travis.yml
2015-01-20 20:49:45 +01:00
Joas Schilling
03e3ee7f16 Merge pull request #3310 from bantu/ticket/13523
[ticket/13523] Install PHPUnit manually instead of from PEAR.
2015-01-20 20:47:36 +01:00
Andreas Fischer
0beb9128f9 [ticket/13523] Install PHPUnit manually instead of from PEAR.
The pear.phpunit.de channel has been shut down in 2014.

PHPBB3-13523
2015-01-20 20:31:08 +01:00
Joas Schilling
2dcce57806 Merge branch 'develop-ascraeus' into develop 2015-01-20 17:31:24 +01:00
Joas Schilling
d99cd2d02e Merge pull request #3278 from rxu/ticket/13492
[ticket/13492] Fix IDN support for custom BBCode URL tokens
2015-01-20 17:31:06 +01:00
Tristan Darricau
dab0728357 [ticket/13489] Fix service configuration
PHPBB3-13489
2015-01-20 14:19:55 +01:00
rxu
8002af7526 [ticket/13492] Add the migration to update custom bbcodes with IDN regexps
Also fix the $utf8 checking regexp removing the curly braces.

PHPBB3-13492
2015-01-20 08:47:56 +07:00
Andreas Fischer
2535e9da00 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13504] Fix invalid variable $user
2015-01-19 23:23:57 +01:00
Andreas Fischer
38c5ee6eec Merge pull request #3308 from nickvergessen/ticket/13504
[ticket/13504] Fix invalid variable $user

* nickvergessen/ticket/13504:
  [ticket/13504] Fix invalid variable $user
2015-01-19 23:23:57 +01:00
Nils Adermann
c19fb8e2c9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10985] Add fix to properly inherit style during update process
2015-01-19 22:29:50 +01:00
Nils Adermann
e4a041fedb Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10985] Add fix to properly inherit style during update process

Conflicts:
	phpBB/includes/bbcode.php
2015-01-19 22:29:38 +01:00
Nils Adermann
ebbe6a7791 Merge pull request #2990 from Senky/ticket/10985
[ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
2015-01-19 22:27:14 +01:00
Joas Schilling
7e8bb68999 [ticket/13504] Fix invalid variable $user
PHPBB3-13504
2015-01-19 21:42:22 +01:00
Joas Schilling
54e3b14583 Merge branch 'develop-ascraeus' into develop 2015-01-19 21:37:25 +01:00
Joas Schilling
ff39ffacf6 Merge pull request #3296 from PayBas/ticket/13431
[ticket/13431] Fix responsive RTL media queries for <IE11
2015-01-19 21:37:14 +01:00
Joas Schilling
8e75133d79 Merge branch 'develop-ascraeus' into develop 2015-01-19 21:14:02 +01:00
Joas Schilling
c29db8e7a4 Merge pull request #3294 from PayBas/ticket/13507
[ticket/13507] Fix horizontal scrollbar for large images in posts
2015-01-19 21:13:41 +01:00
Marc Alexander
6564446b0f [ticket/13519] Correctly validate imagick path as path and not string
PHPBB3-13519
2015-01-19 20:47:47 +01:00
Tristan Darricau
a537bf9619 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
2015-01-19 17:52:37 +01:00
Tristan Darricau
add3d3e760 Merge pull request #3055 from marc1706/ticket/13192
[ticket/13192] Add method for generating valid user page links based on mod_rewrite

* marc1706/ticket/13192:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
2015-01-19 16:45:43 +01:00
Marc Alexander
da189a105b [ticket/13192] Add test for app.php in external subfolder
PHPBB3-13192
2015-01-19 16:10:32 +01:00
Tristan Darricau
6842831d6b [ticket/13513] Use paths relative to the phpBB root in the router
PHPBB3-13513
2015-01-17 11:40:10 +01:00
rxu
10c67fe12a [ticket/13512] Add template events before/after the post details
Add template events to viewtopic_body.html to allow extensions adding content
before/after the post details.

PHPBB3-13512
2015-01-17 16:40:09 +07:00
Andreas Fischer
52ab23626f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13511] Call the check() method with the phpcsFile object
2015-01-17 01:20:40 +01:00
Andreas Fischer
9d2c6b6ed6 Merge pull request #3299 from Nicofuma/ticket/13511
[ticket/13511] Call the check() method with the phpcsFile object

* Nicofuma/ticket/13511:
  [ticket/13511] Call the check() method with the phpcsFile object
2015-01-17 01:20:40 +01:00
Tristan Darricau
6b92fccd06 [ticket/13511] Call the check() method with the phpcsFile object
PHPBB3-13511
2015-01-17 00:09:06 +01:00
PayBas
4e5e356555 [ticket/13431] Fix responsive RTL media queries for <IE11
PHPBB3-13431
2015-01-16 19:25:45 +01:00
PayBas
9e38e9dc6f [ticket/13507] Fix horizontal scrollbar for large images in posts
PHPBB3-13507
2015-01-16 19:10:04 +01:00
Tristan Darricau
0344e61b8c Merge pull request #3237 from MGaetan89/ticket/12487
[ticket/12487] Update PHP code

* MGaetan89/ticket/12487:
  [ticket/12487] Update PHP code
2015-01-16 10:05:23 +01:00
Oliver Schramm
c6557e3800 [ticket/13313] Update version in @since tag of event
PHPBB3-13313
2015-01-15 22:08:10 +01:00
Tristan Darricau
f616d9169e Merge pull request #3290 from MGaetan89/ticket/13499
[ticket/13499] Move get_remote_file() to functions_compatibility.php

* MGaetan89/ticket/13499:
  [ticket/13499] Move `get_remote_file()` to `functions_compatibility.php`
2015-01-15 21:52:21 +01:00
Gaëtan Muller
17daaaf441 [ticket/13499] Move get_remote_file() to functions_compatibility.php
PHPBB3-13499
2015-01-15 18:55:51 +01:00
Tristan Darricau
98937a7a18 Merge pull request #3289 from MGaetan89/ticket/13450
[ticket/13450] Type-hint return value of $phpbb_container->get()

* MGaetan89/ticket/13450:
  [ticket/13450] Type-hint return value of $phpbb_container->get()
2015-01-14 12:34:28 +01:00
Tristan Darricau
ce47170c29 [ticket/13489] Update migrations
PHPBB3-13489
2015-01-14 12:16:24 +01:00
Tristan Darricau
4df125625c [ticket/13489] Fix tests
PHPBB3-13489
2015-01-14 12:04:30 +01:00
Tristan Darricau
8ef238ea73 [ticket/13361] Fix the JsonResponse in the exception listener
PHPBB3-13361
2015-01-14 11:13:28 +01:00
Tristan Darricau
c99ed64473 [ticket/13489] Disable the event dispatcher in the migrator
PHPBB3-13489
2015-01-14 11:09:44 +01:00
Joas Schilling
853733a0eb Merge branch 'develop-ascraeus' into develop 2015-01-13 23:31:37 +01:00
Joas Schilling
e3e16a0166 Merge pull request #3234 from brunoais/ticket/13154
[ticket/13154] Event to edit user list for notification in notifications
2015-01-13 23:31:28 +01:00
Joas Schilling
26beafa564 Merge branch 'develop-ascraeus' into develop 2015-01-13 23:29:25 +01:00
Joas Schilling
2a08c60a62 Merge pull request #3233 from brunoais/ticket/13160
[ticket/13160] Viewtopic; before viewing permissions event
2015-01-13 23:27:30 +01:00
Joas Schilling
ae54d3d01f Merge branch 'develop-ascraeus' into develop 2015-01-12 23:56:48 +01:00
Joas Schilling
b27c0ab992 Merge pull request #3283 from Elsensee/ticket/13490
[ticket/13490] Allow multibyte characters in edit reason
2015-01-12 23:56:35 +01:00
Marc Alexander
aeafbb5c62 Merge pull request #3286 from MGaetan89/ticket/13498
[ticket/13498] Change get_user_avatar() calls with phpbb_get_avatar()
2015-01-12 21:44:06 +01:00
Gaëtan Muller
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get()
PHPBB3-13450
2015-01-12 20:19:07 +01:00
Gaëtan Muller
35d37fdff4 [ticket/13498] Update calls to get_user_avatar()
PHPBB3-13498
2015-01-11 21:09:21 +01:00
Oliver Schramm
3bfd87cda4 [ticket/13313] Add event core.acp_email_display
PHPBB3-13313
2015-01-11 20:55:00 +01:00
Oliver Schramm
53169b1303 [ticket/13469] Fall back to soft_delete if no permissions for delete
PHPBB3-13469
2015-01-11 20:46:32 +01:00
brunoais
1d49ccd920 [ticket/13160] New line before comment block
PHPBB3-13160
2015-01-11 19:12:08 +00:00
Oliver Schramm
f075fb78f6 [ticket/13490] Allow multibyte characters in edit reason
PHPBB3-13490
2015-01-11 19:29:33 +01:00
rxu
17f4dce0fc [ticket/13492] Add IDN support for custom BBCode URL tokens
Custom BBCode URL tokens does not support IDN.
Custom BBCodes added earlier than IDN has been applied are unaffected.

PHPBB3-13492
2015-01-11 20:36:22 +07:00
Gaëtan Muller
63da128ee5 [ticket/12487] Update PHP code
PHPBB3-12487
2015-01-11 13:22:59 +01:00
Tristan Darricau
1f4bb2c149 [ticket/13361] Add tests
PHPBB3-13361
2015-01-11 11:28:45 +01:00
Dhruv
ef1be6e247 Merge branch 'develop-ascraeus' into develop 2015-01-11 15:43:51 +05:30
Dhruv Goel
e8464d7fe2 Merge pull request #3276 from nickvergessen/ticket/13272
[ticket/13272] Add vendor/ folder to "changed files" package
2015-01-11 15:42:58 +05:30
Dhruv
54b8c1626e Merge branch 'develop-ascraeus' into develop 2015-01-11 14:44:11 +05:30
Dhruv Goel
fbf7726642 Merge pull request #3176 from Senky/ticket/13346
[ticket/13346] Fix indentation, spacing and missing divs
2015-01-11 14:42:40 +05:30
Dhruv
ff59240748 [ticket/13472] Delete admin activation notification when deleting user
PHPBB3-13472
2015-01-11 14:09:59 +05:30
Joas Schilling
93b3e72f54 Merge branch 'develop-ascraeus' into develop 2015-01-10 22:01:30 +01:00
Joas Schilling
bfba52781b Merge pull request #3210 from brunoais/ticket/13147
[ticket/13147] Change get_global_visibility_sql()'s results
2015-01-10 22:00:07 +01:00
Joas Schilling
659e15656f [ticket/13272] Add vendor/ folder to "changed files" package
PHPBB3-13272
2015-01-10 21:17:16 +01:00
Jakub Senko
10e72a36a3 [ticket/13346] Remove unnecessary divs
PHPBB3-13346
2015-01-10 21:05:30 +01:00
brunoais
e0733ae435 [ticket/13147] New line before comment block
PHPBB3-13147
2015-01-10 17:15:54 +00:00
brunoais
ef9abd7165 [ticket/13147] Override variable name changed by request
PHPBB3-13147
2015-01-10 17:15:22 +00:00
brunoais
9cc4d60b88 [ticket/13146] Remove empty line
PHPBB3-13146
2015-01-10 17:08:46 +00:00
brunoais
ec749a2b39 [ticket/13146] "Make it" -> "Set it to"
PHPBB3-13146
2015-01-10 17:08:46 +00:00
brunoais
6d3fca9a41 [ticket/13146] Forced line feed on long line
PHPBB3-13146
2015-01-10 17:08:45 +00:00
brunoais
9cbb9b4253 [ticket/13146] Fixed wrong tab + space into only tab
PHPBB3-13146
2015-01-10 17:08:44 +00:00
brunoais
fce1be2684 [ticket/13160] Appending "_check" to override variable names
PHPBB3-13160
2015-01-10 17:08:43 +00:00
brunoais
f02e3a4076 [ticket/13160] lowercase null
PHPBB3-13160
2015-01-10 17:08:43 +00:00
brunoais
3d8aaf6aaf [ticket/13160] Wrong variable types fixed
PHPBB3-13160
2015-01-10 17:08:42 +00:00
brunoais
ffb7d618ac [ticket/13160] Removed an unwanted tab char.
PHPBB3-13160
2015-01-10 17:08:41 +00:00
brunoais
11269fe62a [ticket/13160] Allow override topic_tracking_info
PHPBB3-13160
2015-01-10 17:08:40 +00:00
brunoais
a5a6855a0d [ticket/13160] Allow override f_read and forum password
Adds a couple of variables to the event that allows  extension authors to
bypass the f_read and forum password checks as if the user had those permissions
whether or not he actually has them.

PHPBB3-13160
2015-01-10 17:08:40 +00:00
brunoais
a0287a62c1 [ticket/13160] Viewtopic; before viewing permissions event
An event before the f_Read permissions check in viewtopic

PHPBB3-13160
2015-01-10 17:08:39 +00:00
brunoais
2b76d7dc7c [ticket/13154] Don't assign dispatcher to a variable. Just the obj param.
PHPBB3-13154
2015-01-10 17:06:51 +00:00
Tristan Darricau
74e8f9bd4e [ticket/13361] Support ajax request (send a json response)
PHPBB3-13361
2015-01-10 17:14:14 +01:00
Marc Alexander
b4a2beff24 Merge branch 'develop-ascraeus' into develop 2015-01-10 16:25:44 +01:00
Marc Alexander
a415a4ec2b Merge pull request #3274 from nickvergessen/ticket/13486
[ticket/13486] Fix typo in method name
2015-01-10 16:25:27 +01:00
Joas Schilling
11b6bc5722 [ticket/13487] Add factory for db tool class
This allows us to split up the large file one by one easily.

PHPBB3-13487
2015-01-10 16:25:24 +01:00
Joas Schilling
f756632185 [ticket/13486] Fix typo in method name
PHPBB3-13486
2015-01-10 15:14:58 +01:00
Marc Alexander
45ccd2d44a Merge branch 'develop-ascraeus' into develop 2015-01-10 13:18:21 +01:00
Marc Alexander
c28ef9afdd Merge pull request #3195 from nickvergessen/ticket/13238-asc
[ticket/13238] Do not drop indexes that do not exist from fulltext search
2015-01-10 13:17:59 +01:00
Marc Alexander
86620c1e80 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
2015-01-10 13:12:03 +01:00
Marc Alexander
ba477f77c7 Merge pull request #3272 from nickvergessen/ticket/13307
[ticket/13307] Update mysql_upgrader.php to work without the schema_data...
2015-01-10 13:06:46 +01:00
brunoais
8ed5a047ec [ticket/13147] Wrong extra new line
PHPBB3-13147
2015-01-10 11:48:01 +00:00
Marc Alexander
e6509aaf60 [ticket/13192] Use ltrim() instead of preg_replace()
PHPBB3-13192
2015-01-10 12:46:40 +01:00
brunoais
9caec668af [ticket/13147] Renaming content_replaced->get_global_visibility_sql_overwrite
Renamed content_replaced to get_global_visibility_sql_overwrite in order to
follow the convention in other events' variables that have the same basic
function

PHPBB3-13147
2015-01-10 11:44:55 +00:00
brunoais
a09c38f1cc [ticket/13147] Removing globals and using injection
Using globals is NG. Using a parameter instead.

PHPBB3-13147
2015-01-10 11:44:54 +00:00
brunoais
0f6a0d820e [ticket/13147] Using $phpbb_dispatcher global var
PHPBB3-13147
2015-01-10 11:44:54 +00:00
brunoais
8f5e3d5efb [ticket/13147] Allow changing the result of calling get_global_visibility_sql
PHPBB3-13147
2015-01-10 11:44:52 +00:00
Marc Alexander
3cfbe7bb4f Merge branch 'develop-ascraeus' into develop 2015-01-10 12:37:11 +01:00
Marc Alexander
67c987f0d0 Merge pull request #3166 from nickvergessen/Senky-ticket/12866
[ticket/12866] Wrong profile field validation options
2015-01-10 12:36:49 +01:00
Joas Schilling
56eae4660c Merge branch 'develop-ascraeus' into develop 2015-01-10 12:30:06 +01:00
Joas Schilling
bf59d8dd74 Merge pull request #3209 from brunoais/ticket/13146
[ticket/13146] Allow changing the result of calling get_forums_visibility_sql
2015-01-10 12:29:48 +01:00
brunoais
cea35c486c [ticket/13146] Removed stray empty line
PHPBB3-13146
2015-01-10 09:55:43 +00:00
brunoais
b64d8c59b0 [ticket/13146] dispatcher, not phpbb_dispatcher
PHPBB3-13146
2015-01-10 09:18:03 +00:00
brunoais
349aaab6ac [ticket/13146] Even more missing phpbb_mock_event_dispatcher()
PHPBB3-13146
2015-01-10 08:32:22 +00:00
brunoais
da9ac2da72 [ticket/13146] Last missing phpbb_mock_event_dispatcher()
Thank you nickvergessen

PHPBB3-13146
2015-01-10 08:11:51 +00:00
Joas Schilling
6b328912ce Merge branch 'develop-ascraeus' into develop 2015-01-10 00:12:59 +01:00
Joas Schilling
8ae1b0c52e Merge pull request #3189 from rxu/ticket/12926
[ticket/12926] Support for IDN (IRI)
2015-01-10 00:09:57 +01:00
Joas Schilling
a8259f7c82 Merge branch 'develop-ascraeus' into develop 2015-01-09 21:41:32 +01:00
Joas Schilling
58d8ea5b0b Merge pull request #3265 from tas2580/develop-ascraeus
[ticket/13453] Sort param in Canonical URL
2015-01-09 21:41:19 +01:00
rxu
d86bdcb2a7 [ticket/12926] Get rid of the $scheme and $inline vars, fix regex_idn.php
Get rid of the $scheme and $inline vars, fix regex_idn.php to generate
both common and inline mode regexes all at once.

PHPBB3-12926
2015-01-10 03:21:36 +07:00
Joas Schilling
d2a4d6624f [ticket/13307] Update mysql_upgrader.php to work without the schema_data.php
The file has been delete quite some time ago.

PHPBB3-13307
2015-01-09 19:46:14 +01:00
Joas Schilling
1981f4f966 Merge branch 'develop-ascraeus' into develop 2015-01-09 18:39:26 +01:00
Joas Schilling
d9bdd05c80 Merge pull request #3128 from omniError/ticket/13306
[ticket/13306] add error level to collector
2015-01-09 18:39:11 +01:00
Joas Schilling
a5007b7abd Merge branch 'develop-ascraeus' into develop 2015-01-09 18:12:02 +01:00
Joas Schilling
3350df131f Merge pull request #3227 from prototech/ticket/13366
[ticket/13366] Ensure plupload_last_gc config entry is dynamic.
2015-01-09 18:11:41 +01:00
Joas Schilling
88c86ff324 Merge branch 'develop-ascraeus' into develop 2015-01-09 18:07:03 +01:00
Joas Schilling
9ce8b62894 Merge pull request #3242 from lavigor/ticket/13442
[ticket/13442] UTF-8 symbols for database host
2015-01-09 18:07:00 +01:00
Joas Schilling
8f5bbc95dc Merge branch 'develop-ascraeus' into develop 2015-01-09 18:03:34 +01:00
Joas Schilling
65ffc76e2f Merge pull request #3258 from marc1706/ticket/13385
[ticket/13385] Free result in \phpbb\config\db::set_atomic()
2015-01-09 18:03:21 +01:00
Joas Schilling
24058dfefc Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/includes/bbcode.php
2015-01-09 17:49:30 +01:00
Joas Schilling
b64da23fe1 Merge pull request #3267 from Elsensee/ticket/13478
[ticket/13478] Add event core.bbcode_cache_init_end
2015-01-09 17:47:46 +01:00
Joas Schilling
ff44579523 Merge branch 'develop-ascraeus' into develop 2015-01-09 17:41:47 +01:00
Joas Schilling
67c9f4d064 Merge pull request #3268 from Elsensee/ticket/13470
[ticket/13470] Fix non-empty username array if no usernames are given
2015-01-09 17:41:42 +01:00
Joas Schilling
b9c10e34bb Merge branch 'develop-ascraeus' into develop 2015-01-09 17:36:25 +01:00
Joas Schilling
d4c078cc78 Merge pull request #3271 from marc1706/ticket/13432
[ticket/13432] Make sure to add language file when including acp_modules
2015-01-09 17:36:07 +01:00
Marc Alexander
9d9c57f334 [ticket/13432] Make sure to add language file when including acp_modules
PHPBB3-13432
2015-01-09 13:47:36 +01:00
Marc Alexander
38f184ad6b [ticket/13385] Remove unneeded $result in \phpbb\config\db::set_atomic()
PHPBB3-13385
2015-01-09 13:41:36 +01:00
Marc Alexander
7ba1a96427 [ticket/13192] Order test cases consistently
PHPBB3-13192
2015-01-09 13:38:52 +01:00
Oliver Schramm
e3571fc6eb [ticket/13470] Fix non-empty username array if no usernames are given
PHPBB3-13470
2015-01-08 22:17:05 +01:00
Oliver Schramm
953a98dc0b [ticket/13478] Add event core.bbcode_cache_init_end
PHPBB3-13478
2015-01-08 00:13:58 +01:00
Tobi Schäfer
de3d7aca16 [ticket/13453] Sort param in Canonical URL
PHPBB3-13453
2015-01-06 15:31:27 +01:00
brunoais
346f654b2e [ticket/13146] Use the correct phpbb_mock_event_dispatcher, instead of builder
PHPBB3-13146
2015-01-06 12:58:01 +00:00
Joas Schilling
778c8e89d3 Merge branch 'develop-ascraeus' into develop 2015-01-06 11:29:18 +01:00
Joas Schilling
87578e90eb Merge pull request #3262 from Elsensee/ticket/13466
[ticket/13466] Add bitfield and uid to event core.message_parser_check_message
2015-01-06 11:29:11 +01:00
Joas Schilling
ba90746ce5 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-01-06 11:25:26 +01:00
Joas Schilling
874356e57f Merge pull request #3243 from kinerity/ticket/13437
[ticket/13437] Add template event viewtopic_body_post_author_before/after
2015-01-06 11:24:25 +01:00
Joas Schilling
1ed61fc39f Merge branch 'develop-ascraeus' into develop 2015-01-06 11:08:06 +01:00
Joas Schilling
26bf79425c Merge pull request #3231 from rxu/ticket/13435
[ticket/13435] Add core event to modify submit_post() sql data
2015-01-06 11:08:01 +01:00
Joas Schilling
ba11a91524 Merge branch 'develop-ascraeus' into develop 2015-01-06 11:05:12 +01:00
Joas Schilling
d36b0452bd Merge pull request #3230 from omniError/ticket/13430
[ticket/13430] Add event core.prune_sql
2015-01-06 11:05:08 +01:00
Joas Schilling
2edf947415 Merge branch 'develop-ascraeus' into develop 2015-01-06 11:01:53 +01:00
Joas Schilling
64d880a15c Merge branch 'Wolfsblvt-ticket/13428' into develop-ascraeus 2015-01-06 11:01:40 +01:00
Wolfsblvt
387e4b942b [ticket/13428] Add core events to memberlist.php for teampage
PHPBB3-13428
2015-01-06 11:01:18 +01:00
Joas Schilling
d9109355a3 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:48:34 +01:00
Joas Schilling
6fd8f1b835 Merge pull request #3221 from MasterShredder/ticket/13422
[ticket/13422] New events for save custom cookies and set custom ban type
2015-01-06 10:48:14 +01:00
Joas Schilling
93a85a65d0 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:43:37 +01:00
Joas Schilling
2dab3c8c52 Merge pull request #3211 from brunoais/ticket/13148
[ticket/13148] Creating a final way to modify edit logs output
2015-01-06 10:25:10 +01:00
Joas Schilling
2fae00c433 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:04:58 +01:00
Joas Schilling
35b7f94754 Merge pull request #3070 from brunoais/ticket/13141
[Event] Allow applying additional permissions to MCP access besides f_read
2015-01-06 10:04:51 +01:00
Oliver Schramm
2532583765 [ticket/13466] Add bitfield and uid to event core.message_parser_check_message
PHPBB3-13466
2015-01-05 22:15:56 +01:00
Joas Schilling
ef00adac8b Merge branch 'develop-ascraeus' into develop 2015-01-05 20:40:15 +01:00
Joas Schilling
7a34bf9bf5 Merge pull request #3244 from rxu/ticket/13449
[ticket/13449] Add viewforum event after the topic's been assigned to template
2015-01-05 20:39:58 +01:00
Marc Alexander
281cc53532 [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
PHPBB3-13192
2015-01-04 17:41:02 +01:00
Marc Alexander
3aad3f0b3f Merge branch 'develop-ascraeus' into develop 2015-01-04 12:21:28 +01:00
Marc Alexander
3638b2ff64 Merge pull request #3254 from VSEphpbb/ticket/13440
[ticket/13440] Update event version to 3.1.3-RC1
2015-01-04 12:21:09 +01:00
Marc Alexander
7b84b8bba8 Merge branch 'develop-ascraeus' into develop 2015-01-04 11:26:00 +01:00
Marc Alexander
8c27c7f10b Merge pull request #3253 from VSEphpbb/ticket/13439
[ticket/13439] Update event version to 3.1.3-RC1
2015-01-04 11:25:43 +01:00
Matt Friedman
88034ea2f0 [ticket/13440] Update event version to 3.1.3-RC1
PHPBB3-13440
2015-01-04 01:40:18 -08:00
Matt Friedman
86f66b5f72 [ticket/13439] Update event version to 3.1.3-RC1
PHPBB3-13439
2015-01-04 01:38:50 -08:00
Marc Alexander
dc39ccf525 Merge branch 'develop-ascraeus' into develop 2015-01-04 00:56:22 +01:00
Marc Alexander
838b1250f6 Merge pull request #3249 from VSEphpbb/ticket/13440
[ticket/13440] Add event core.login_box_failed
2015-01-04 00:43:11 +01:00
Marc Alexander
4749dbbc1a Merge branch 'develop-ascraeus' into develop 2015-01-04 00:39:21 +01:00
Marc Alexander
4da3d41083 Merge pull request #3248 from VSEphpbb/ticket/13439
[ticket/13439] Add event core.acp_users_overview_before
2015-01-04 00:25:20 +01:00
Matt Friedman
9d9b8139d0 [ticket/13440] Add event core.login_box_failed
PHPBB3-13440
2015-01-03 15:23:50 -08:00
Matt Friedman
179a7a4c71 [ticket/13439] Add event core.acp_users_overview_before
PHPBB3-13439
2015-01-03 15:21:47 -08:00
rxu
970ed40b09 [ticket/13449] Add viewforum event after the topic's been assigned to template
PHPBB3-13449
2015-01-03 20:12:47 +07:00
Marc Alexander
ddceaee772 Merge branch 'develop-ascraeus' into develop 2015-01-03 13:46:47 +01:00
Gaëtan Muller
0e0c649477 [ticket/13441] Functions_convert fails to set global moderators default group
PHPBB3-13441
2015-01-03 13:45:52 +01:00
brunoais
b3bcc1b501 [ticket/13146] Missing delete post test mock
PHPBB3-13146
2015-01-02 19:26:05 +00:00
Kailey Truscott
652a7630bb [ticket/13437] Change "View" to "view"
PHPBB3-13437
2015-01-02 10:38:56 -05:00
Kailey Truscott
7dad863a41 Fix events.md event name
PHPBB3-13437
2015-01-02 10:20:36 -05:00
Kailey Truscott
c61fa1aaa1 [ticket/13437] Add template event viewtopic_body_post_author_before/after
PHPBB3-13437
2015-01-02 10:00:01 -05:00
brunoais
8376a027a1 [ticket/13146] Setup mocks for tests with dispatcher
PHPBB3-13146
2015-01-02 11:46:03 +00:00
lavigor
d769e59090 [ticket/13442] UTF-8 symbols for database host
Added support for cyrillic domains as database hosts.

PHPBB3-13442
2015-01-02 14:21:05 +03:00
brunoais
abc5dbcd71 [ticket/13146] Realign variables and descriptions in event
PHPBB3-13146
2014-12-29 08:42:13 +00:00
brunoais
59ab09273f [ticket/13146] Improved $get_forums_visibility_sql_overwrite's clarity
PHPBB3-13146
2014-12-29 08:40:23 +00:00
brunoais
92d7c16782 [ticket/13148] Wrong version num; copy & paste fail
PHPBB3-13148
2014-12-29 08:23:31 +00:00
brunoais
0104188074 [ticket/13148] Fixed my error
PHPBB3-13148
2014-12-28 20:35:16 +00:00
brunoais
d455dd68f6 [ticket/13148] Fixed syntax error
PHPBB3-13148
2014-12-28 20:25:36 +00:00
brunoais
cf036ea0e8 [ticket/13148] Added more variables as requested
Added more variables as requested and some extra that may be of use.

PHPBB3-13148
2014-12-28 19:52:58 +00:00
MasterShredder
655d95002c [ticket/13422] Renamed event
PHPBB3-13422
2014-12-28 13:20:04 +04:00
MasterShredder
0a1f8388d0 [ticket/13422] Changed some spaces to tabs
PHPBB3-13422
2014-12-28 03:44:07 +04:00
MasterShredder
3f88be6527 [ticket/13422] Changed variable descriptions
PHPBB3-13422
2014-12-28 03:35:21 +04:00
MasterShredder
50ed202aac [ticket/13422] Renamed "continue" variable to "retain_cookie" for the event core.ucp_save_custom_cookies
PHPBB3-13422
2014-12-27 17:43:30 +04:00
Joas Schilling
b9a539a06b Merge branch 'develop-ascraeus' into develop 2014-12-27 14:22:52 +01:00
Joas Schilling
a92589436a Merge pull request #3213 from brunoais/ticket/13158
[ticket/13158] Allow adding extra auth checks when the user is posting
2014-12-27 14:22:48 +01:00
Joas Schilling
dbbcf3f372 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:17:03 +01:00
Joas Schilling
b0f1a0f4bb Merge pull request #3229 from n-aleha/ticket/13098
[ticket/13098] Repair Yahoo contact field
2014-12-27 14:16:55 +01:00
Joas Schilling
7b0809414f Merge branch 'develop-ascraeus' into develop 2014-12-27 14:12:31 +01:00
Joas Schilling
6ff0aaaa70 Merge pull request #3225 from prototech/ticket/13302
[ticket/13302] Fix incorrect links to phpBB.com resources
2014-12-27 14:12:23 +01:00
Joas Schilling
cf8904bc2c Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/mcp_front.html
2014-12-27 14:09:38 +01:00
Joas Schilling
ffbe1d424b Merge pull request #3224 from prototech/ticket/13427
[ticket/13427] Add several before/after template events to mcp_front.html
2014-12-27 14:08:51 +01:00
Joas Schilling
8049b5fd97 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:07:43 +01:00
Joas Schilling
a5922a0e8b Merge pull request #3223 from prototech/ticket/13370
[ticket/13370] Allow calling class method in convertor framework directly
2014-12-27 14:07:37 +01:00
Joas Schilling
fbe0f04132 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/overall_footer.html
2014-12-27 14:03:34 +01:00
Joas Schilling
fa06c7967e Merge pull request #3218 from rxu/ticket/13419
[ticket/13419] Add the lowermost template event
2014-12-27 14:02:39 +01:00
Joas Schilling
228fda0f03 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:01:11 +01:00
Joas Schilling
d5f99e0478 Merge pull request #3216 from kinerity/ticket/13409
[ticket/13409] Add event core.search_modify_param_before
2014-12-27 14:01:05 +01:00
Joas Schilling
344311481f Merge branch 'develop-ascraeus' into develop 2014-12-27 13:58:54 +01:00
Joas Schilling
7b43d5c54e Merge pull request #3214 from brunoais/ticket/13159
[ticket/13159] Allow to do extra auth checks on report posting
2014-12-27 13:58:49 +01:00
Joas Schilling
60b45bb0bd Merge branch 'develop-ascraeus' into develop 2014-12-27 13:51:30 +01:00
Joas Schilling
3ba62628dc Merge pull request #3205 from rxu/ticket/13406
[ticket/13406] Add a space between the index name and columns list
2014-12-27 13:51:24 +01:00
Joas Schilling
ea6fcc3dda Merge branch 'develop-ascraeus' into develop 2014-12-27 13:49:53 +01:00
Joas Schilling
faad779cf6 Merge pull request #3202 from Nicofuma/ticket/13402
[ticket/13402] Code sniffer, unused use, check the function doc blocks
2014-12-27 13:49:50 +01:00
Joas Schilling
8aadee60f7 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:46:46 +01:00
Joas Schilling
f6b21a2789 Merge pull request #3191 from Elsensee/ticket/13312
[ticket/13312] Add event core.acp_email_send_before
2014-12-27 13:46:32 +01:00
Joas Schilling
3c41df2255 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:38:25 +01:00
Joas Schilling
867a45138c Merge pull request #3175 from Senky/ticket/13368
[ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event
2014-12-27 13:38:19 +01:00
Joas Schilling
00933ad287 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:37:11 +01:00
Joas Schilling
aea67c8e37 Merge pull request #3168 from Senky/ticket/11033
[ticket/11033] FULLTEXT_SPHINX_NO_CONFIG_DATA references unrequired field
2014-12-27 13:37:04 +01:00
Joas Schilling
22948127f8 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/index.htm
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
	phpBB/styles/subsilver2/theme/images/index.htm
2014-12-27 13:35:23 +01:00
Joas Schilling
d2334ab3e0 Merge pull request #3167 from Senky/ticket/12924
[ticket/12924] Make meta tags self-closing
2014-12-27 13:34:48 +01:00
Joas Schilling
49a1025e59 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:31:22 +01:00
Joas Schilling
0fe30e8a96 Merge pull request #3170 from Nicofuma/ticket/13266-develop
[ticket/13266-develop] Enable twig dump function
2014-12-27 13:31:16 +01:00
Joas Schilling
5b1c9831c2 Merge pull request #3099 from Senky/ticket/13266
[ticket/13266] Enabling twig dump function if DEBUG is defined
2014-12-27 13:31:01 +01:00
Joas Schilling
bd3ef49e0b Merge branch 'develop-ascraeus' into develop 2014-12-27 13:29:17 +01:00
Joas Schilling
a66e4770c1 Merge pull request #3159 from Crizz0/ticket/13357
[ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries
2014-12-27 13:29:04 +01:00
brunoais
0929267e72 [ticket/13154] Wrong variable name in the comment block
PHPBB3-13154
2014-12-19 11:23:23 +00:00
brunoais
dd9c415020 [ticket/13154] space before @var
Not a tab.

PHPBB3-13154
2014-12-19 10:03:57 +00:00
brunoais
dd6efdad59 [ticket/13154] Fix submit_post_test() test group
PHPBB3-13154
2014-12-18 14:56:58 +00:00
brunoais
13320a08ef [ticket/13154] Forgot the $this->
PHPBB3-13154
2014-12-17 23:17:12 +00:00
brunoais
8098d313e6 [ticket/13154] Adjusting phpBB tests for the dispatcher
PHPBB3-13154
2014-12-17 23:11:14 +00:00
brunoais
458f9cade6 [ticket/13154] Adding phpBB dispatcher to notifications manager
PHPBB3-13154
2014-12-17 23:10:54 +00:00
brunoais
7512efed9e [ticket/13154] Allow filtering the list of users to be notified
PHPBB3-13154
2014-12-17 15:17:44 +00:00
rxu
2929f28243 [ticket/13435] Add core event to modify submit_post() sql data
PHPBB3-13435
2014-12-13 21:08:01 +07:00
omniError
7b0cabc416 [ticket/13430] update event version
https://tracker.phpbb.com/browse/PHPBB3-13430

PHPBB3-13430
2014-12-12 17:39:30 -06:00
n-aleha
6463354a39 [ticket/13098] Repair Yahoo contact field
Update the Yahoo link of the yahoo profile field.

PHPBB3-13098
2014-12-12 13:54:35 +02:00
omniError
9f1493ce73 [ticket/13430] Add event core.prune_sql
https://tracker.phpbb.com/browse/PHPBB3-13430

PHPBB3-13430
2014-12-11 16:58:29 -06:00
Jakub Senko
91dc002c31 [ticket/13368] Update version
PHPBB3-13368
2014-12-11 14:11:43 +01:00
Cesar G
54b5ee5806 [ticket/13366] Ensure plupload_last_gc config entry is dynamic.
PHPBB3-13366
2014-12-09 18:50:29 -08:00
Cesar G
75780d7fc8 [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
PHPBB3-13420
2014-12-09 18:27:04 -08:00
Cesar G
892aa43eee Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12567] wrap to top
2014-12-09 17:59:01 -08:00
Cesar G
61df1ac2b3 Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeus
* Senky/ticket/12567:
  [ticket/12567] wrap to top
2014-12-09 17:58:43 -08:00
Cesar G
1d8e261747 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13319] Add missing table tags
2014-12-09 17:50:34 -08:00
Cesar G
46384adf00 Merge remote-tracking branch 'Senky/ticket/13319' into develop-ascraeus
* Senky/ticket/13319:
  [ticket/13319] Add missing table tags
2014-12-09 17:50:14 -08:00
Cesar G
719aa66224 [ticket/13302] Fix incorrect link to extensions database.
PHPBB3-13302
2014-12-09 17:10:08 -08:00
Cesar G
15507ffc16 [ticket/13302] Update translations forum link to 3.1.
PHPBB3-13302
2014-12-09 17:10:08 -08:00
Cesar G
bb4b3d2731 [ticket/13302] Update documentation and support forum links to 3.1 versions.
PHPBB3-13302
2014-12-09 17:10:03 -08:00
Cesar G
4dab281da1 [ticket/13427] Add several before/after template events to mcp_front.html.
PHPBB3-13427
2014-12-09 16:26:32 -08:00
Cesar G
1aea572aca [ticket/13370] Allow calling class method in convertor framework directly.
This change allows the usage of array($class, 'method')) directly instead of
having to use the functionX syntax as follows:
array('function1' => array($class, 'method')))

PHPBB3-13370
2014-12-09 15:59:05 -08:00
Marc Alexander
d22fa412c4 Merge pull request #3220 from nickvergessen/ticket/13421
Ticket/13421 Introduce an interface for db\tools.php
2014-12-10 00:03:24 +01:00
MasterShredder
fda5d8d637 [ticket/13422] Deleted event core.session_check_user_session 2014-12-08 21:37:07 +03:00
MasterShredder
1896825f39 [ticket/13422] Add new event core.session_set_custom_ban
PHPBB3-13422
2014-12-07 05:59:20 +04:00
MasterShredder
566510769b [ticket/13422] Add new event core.session_check_user_session
PHPBB3-13422
2014-12-07 05:57:07 +04:00
MasterShredder
4700b44125 [ticket/13422] Add new event core.ucp_save_custom_cookies
PHPBB3-13422
2014-12-07 05:52:24 +04:00
Joas Schilling
ec90f2b380 [ticket/13421] Move tools to subdirectory
PHPBB3-13421
2014-12-06 17:10:07 +01:00
Joas Schilling
d78bb2865b [ticket/13421] Always require the interface when possible
PHPBB3-13421
2014-12-06 16:17:04 +01:00
Joas Schilling
536bdf036b [ticket/13421] Inherit docs
PHPBB3-13421
2014-12-06 16:16:51 +01:00
Joas Schilling
10594779b9 [ticket/13421] Add an interface for \phpbb\db\tools
PHPBB3-13421
2014-12-06 16:16:44 +01:00
Joas Schilling
8a35718149 Merge branch 'develop-ascraeus' into develop 2014-12-06 14:22:58 +01:00
Joas Schilling
641a9e5441 Merge pull request #3208 from prototech/ticket/13396
[ticket/13396] Normalize multibyte characters in attachment file names.
2014-12-06 14:22:49 +01:00
Joas Schilling
f0c6c4db15 Merge branch 'develop-ascraeus' into develop 2014-12-06 13:42:55 +01:00
Joas Schilling
7fbf5649eb Merge branch 'ticket/13400' into develop-ascraeus 2014-12-06 13:42:24 +01:00
kochi
dfbc109b59 [ticket/13400] Information text if the server load id high at search
PHPBB3-13400
2014-12-06 13:42:16 +01:00
rxu
0a419781c2 [ticket/13419] Add the lowermost template event
PHPBB3-13419
2014-12-06 16:36:33 +07:00
Kailey Truscott
0795b6bd6c [ticket/13409] Change search_id type and release version
PHPBB3-13409
2014-12-05 05:53:59 -05:00
Kailey Truscott
ddd1937655 [ticket/13409] Fix event name
PHPBB3-13409
2014-12-04 21:04:58 -05:00
Kailey Truscott
3bf55c0b4d [ticket/13409] Add event core.search_modify_param_before
PHPBB3-13409
2014-12-04 20:30:16 -05:00
brunoais
a8d3cbe53b [ticket/13159] Allow to do extra auth checks on report posting
PHPBB3-13159
2014-12-03 17:53:10 +00:00
brunoais
96a734b012 [ticket/13158] Allow adding extra auth checks when the user is posting
PHPBB3-13158
2014-12-03 17:34:35 +00:00
brunoais
b7f83b2cfc [ticket/13148] Creating a final way to modify edit logs output
PHPBB3-13148
2014-12-03 16:04:32 +00:00
brunoais
bfecae1d60 [ticket/13146] Forgot delete_post_test.php
PHPBB3-13146
2014-12-03 15:43:27 +00:00
brunoais
1c02f7e032 [ticket/13146] Adding required tests modifications for the new constructor
PHPBB3-13146
2014-12-03 15:10:32 +00:00
brunoais
f045744606 [ticket/13146] FIxed wrong order in config/content.yml
PHPBB3-13146
2014-12-03 14:26:25 +00:00
brunoais
10a4f79135 [ticket/13146] Fixed variable name for the override
PHPBB3-13146
2014-12-03 14:00:00 +00:00
brunoais
4159bb1340 [ticket/13146] Wrong usage of tabs in .yml
PHPBB3-13146
2014-12-03 13:56:50 +00:00
brunoais
ac8a4b05b4 [ticket/13146] Fixing what merging broke
Merging added content I didn't expect it to add. This fixes back to what it is supposed to be.

PHPBB3-13146
2014-12-03 13:55:53 +00:00
brunoais
80a7f6930c [ticket/13146] Adding eventDispatcher to the list
PHPBB3-13146
2014-12-03 13:55:53 +00:00
brunoais
614f975e68 [ticket/13146] $contentReplaced -> $content_replaced
PHPBB3-13146
2014-12-03 13:55:52 +00:00
brunoais
df3447b725 [ticket/13146] Extra line for clarity
Added an extra line after the "if ($contentReplaced)"  to help reading the code

PHPBB3-13146
2014-12-03 13:55:52 +00:00
brunoais
e9cb9baedb [ticket/13146] $phpbb_dispatcher was missing
Added $phpbb_dispatcher to the globals list for this function.

PHPBB3-13146
2014-12-03 13:55:51 +00:00
brunoais
e279a779fc [ticket/13146] Typo on the returning variable
PHPBB3-13146
2014-12-03 13:55:50 +00:00
brunoais
e596d0b6ce [ticket/13147] Adding $approve_forums to the list of the event's variables
PHPBB3-13147
2014-12-03 13:55:50 +00:00
brunoais
0388d82504 [ticket/13146] Adding $content_replaced to allow even more flexibility
PHPBB3-13146
2014-12-03 13:55:49 +00:00
brunoais
909bb523bf [ticket/13146] Allow changing the result of calling get_forums_visibility_sql
PHPBB3-13146
2014-12-03 13:55:48 +00:00
Cesar G
589394e80b [ticket/13396] Normalize multibyte characters in attachment file names.
PHPBB3-13396
2014-12-02 16:23:40 -08:00
Tristan Darricau
7f7f60698c [ticket/13402] Handle arrays and multiples types
PHPBB3-13402
2014-11-30 20:55:29 +01:00
Tristan Darricau
13d4394844 [ticket/13402] Refactor unused use Sniff
PHPBB3-13402
2014-11-30 19:18:18 +01:00
Tristan Darricau
319efb026d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
2014-11-30 19:07:19 +01:00
Tristan Darricau
70483d6088 Merge pull request #3204 from rxu/ticket/13405
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php

* rxu/ticket/13405:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
2014-11-30 19:07:14 +01:00
rxu
2f92bc38e6 [ticket/13406] Add a space between the index name and columns list
Currently there's no space between the index name and columns list
when generating ADD INDEX sql query for MySQL DBMSes. This may cause errors
on earlier MySQL versions like 3.23.

PHPBB3-13406
2014-11-30 16:52:36 +07:00
rxu
499c1467df [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
PHPBB3-13405
2014-11-30 11:27:47 +07:00
Tristan Darricau
c5227ab2a5 [ticket/13402] Code sniffer, unused use, check the function doc blocks
PHPBB3-13402
2014-11-29 19:17:52 +01:00
brunoais
fe1f7beaf8 [ticket/13142] Extra space before the comment block
PHPBB3-13142
2014-11-29 10:40:35 +00:00
Joas Schilling
0869a77201 Merge branch 'develop-ascraeus' into develop 2014-11-29 09:09:17 +01:00
Joas Schilling
ac8b07ddd9 Merge pull request #3192 from Elsensee/ticket/13393
[ticket/13393] Call user->lang function directly
2014-11-29 09:08:51 +01:00
Joas Schilling
aab98b8626 [ticket/13238] Do not drop indexes that do not exist from fulltext search
PHPBB3-13238
2014-11-28 20:13:49 +01:00
Joas Schilling
1145af71bf [ticket/12866] Update existing profile fields with the new validation
PHPBB3-12866
2014-11-28 20:00:49 +01:00
Jakub Senko
b7f69edaa2 [ticket/12866] Assume underscore is part of \w
PHPBB3-12866
2014-11-28 20:00:48 +01:00
Joas Schilling
96cc24c211 Merge branch 'develop-ascraeus' into develop 2014-11-28 19:59:15 +01:00
Joas Schilling
8f1a1874a9 Merge pull request #3194 from Nicofuma/ticket/13381
[ticket/13381] Allow ' *' in the doc blocks (especially the header files)
2014-11-28 19:58:56 +01:00
brunoais
6f52873636 [ticket/13142] Fix typo: unaproved -> unapproved
PHPBB3-13142
2014-11-28 16:28:01 +00:00
brunoais
aa10bc2059 [ticket/13142] BUMPing version
PHPBB3-13142
2014-11-28 15:06:46 +00:00
brunoais
dfba919db8 [ticket/13142] Adding core.mcp_sorting_unapproved_deleted_posts_query_before
PHPBB3-13142
2014-11-28 15:06:11 +00:00
brunoais
bc7db0ae16 [ticket/13141] BUMPing version to 3.1.3
PHPBB3-13141
2014-11-28 15:05:20 +00:00
brunoais
88798b3514 [ticket/13141] Adding more variables to the event
Adding action, forum_id, mode, module and quickmod to
core.mcp_global_f_read_auth_after

PHPBB3-13141
2014-11-28 15:04:31 +00:00
Tristan Darricau
79ce924bc1 [ticket/13381] Allow ' *' in the doc blocks (especially the header files)
PHPBB3-13381
2014-11-27 11:20:26 +01:00
Tristan Darricau
c7116f1a54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:39:38 +01:00
Tristan Darricau
d43e8c94f5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:39:11 +01:00
Tristan Darricau
b54dbe0df6 Merge pull request #3188 from marc1706/ticket/11613
[ticket/11613] Allow cookies for domains without dots

* marc1706/ticket/11613:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:38:45 +01:00
Cesar G
388fdae49f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post

Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
2014-11-26 18:44:56 -08:00
Cesar G
79a1495f66 Merge remote-tracking branch 'Prosk8er/ticket/13391' into develop-ascraeus
* Prosk8er/ticket/13391:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
2014-11-26 18:43:24 -08:00
Oliver Schramm
893e4b3067 [ticket/13393] Call user->lang function directly
PHPBB3-13393
2014-11-27 00:55:01 +01:00
Oliver Schramm
a349db54d6 [ticket/13312] Use empty for usernames array
PHPBB3-13312
2014-11-26 23:10:02 +01:00
Oliver Schramm
41d0b5d3a2 [ticket/13312] Add event core.acp_email_send_before
PHPBB3-13312
2014-11-26 23:01:58 +01:00
Prosk8er
a5a18fb6dd [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
PHPBB3-13391
2014-11-26 14:09:07 -05:00
rxu
a8c62e707a [ticket/12926] Support for IDN (IRI)
Add international domain name support for URLs.

PHPBB3-12926
2014-11-27 01:18:49 +07:00
Jakub Senko
b67b67f2df [ticket/11613] Allow cookies to work on netbios domains
PHPBB3-11613
2014-11-26 14:58:33 +01:00
Marc Alexander
36a337ffab Merge branch 'develop-ascraeus' into develop 2014-11-26 13:37:21 +01:00
Marc Alexander
ee90d227c2 Merge pull request #3187 from Nicofuma/ticket/13362
[ticket/13362] Fix cache paths in .gitignore
2014-11-26 13:37:02 +01:00
Marc Alexander
4c88c579b8 Merge branch 'develop-ascraeus' into develop 2014-11-26 13:30:24 +01:00
Marc Alexander
51f46a8f91 Merge pull request #3185 from Nicofuma/ticket/13389
[ticket/13389] Replace pattern with path
2014-11-26 13:30:03 +01:00
Marc Alexander
630e7077e0 Merge branch 'develop-ascraeus' into develop 2014-11-26 13:21:02 +01:00
Marc Alexander
6ac088ea2f Merge pull request #3075 from Senky/ticket/11613
[ticket/11613] Cookies do not work for netbios domain
2014-11-26 13:20:36 +01:00
Tristan Darricau
6a4179cef5 [ticket/13362] Fix cache paths in .gitignore
PHPBB3-13362
2014-11-26 12:38:02 +01:00
Tristan Darricau
90012c86e8 [ticket/13389] Replace pattern with path
PHPBB3-13389
2014-11-26 12:24:50 +01:00
Marc Alexander
94d90c084b Merge branch 'develop-ascraeus' into develop 2014-11-25 23:15:30 +01:00
Marc Alexander
aa3a46a35f Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeus 2014-11-25 23:15:03 +01:00
Joas Schilling
74dfb56459 Merge branch 'develop-ascraeus' into develop 2014-11-25 22:45:37 +01:00
Joas Schilling
2e7ae40d49 Merge pull request #3183 from Nicofuma/ticket/13362
[ticket/13362] Ignore the whole cache directory in git
2014-11-25 22:45:23 +01:00
Joas Schilling
eb83bd5797 [ticket/13381] Fix header intendation of v312.php
PHPBB3-13381
2014-11-25 22:42:52 +01:00
Tristan Darricau
f46057ca02 [ticket/13362] Ignore the whole cache directory in git
PHPBB3-13362
2014-11-25 18:00:07 +01:00
Joas Schilling
1a0cba1099 Merge branch 'develop-ascraeus' into develop
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-11-25 16:47:22 +01:00
Joas Schilling
f4898b9258 Merge branch 'prep-release-3.1.2' into develop-ascraeus 2014-11-25 16:44:57 +01:00
Joas Schilling
9c9623e47f [prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev 2014-11-25 16:43:43 +01:00
Joas Schilling
1ad0dd28f1 Merge branch 'develop-olympus' into prep-release-3.1.2 2014-11-25 16:36:32 +01:00
Joas Schilling
ff9b541070 Merge pull request #3180 from naderman/ticket/13376
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
2014-11-25 16:36:18 +01:00
Nils Adermann
965042d015 [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
Also introduce a clear cookie message hardcoded just in case.

PHPBB3-13376
2014-11-25 15:57:12 +01:00
Joas Schilling
9264d7c758 [prep-release-3.1.2] Update Changelog with 13376 2014-11-25 15:44:39 +01:00
Tristan Darricau
f4576c969a [ticket/13372] Fix require_once CS
PHPBB3-13372
2014-11-25 12:48:48 +01:00
Tristan Darricau
fd94027b40 [ticket/13372] Fix Url Generator/Matcher generation
PHPBB3-13372
2014-11-25 12:23:16 +01:00
Joas Schilling
0fbe8e8e69 [prep-release-3.1.2] Add migration to update version to 3.1.2 2014-11-24 21:32:17 +01:00
Joas Schilling
3862b60094 [prep-release-3.1.2] Increase version number to 3.1.2 2014-11-24 21:31:49 +01:00
Jakub Senko
b8ecd1a656 [ticket/13368] Add @changed entry
PHPBB3-13368
2014-11-24 21:30:42 +01:00
Jakub Senko
bb4b04f89a [ticket/13319] Add missing table tags
PHPBB3-13319
2014-11-24 20:48:15 +01:00
Jakub Senko
d24fa2e777 [ticket/13346] Fix indentation, spacing and missing divs
PHPBB3-13346
2014-11-24 20:41:01 +01:00
Jakub Senko
9348b0c4f2 [ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event
PHPBB3-13368
2014-11-24 20:28:47 +01:00
Tristan Darricau
b00d02496e [ticket/13361] Improve the exception listener
PHPBB3-13361
2014-11-23 03:15:50 +01:00
Joas Schilling
5f3dffa820 [prep-release-3.1.2] Add changelog for 3.1.2-RC1 2014-11-22 19:35:24 +01:00
Joas Schilling
18d5ca9ce5 [prep-release-3.1.2] Prepare Changelog 2014-11-22 19:32:36 +01:00
Joas Schilling
dcd0f200d6 [prep-release-3.1.2] Add migration for 3.1.2-RC1 2014-11-22 19:27:34 +01:00
Joas Schilling
a5b3393bb0 [prep-release-3.1.2] Update version to 3.1.2-RC1 2014-11-22 19:22:40 +01:00
Jakub Senko
595f9c132b [ticket/12924] Remove newlines at the EOF
PHPBB3-12924
2014-11-22 19:19:08 +01:00
Joas Schilling
8f67892f5e Merge branch 'develop-ascraeus' into develop 2014-11-22 17:49:06 +01:00
Joas Schilling
5c3b6a8559 Merge pull request #10 from phpbb/ticket/security-171
[ticket/security-171] Use type cast helper for json data
2014-11-22 17:48:37 +01:00
Joas Schilling
0c4a0cac61 Merge branch 'develop-ascraeus' into develop 2014-11-22 15:52:34 +01:00
Joas Schilling
a3b18d87dd Merge pull request #8 from phpbb/ticket/security-169
[ticket/security-169] Stop loop through referer dir in top directory
2014-11-22 15:51:48 +01:00
Marc Alexander
0f06b88ee7 [ticket/security-171] Remove duplicate semicolon from tests
SECURITY-171
2014-11-22 15:48:09 +01:00
Joas Schilling
11c9d11482 Merge branch 'develop-ascraeus' into develop 2014-11-22 15:43:33 +01:00
Joas Schilling
fd993cbaf2 Merge pull request #3157 from marc1706/ticket/13358
[ticket/13358] Add class for retrieving remote file data
2014-11-22 15:42:37 +01:00
Marc Alexander
ab69c79d07 Merge branch 'ticket/13358' into ticket/security-171 2014-11-22 15:24:27 +01:00
Marc Alexander
f3ae5e4cb2 [ticket/13358] Correctly create version_helper in acp_extensions
The full namespace for the file_downloader is now also being used in
version_helper.

PHPBB3-13358
2014-11-22 15:23:26 +01:00
Jakub Senko
b9289340d9 [ticket/12567] wrap to top
PHPBB3-12567
2014-11-22 12:37:31 +01:00
Tristan Darricau
6850169095 [ticket/13266] Enable the debug extension in the development environment
PHPBB3-13266
2014-11-22 12:33:45 +01:00
Joas Schilling
45aafe0b09 Merge branch 'develop-ascraeus' into develop 2014-11-22 12:21:30 +01:00
Joas Schilling
8b71103836 Merge pull request #3123 from Elsensee/ticket/13310
[ticket/13310] Add event core.acp_email_modify_sql
2014-11-22 12:21:24 +01:00
Joas Schilling
8ce736ad8a Merge branch 'develop-ascraeus' into develop 2014-11-22 12:19:09 +01:00
Joas Schilling
ea101f7932 Merge pull request #3160 from PayBas/ticket/13228
[ticket/13228] Fix codebox "select all" font-size in UCP and MCP
2014-11-22 12:18:00 +01:00
Joas Schilling
d6c85757d7 Merge branch 'develop-ascraeus' into develop 2014-11-22 12:13:46 +01:00
Joas Schilling
7700f31213 Merge pull request #3116 from rxu/ticket/13297
[ticket/13297] Add unicode modifier to url/email regular expression patterns
2014-11-22 12:13:39 +01:00
Jakub Senko
a609c9db82 [ticket/12924] Make meta tags self-closing
PHPBB3-12924
2014-11-22 12:12:13 +01:00
Joas Schilling
ccad017214 Merge branch 'develop-ascraeus' into develop 2014-11-22 12:08:42 +01:00
Joas Schilling
a83b952f63 Merge pull request #3158 from prototech/ticket/13354
[ticket/13354] Fix incorrect column name when deleting all topic logs.
2014-11-22 12:08:33 +01:00
Jakub Senko
86b3c54c77 [ticket/11033] Update string to reflect real requirements
PHPBB3-11033
2014-11-22 11:56:52 +01:00
Joas Schilling
cde2f01b65 Merge branch 'develop-ascraeus' into develop 2014-11-22 11:35:58 +01:00
Joas Schilling
e283611dc2 Merge pull request #3161 from Crizz0/ticket/12885
[ticket/12885] New if for Index-page - board-index-text switch
2014-11-22 11:35:51 +01:00
Joas Schilling
b15ea672fd Merge branch 'develop-ascraeus' into develop 2014-11-22 11:31:50 +01:00
Joas Schilling
8489e0bdc2 Merge branch 'develop-olympus' into develop-ascraeus 2014-11-22 11:31:41 +01:00
Joas Schilling
a415b8e37b Merge pull request #3164 from Crizz0/ticket/10442
[ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctness
2014-11-22 11:31:31 +01:00
Jakub Senko
30f292f5a2 [ticket/11613] Allow cookies to work on netbios domains
PHPBB3-11613
2014-11-22 11:29:57 +01:00
Tristan Darricau
0a49dad112 [ticket/13266] Merge pull request #3099 from Senky/ticket/13266
[ticket/13266] Enabling twig dump function if DEBUG is defined

* Senky/ticket/13266:
  [ticket/13266] Enable twig dump function

Conflicts:
	phpBB/phpbb/template/twig/twig.php

PHPBB3-13266
2014-11-22 11:04:25 +01:00
Marc Alexander
ece3ebc61b Merge pull request #3162 from nickvergessen/ticket/13359
[ticket/13359] Add phpbb\template\twig\environment to template constructor
2014-11-22 09:39:05 +01:00
Joas Schilling
5d3f0a9abb [ticket/13359] Add phpbb\template\twig\environment to template constructor
PHPBB3-13359
2014-11-22 03:42:48 +01:00
PayBas
2c15388520 [ticket/13228] Gotta use !important after all. Too bad
PHPBB3-13228
2014-11-22 02:42:25 +01:00
Crizzo
867bfa3f9e [ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctness
PHPBB3-10442
2014-11-22 01:08:14 +01:00
Marc Alexander
afc658c71a Merge branch 'develop-ascraeus' into develop 2014-11-22 00:15:24 +01:00
Crizzo
4cb930c2c1 [ticket/12885] New if for Index-page - board-index-text switch
PHPBB3-12885
2014-11-22 00:09:38 +01:00
Marc Alexander
70692dd522 Merge pull request #3094 from nickvergessen/ticket/10744
Ticket/10744 Prevent installing styles with reserved names
2014-11-22 00:00:22 +01:00
Joas Schilling
c174862b7e [ticket/10744] Fix some doc blocks
PHPBB3-10744
2014-11-21 23:59:29 +01:00
Joas Schilling
7c683608ab [ticket/10744] Type hint objects for IDE usages
PHPBB3-10744
2014-11-21 23:58:53 +01:00
Joas Schilling
7f8c4d877a [ticket/10744] Prevent installing styles with reserved names
PHPBB3-10744
2014-11-21 23:55:48 +01:00
Marc Alexander
f648fe88d5 [ticket/security-171] Modify tests for new file_downloader class
SECURITY-171
2014-11-21 23:49:54 +01:00
Marc Alexander
9649d78fa4 Merge branch 'ticket/13358' into ticket/security-171 2014-11-21 23:37:17 +01:00
PayBas
16c43b6a7d [ticket/13228] Fix codebox "select all" font-size in UCP and MCP
PHPBB3-13228
2014-11-21 23:35:33 +01:00
Joas Schilling
47d3865fa6 Merge branch 'develop-ascraeus' into develop 2014-11-21 23:33:51 +01:00
Joas Schilling
2e2ab7b485 Merge pull request #3127 from omniError/ticket/13323
[ticket/13323] empty auth option in posting.php
2014-11-21 23:33:45 +01:00
Marc Alexander
6d3ac29aee [ticket/13358] Use protected and public keywords where applicable
PHPBB3-13358
2014-11-21 23:30:47 +01:00
Joas Schilling
dd3e440cef Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
2014-11-21 23:26:51 +01:00
Crizzo
f930a75471 [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries
PHPBB3-13357
2014-11-21 23:18:42 +01:00
Marc Alexander
171837eefe [ticket/13358] Do not pass variables by reference
PHPBB3-13358
2014-11-21 23:16:22 +01:00
Joas Schilling
0017fad554 Merge pull request #3108 from Elsensee/ticket/13284
[ticket/13284] Message body not included in email
2014-11-21 23:10:00 +01:00
Joas Schilling
655cd3bd3a Merge branch 'develop-ascraeus' into develop 2014-11-21 22:52:29 +01:00
Joas Schilling
c98cceaf22 Merge pull request #3068 from marc1706/ticket/13204
[ticket/13204] Tell user that password was incorrect when exceeding attempts
2014-11-21 22:52:24 +01:00
Joas Schilling
9b54f2d0c4 Merge branch 'develop-ascraeus' into develop 2014-11-21 22:42:26 +01:00
Joas Schilling
dd7e09d092 Merge pull request #3064 from marc1706/ticket/13197
[ticket/13197] Also delete group avatar from users that have it set
2014-11-21 22:41:17 +01:00
Marc Alexander
4ee05b1c17 [ticket/security-171] Add tests for retrieved remote data in version_helper
SECURITY-171
2014-11-21 22:32:28 +01:00
Marc Alexander
34004612ac [ticket/security-171] Sanitize data from composer.json
SECURITY-171
2014-11-21 22:32:28 +01:00
Marc Alexander
da1888a7fa [ticket/security-171] Use type cast helper for json data
SECURITY-171
2014-11-21 22:32:28 +01:00
Joas Schilling
3c8d11f6cc Merge branch 'develop-ascraeus' into develop 2014-11-21 22:29:08 +01:00
Joas Schilling
d7d4f681ca Merge pull request #3156 from prototech/ticket/13316
[ticket/13316] Ensure Recaptcha image uses https when necessary.
2014-11-21 22:29:02 +01:00
Cesar G
8d8c2930d2 [ticket/13354] Fix incorrect column name when deleting all topic logs.
PHPBB3-13354
2014-11-21 12:48:26 -08:00
Marc Alexander
352648f173 [ticket/13358] Fix tests and use exceptions instead of user object
PHPBB3-13358
2014-11-21 21:37:43 +01:00
Marc Alexander
f6e7a94bd5 [ticket/13358] Use file_downloader in get_remote_file()
get_remote_file() has been marked as deprecated.

PHPBB3-13358
2014-11-21 21:37:43 +01:00
Marc Alexander
2793f9c078 [ticket/13358] Add file_downloader to version_helper
PHPBB3-13358
2014-11-21 21:37:43 +01:00
Marc Alexander
a080173010 [ticket/13358] Add file_downloader as replacement for get_remote_file
PHPBB3-13358
2014-11-21 21:37:43 +01:00
Cesar G
f3373e1e32 [ticket/13316] Ensure Recaptcha image uses https when necessary.
PHPBB3-13316
2014-11-21 12:17:04 -08:00
Joas Schilling
b104bf5791 Merge branch 'develop-ascraeus' into develop 2014-11-21 21:05:35 +01:00
Joas Schilling
f719803fdc Merge pull request #3144 from marc1706/ticket/13337
[ticket/13337] Do not use SQL IN comparison with empty array
2014-11-21 21:04:11 +01:00
Joas Schilling
1104f788c3 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/confirm_delete_body.html
2014-11-21 21:00:00 +01:00
Joas Schilling
d56da0d68f Merge pull request #3044 from Elsensee/ticket/13100
[ticket/13100] Display only confirmation buttons when deleting shadow topic
2014-11-21 20:59:22 +01:00
Joas Schilling
95a8f40052 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:41:14 +01:00
Joas Schilling
1689191f29 Merge pull request #3023 from Nicofuma/ticket/13133
[ticket/13133] Allow @vendor_name for includecss
2014-11-21 20:36:41 +01:00
Joas Schilling
a191708601 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:20:45 +01:00
Joas Schilling
973c2a9a3a Merge pull request #2765 from Elsensee/ticket/11863
[ticket/11863] Set require_activation to none if emails are disabled
2014-11-21 20:18:15 +01:00
Joas Schilling
90a5d29523 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:15:09 +01:00
Joas Schilling
707a85b6c1 Merge pull request #3043 from rxu/ticket/13182
[ticket/13182] Add posting.php core event to allow modifying the message text
2014-11-21 20:14:36 +01:00
Joas Schilling
73f1cfd583 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:09:27 +01:00
Joas Schilling
71a015557f Merge pull request #3150 from omniError/ticket/13347
[ticket/13347] missing acp_forums template events

Conflicts:
	phpBB/docs/events.md
2014-11-21 20:09:13 +01:00
Joas Schilling
d311fa2c5e Merge branch 'develop-ascraeus' into develop 2014-11-21 20:05:37 +01:00
Joas Schilling
bc52a84998 Merge pull request #3131 from omniError/ticket/13328
[ticket/13328] add core.mcp_view_forum_modify_sql
2014-11-21 20:05:19 +01:00
Joas Schilling
f7051a958c Merge branch 'develop-ascraeus' into develop 2014-11-21 19:58:49 +01:00
Joas Schilling
d6e8cce44b Merge pull request #3130 from omniError/ticket/13326
[ticket/13326] add viewtopic_url to event
2014-11-21 19:58:43 +01:00
Joas Schilling
ac33ee2290 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
2014-11-21 19:54:44 +01:00
Joas Schilling
2d6734cb0a Merge pull request #3126 from VSEphpbb/ticket/13290
[ticket/13290] Add EVENT index_body_forumlist_body_after
2014-11-21 19:53:15 +01:00
Joas Schilling
462664b4b4 Merge branch 'develop-ascraeus' into develop 2014-11-21 19:42:28 +01:00
Joas Schilling
7bc1917908 Merge pull request #3122 from Elsensee/ticket/13309
[ticket/13309] Add event acp_email_options_after
2014-11-21 19:42:14 +01:00
rxu
bb75cd40f5 [ticket/13182] Add posting.php core event to allow modifying the message text
posting.php core event to allow modifying the message before parsing
would be needed for some extensions, like for adding topic title to the
topic URL etc.
Also removed 'delete' var from core.posting_modify_template_vars and
core.modify_posting_parameters as it does not exist.

PHPBB3-13182
2014-11-22 01:33:12 +07:00
Joas Schilling
2ba391d04a Merge branch 'develop-ascraeus' into develop 2014-11-21 19:32:42 +01:00
Joas Schilling
4bf3dcbebd Merge pull request #3114 from rxu/ticket/13294
[ticket/13294] Add function parse() core event for additional message checks
2014-11-21 19:28:07 +01:00
Joas Schilling
987bd7b3a7 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_search.html
2014-11-21 19:25:32 +01:00
Joas Schilling
c31b53942d Merge pull request #3071 from rxu/ticket/13220
[ticket/13220] Add template events to memberlist_search.html
2014-11-21 19:23:10 +01:00
Nils Adermann
040d451dcc Merge pull request #2883 from Nicofuma/ticket/12620
[ticket/12620] Allow the user to define multiples environments
2014-11-21 18:20:19 +01:00
Tristan Darricau
54d5299940 [ticket/12620] Fix tests
PHPBB3-12620
2014-11-21 17:38:13 +01:00
Tristan Darricau
5e2896bb00 [ticket/12620] Remove the old includes/functions_url_matcher.php file
PHPBB3-12620
2014-11-21 16:42:01 +01:00
Tristan Darricau
f5c5f7df75 [ticket/12620] Fix functionnal tests
PHPBB3-12620
2014-11-21 08:26:19 +01:00
Tristan Darricau
677b5b2cd4 [ticket/12620] Fix rebase
PHPBB3-12620
2014-11-20 23:15:49 +01:00
Tristan Darricau
93f61a4a7d [ticket/12620] Use the right environment while installing
PHPBB3-12620
2014-11-20 21:13:30 +01:00
Tristan Darricau
48950be82b [ticket/12620] Fix tests
PHPBB3-12620
2014-11-20 21:13:26 +01:00
Tristan Darricau
ac0ff219c6 [ticket/12620] Move the routing.yml file to routing/environment.yml
PHPBB3-12620
2014-11-20 21:13:21 +01:00
Tristan Darricau
dd4f2387fd [ticket/12620] Use the test environment for the tests
PHPBB3-12620
2014-11-20 21:12:22 +01:00
Tristan Darricau
91daa73663 [ticket/12620] Fix session tests
PHPBB3-12620
2014-11-20 21:09:44 +01:00
Tristan Darricau
6019e51fed [ticket/12620] Fix coding style
PHPBB3-12620
2014-11-20 21:09:40 +01:00
Tristan Darricau
0a1db77ea8 [ticket/12620] Add a test using a custom DI extension in an extension
PHPBB3-12620
2014-11-20 21:01:03 +01:00
Tristan Darricau
acc91a2bbf [ticket/12620] Use the container to get the environment name
PHPBB3-12620
2014-11-20 21:01:01 +01:00
Tristan Darricau
c98efc53a8 [ticket/12620] Fix rebase (move config file to the right directory)
PHPBB3-12620
2014-11-20 21:00:01 +01:00
Tristan Darricau
0b61e3540d [ticket/12620] Fix tests
PHPBB3-12620
2014-11-20 20:59:55 +01:00
Tristan Darricau
3a167aa0c3 [ticket/12620] Creates one di extension per phpBB extension
PHPBB3-12620
2014-11-20 20:59:51 +01:00
Tristan Darricau
6cbb60d13f [ticket/12620] Adds a yaml config file
PHPBB3-12620
2014-11-20 20:59:48 +01:00
Tristan Darricau
74cd97e75b [ticket/12620] Updates test environment (production => development)
PHPBB3-12620
2014-11-20 20:59:38 +01:00
Tristan Darricau
aa061aa7c9 [ticket/12620] Uses a cache directory per environment
PHPBB3-12620
2014-11-20 20:59:34 +01:00
Tristan Darricau
998b4baa71 [ticket/12620] Fix download/file.php and app.php outside of the root_path
PHPBB3-12620
2014-11-20 20:58:35 +01:00
Tristan Darricau
014eed385b [ticket/12620] Add support of the environments for the ext routing files
PHPBB3-12620
2014-11-20 20:15:45 +01:00
Tristan Darricau
7cd0fd83b8 [ticket/12620] Fix tests
PHPBB3-12620
2014-11-20 19:06:52 +01:00
Tristan Darricau
0bf3d2d962 [ticket/12620] Add the support of the environments for the ext services
We look for an environment.yml file in the config/PHPBB_ENVIRONMENT/
directory of the extensionss. If the directory does not exist we look
for the environment.yml file in the 'default' environment and finally
for the services.yml file in the config/ directory.

PHPBB3-12620
2014-11-20 19:06:47 +01:00
Tristan Darricau
0306fefe04 [ticket/12620] Move the routing file to the environments
PHPBB3-12620
2014-11-20 19:06:40 +01:00
Tristan Darricau
b697273aaa [ticket/12620] Use PHPBB_ENVIRONMENT
PHPBB3-12620
2014-11-20 19:01:23 +01:00
Tristan Darricau
143dfa28c6 [ticket/12620] Rebased on develop
PHPBB3-12620
2014-11-20 19:01:18 +01:00
Tristan Darricau
3f678af5f3 [ticket/12620] Update tests
PHPBB3-12620
2014-11-20 19:01:13 +01:00
Tristan Darricau
d2822af6d7 [ticket/12620] Rebased to the latest develop-ascraeus
PHPBB3-12620
2014-11-20 19:01:09 +01:00
Tristan Darricau
42c9fd5c76 [ticket/12620] Add inheritance between environments
PHPBB3-12620
2014-11-20 19:01:03 +01:00
Tristan Darricau
8664d3229a [ticket/12620] Split the environments into differents folders
PHPBB3-12620
2014-11-20 19:00:59 +01:00
Tristan Darricau
943e27dffa [ticket/12620] Fix functional tests
PHPBB3-12620
2014-11-20 19:00:50 +01:00
Tristan Darricau
7fa3b4c686 [ticket/12620] Rename productive to production
PHPBB3-12620
2014-11-20 19:00:46 +01:00
Tristan Darricau
c4842fe119 [ticket/12620] Fix functional tests
PHPBB3-12620
2014-11-20 19:00:42 +01:00
Tristan Darricau
733ae584dd [ticket/12620] Improve error message
PHPBB3-12620
2014-11-20 19:00:38 +01:00
Tristan Darricau
70201ee8fa [ticket/12620] Rename debug to development
PHPBB3-12620
2014-11-20 19:00:35 +01:00
Tristan Darricau
873260589e [ticket/12620] Display error message when the environment isn't available
PHPBB3-12620
2014-11-20 19:00:34 +01:00
Tristan Darricau
1a6e1ecf6f [ticket/12620] Fix tests
PHPBB3-12620
2014-11-20 19:00:32 +01:00
Tristan Darricau
c22562f5cd [ticket/12620] Allow the user to define multiples environments
PHPBB3-12620
2014-11-20 19:00:27 +01:00
Nils Adermann
6fa0ca1f96 Merge pull request #2957 from Nicofuma/ticket/13063
[ticket/13063] Introduces a new \phpbb\routing\router class
2014-11-20 18:50:32 +01:00
Tristan Darricau
8be2f119af [ticket/13063] Fix functional tests errors
PHPBB3-13063
2014-11-20 18:12:28 +01:00
Tristan Darricau
2573dd18ca [ticket/13063] Fix coding style
PHPBB3-13063
2014-11-20 16:47:24 +01:00
Tristan Darricau
fdcd6e81cd [ticket/13063] Fix tests after rebase
PHPBB3-13063
2014-11-20 16:37:45 +01:00
Tristan Darricau
dec8b0de47 [ticket/13063] Remove kernel_request_subscriber service definition
PHPBB3-13063
2014-11-20 16:09:54 +01:00
Tristan Darricau
f81d8c53fc [ticket/13063] Adds Twig routing extension
PHPBB3-13063
2014-11-20 16:09:44 +01:00
Tristan Darricau
a5bfc76a73 [ticket/13063] Introduces a new \phpbb\routing\router class
PHPBB3-13063
2014-11-20 16:03:48 +01:00
rxu
1e867ce52b [ticket/13294] Add function parse() core event for additional message checks
Add core event to the function parse() in includes/message_parser.php to allow
additional handling message before parsing (i.e. perform custom message
checks, cleanup etc.).

PHPBB3-13294
2014-11-20 00:47:51 +07:00
Tristan Darricau
3b1c611566 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
2014-11-18 16:29:08 +01:00
Tristan Darricau
acfe6dd37d Merge pull request #3149 from prototech/ticket/13342
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha

* prototech/ticket/13342:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
2014-11-18 16:28:59 +01:00
Tristan Darricau
4bfd5e0d9a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13315] Check for the includes/captcha/plugins/ directory instead.
  [ticket/13315] Fix loss of CAPTCHA plugin config value.
2014-11-18 15:11:14 +01:00
Tristan Darricau
0019039bc1 Merge pull request #3148 from prototech/ticket/13315
[ticket/13315] Fix loss of CAPTCHA plugin config value.

* prototech/ticket/13315:
  [ticket/13315] Check for the includes/captcha/plugins/ directory instead.
  [ticket/13315] Fix loss of CAPTCHA plugin config value.
2014-11-18 15:11:07 +01:00
Marc Alexander
1e03dddcfe Merge branch 'develop-ascraeus' into develop 2014-11-18 15:01:02 +01:00
Marc Alexander
ba3e4da853 Merge pull request #3154 from cyberalien/ticket/13349
[ticket/13349] Fix breadcrumb arrow entity
2014-11-18 15:00:45 +01:00
cyberalien
795fd75d60 [ticket/13349] Fix breadcrumb arrow entity
PHPBB3-13349
2014-11-18 14:13:07 +02:00
Marc Alexander
19a47c7bac Merge branch 'develop-ascraeus' into develop 2014-11-18 13:12:08 +01:00
Marc Alexander
b84d151afa Merge pull request #3151 from nickvergessen/ticket/13298
[ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
2014-11-18 13:11:55 +01:00
Marc Alexander
2e467c8569 Merge branch 'develop-ascraeus' into develop 2014-11-18 13:09:19 +01:00
Marc Alexander
17d76de7b8 Merge pull request #3152 from prototech/ticket/13277
[ticket/13277] Force IE to not cache AJAX requests.
2014-11-18 13:08:58 +01:00
Cesar G
e1865df7dd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before

Conflicts:
	phpBB/styles/subsilver2/template/posting_buttons.html
2014-11-18 01:33:13 -08:00
Cesar G
052fdcc8d9 Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeus
* Nicofuma/ticket/13023:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
2014-11-18 01:30:06 -08:00
Cesar G
266755bd82 [ticket/13277] Force IE to not cache AJAX requests.
Caching causes problems, such as the inability to move a forum/CPF/module in the
same direction by more than one row.

PHPBB3-13277
2014-11-18 00:41:57 -08:00
Cesar G
7c68964153 [ticket/13315] Check for the includes/captcha/plugins/ directory instead.
PHPBB3-13315
2014-11-18 00:37:07 -08:00
Joas Schilling
31c59cad83 [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
PHPBB3-13298
2014-11-17 23:56:33 +01:00
Joas Schilling
cddb768772 Merge branch 'develop-ascraeus' into develop 2014-11-17 23:33:04 +01:00
Joas Schilling
4f96688bf7 Merge pull request #3145 from bantu/ticket/13338
[ticket/13338] Make all tests run on their own. Avoid _test suffix for abstract test case classes.
2014-11-17 23:32:45 +01:00
omniError
c1a0d1bf3d [ticket/13347] update event docs
PHPBB3-13347
2014-11-17 16:25:56 -06:00
omniError
115bf63538 [ticket/13347] fix CS
PHPBB3-13347
2014-11-17 16:14:57 -06:00
omniError
bd0107a2ab [ticket/13347] missing acp_forums template events
PHPBB3-13347
2014-11-17 16:09:40 -06:00
Joas Schilling
c09c95599b Merge branch 'develop-ascraeus' into develop 2014-11-17 22:47:58 +01:00
Joas Schilling
f261c748b6 Merge branch 'develop-olympus' into develop-ascraeus 2014-11-17 22:47:46 +01:00
Joas Schilling
2b55476df0 Merge pull request #3147 from bantu/ticket/13341-ascraeus
[ticket/13341] Change coverage to whitelist to prevent errors with temp files
2014-11-17 22:47:41 +01:00
Joas Schilling
d4fd5e3365 Merge pull request #3146 from bantu/ticket/13341
[ticket/13341] Change coverage to whitelist to prevent errors with temp ...
2014-11-17 22:47:17 +01:00
Andreas Fischer
21c8985fe8 [ticket/13338] Add include statements for dependencies.
PHPBB3-13338
2014-11-17 21:54:02 +01:00
Andreas Fischer
765d72d194 [ticket/13338] Do not use the _test.php suffix for abstract test case classes.
PHPBB3-13338
2014-11-17 21:53:27 +01:00
Andreas Fischer
a918abe113 [ticket/13338] Move insert_config_array_test to functions_acp, add deps.
PHPBB3-13338
2014-11-17 21:53:27 +01:00
Cesar G
7b33018ade [ticket/13315] Fix loss of CAPTCHA plugin config value.
The plugins were moved to phpbb/captcha/plugins/ after this migration was
created, thus the check is no longer valid and ends up resetting the value
prematurely.

PHPBB3-13315
2014-11-16 17:01:38 -08:00
Cesar G
fb34cbf7cd [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
The Recaptcha plugin class name does not follow the phpbb_captcha_ prefix
convention as all others. Instead it simply uses phpbb_, hence the check
for its existence under phpbb/captcha/plugins/ fails.

PHPBB3-13342
2014-11-16 17:01:03 -08:00
Nils Adermann
6104be6b4d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
2014-11-16 16:50:29 +01:00
Nils Adermann
4ffdb12938 Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascraeus
* github-nicofuma/ticket/13280:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
2014-11-16 16:50:15 +01:00
Tristan Darricau
0dfe1d0d8b [ticket/13280] Output escaping for the symfony request object
PHPBB3-13280
2014-11-16 16:45:19 +01:00
Tristan Darricau
f1b88706b8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
2014-11-16 12:23:04 +01:00
Tristan Darricau
e27b69f42a Merge pull request #3136 from marc1706/ticket/13332
[ticket/13332] Pass user row to passwords manager check method

* marc1706/ticket/13332:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
2014-11-16 12:22:51 +01:00
Tristan Darricau
074b91497b [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
PHPBB3-13023
2014-11-16 11:52:30 +01:00
Andreas Fischer
8297f700d0 Merge pull request #3146 from bantu/ticket/13341
[ticket/13341] Change coverage to whitelist to prevent errors with temp ...

* bantu/ticket/13341:
  [ticket/13341] Change coverage to whitelist to prevent errors with temp files.

Conflicts:
	phpunit.xml.dist
2014-11-14 17:27:15 +01:00
Andreas Fischer
c40d7f0896 [ticket/13341] Change coverage to whitelist to prevent errors with temp files.
b4f95deefc suggests that this can lead to issues
with classes having the same name. However, this does not seem to be a problem
with the current version of PHPUnit we are using.

Despite https://phpunit.de/manual/4.1/en/code-coverage-analysis.html saying
that addUncoveredFilesFromWhitelist="true" is optional, this seems to be on by
default in PHPUnit 4.1.0. As a result, all files are considered for code
coverage; which is what we want.

processUncoveredFilesFromWhitelist is however false (by default) and as such
even files that are considered for code coverage are not processed through PHP
when not used in actual tests. Since it is already impossible to test multiple
classes with the same name in the same test run (without process isolation),
because that would already lead to "cannot redeclare class" errors, it is also
impossible for "cannot redeclare class" errors to happen in test coverage.

PHPBB3-13341
2014-11-14 13:44:42 +01:00
Marc Alexander
556565d072 [ticket/13337] Allow empty array passed to sql_in_set()
is_array() will evaluate to true even if the array is just an empty array.
Make sure we also expect an empty array passed to sql_in_set().

PHPBB3-13337
2014-11-14 11:08:35 +01:00
omniError
8a9c2c055c [ticket/13306] update test
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
2014-11-13 20:55:20 -06:00
omniError
0a4ffb7cf8 [ticket/13306] move error_reporting call
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
2014-11-13 20:55:10 -06:00
Marc Alexander
1f2ec038fb Merge branch 'develop-ascraeus' into develop 2014-11-13 17:12:09 +01:00
Marc Alexander
c9db08873f Merge pull request #3141 from bantu/ticket/13325
[ticket/13325] Make installing composer dependencies in tests folder optional.
2014-11-13 17:11:48 +01:00
Marc Alexander
0795766837 Merge branch 'develop-ascraeus' into develop 2014-11-13 01:03:07 +01:00
Marc Alexander
9f9ce10f2f Merge pull request #3125 from lavigor/ticket/13318
[ticket/13318] login_username needs to have the multibyte parameter set to true
2014-11-13 01:02:49 +01:00
Marc Alexander
f0bdf02b32 Merge branch 'develop-ascraeus' into develop 2014-11-13 00:16:46 +01:00
Marc Alexander
2f54ab0a24 Merge pull request #3137 from prototech/ticket/13209
[ticket/13209] Fix loss of CPF language field values when switching steps
2014-11-13 00:14:54 +01:00
Joas Schilling
9406f1fe11 Merge branch 'develop-ascraeus' into develop 2014-11-12 23:04:23 +01:00
Joas Schilling
a520edb8fa Merge branch 'develop-olympus' into develop-ascraeus 2014-11-12 23:04:10 +01:00
Joas Schilling
12fd9a8827 Merge pull request #3143 from bantu/ticket/13331-ascraeus
[ticket/13331] Use docs target for this branch, add docs-all for all branches
2014-11-12 23:04:07 +01:00
Joas Schilling
b99fbd0be0 Merge pull request #3142 from bantu/ticket/13331
[ticket/13331] Use docs target for this branch, add docs-all for all branches
2014-11-12 22:55:30 +01:00
Andreas Fischer
968360fed6 [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php.
PHPBB3-13331
2014-11-12 21:45:03 +01:00
Andreas Fischer
0103478521 Merge pull request #3142 from bantu/ticket/13331
[ticket/13331] Use docs target for this branch, add docs-all for all branches

* bantu/ticket/13331:
  [ticket/13331] Use docs target for this branch, add docs-all for dev branches.

Conflicts:
	build/build.xml
	build/sami-checkout.conf.php
2014-11-12 21:43:56 +01:00
Andreas Fischer
b55d744e77 [ticket/13331] Use docs target for this branch, add docs-all for dev branches.
PHPBB3-13331
2014-11-12 21:40:26 +01:00
Andreas Fischer
1e4ff6105a [ticket/13325] Make installing composer dependencies in tests folder optional.
Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19
here. Remove __init__ include. Composer classmap autoloading ensures classes
can be loaded.

PHPBB3-13325
2014-11-12 20:34:36 +01:00
Andreas Fischer
8df63a4499 [ticket/13325] Remove whitespace at end of line.
PHPBB3-13325
2014-11-12 20:32:36 +01:00
Andreas Fischer
e1bf699ad4 [ticket/13325] Update / Fix composer.lock hash.
PHPBB3-13325
2014-11-12 20:31:41 +01:00
Tristan Darricau
526a97db7c [ticket/13280] Add new tests
PHPBB3-13280
2014-11-12 15:43:20 +01:00
Tristan Darricau
f142ed28e4 [ticket/13280] Make the tests failing
PHPBB3-13280
2014-11-12 15:43:12 +01:00
Tristan Darricau
6d533d2f86 [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
This reverts commit a1b58d05d1, reversing
changes made to 0e772afb9d.

PHPBB3-13280
2014-11-12 15:42:23 +01:00
Marc Alexander
1b439ee2b7 Merge branch 'develop-ascraeus' into develop 2014-11-12 13:05:04 +01:00
Marc Alexander
09ad1d529e Merge pull request #3139 from prototech/ticket/13239
[ticket/13239] Ensure "Add files" button position is correctly calculated.
2014-11-12 13:04:46 +01:00
Marc Alexander
63022f3c59 [ticket/13332] Fix auth provider tests
PHPBB3-13332
2014-11-12 11:42:08 +01:00
omniError
834a93f76c [ticket/13306] allow 0 error types
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
2014-11-11 20:23:13 -06:00
omniError
efd4b43c1b [ticket/13306] constructor sets error types
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
2014-11-11 20:20:52 -06:00
Cesar G
430c6aa32f [ticket/13239] Ensure "Add files" button position is correctly calculated.
PHPBB3-13239
2014-11-11 17:30:34 -08:00
Cesar G
d43f196fa6 [ticket/12642] Ensure CPF type specific options are set when editing booleans.
prepare_hidden_fields is expected to return null if the option is not sent
in the request. The boolean method returns false instead, which results in
the options being set as false in hidden fields when accessing the first edit
step.

When checking the "Default value" option, there is also a failure to check
whether the "Field type" option is set to checkbox, thus resulting in this
option getting lost as well.

PHPBB3-12642
2014-11-11 16:48:25 -08:00
Cesar G
ec220d6494 [ticket/13209] Gather language field values for boolean CPF's in all steps.
The user can move back and forth between all three steps and as such the lang
field data should be expected in all steps.

PHPBB3-13209
2014-11-11 16:32:04 -08:00
Cesar G
3108d0b060 [ticket/13209] Fix expected request value of CPF language fields.
Multiple languages can be edited, thus the expected value is an array.

PHPBB3-13209
2014-11-11 16:28:06 -08:00
Marc Alexander
91f7d53d8e [ticket/13332] Remove useless $result assignment
PHPBB3-13332
2014-11-11 19:02:20 +01:00
Marc Alexander
040fc6dd0f [ticket/13332] Pass user row to passwords manager check method
PHPBB3-13332
2014-11-11 19:02:01 +01:00
omniError
65f83b814c [ticket/13326] fix CS
https://tracker.phpbb.com/browse/PHPBB3-13326

PHPBB3-13326
2014-11-11 10:51:03 -06:00
omniError
b648d3eb4c [ticket/13328] fix CS
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
2014-11-11 10:47:39 -06:00
Tristan Darricau
9b4c284102 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
2014-11-11 15:30:15 +01:00
Tristan Darricau
cd6085ebdc Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
2014-11-11 15:29:58 +01:00
Tristan Darricau
6949f64d28 Merge pull request #3133 from bantu/ticket/13324
[ticket/13324] Update sami/sami and fabpot/goutte for new zipball location

* bantu/ticket/13324:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
2014-11-11 15:27:53 +01:00
Andreas Fischer
d266c7ae26 [develop] Update / Fix composer.lock hash. 2014-11-11 13:59:16 +01:00
Tristan Darricau
16de388437 Merge pull request #1880 from nicolas-grekas/develop
[3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback

* nicolas-grekas/develop:
  [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback
  [feature/patchwork-utf8] Remove utf8_str_replace
  [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
2014-11-11 13:07:54 +01:00
Andreas Fischer
9bd24e2efb [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
PHPBB3-13324
2014-11-11 12:23:02 +01:00
Tristan Darricau
4535740aa2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13083] Fix language string NO_ENTRIES for logs
2014-11-11 11:57:12 +01:00
Tristan Darricau
4dfd4e4cd3 Merge pull request #3112 from Elsensee/ticket/13083
[ticket/13083] Fix language string NO_ENTRIES for logs

* Elsensee/ticket/13083:
  [ticket/13083] Fix language string NO_ENTRIES for logs
2014-11-11 11:56:23 +01:00
omniError
71e0de5588 [ticket/13328] add core.mcp_view_forum_modify_sql
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
2014-11-10 22:57:54 -06:00
omniError
42b595e7e7 [ticket/13326] add viewtopic_url to event
https://tracker.phpbb.com/browse/PHPBB3-13326

PHPBB3-13326
2014-11-10 20:35:23 -06:00
omniError
a143a19b8b [ticket/13306] add error level to collector
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
2014-11-10 18:05:18 -06:00
omniError
2d0917c56e [ticket/13323] empty auth option in posting.php
https://tracker.phpbb.com/browse/PHPBB3-13323

PHPBB3-13323
2014-11-10 17:23:23 -06:00
Matt Friedman
971b30a76d [ticket/13290] Add EVENT index_body_forumlist_body_after
PHPBB3-13290
2014-11-10 13:56:52 -08:00
lavigor
8171087cfb [ticket/13318] login_username needs to have the multibyte parameter set to true
This is needed for usernames with UTF-8 characters.

PHPBB3-13318
2014-11-10 20:12:10 +03:00
Marc Alexander
9bb302b92c [ticket/security-169] Stop loop through referer dir in top directory
SECURITY-169
2014-11-09 23:00:39 +01:00
Marc Alexander
697ae43b2e Merge branch 'develop-ascraeus' into develop 2014-11-09 20:01:42 +01:00
Marc Alexander
6a4cb42565 Merge pull request #3113 from prototech/ticket/13251
[ticket/13251] Escape container parameters defined from config.php.
2014-11-09 20:01:20 +01:00
Oliver Schramm
b6f0c789d5 [ticket/13310] Add event core.acp_email_modify_sql
PHPBB3-13310
2014-11-09 15:34:54 +01:00
rxu
483af1d036 [ticket/13297] Add unicode modifier to url/email regular expression patterns.
PHPBB3-13297
2014-11-09 20:59:14 +07:00
Joas Schilling
e29eece45f Merge branch 'develop-ascraeus' into develop 2014-11-09 14:50:15 +01:00
Joas Schilling
7ab774bc8d Merge pull request #3121 from Elsensee/ticket/13300
[ticket/13300] Don't show jabber in profile if jabber is disabled
2014-11-09 14:50:06 +01:00
Marc Alexander
f23634d580 [ticket/13197] Fix tabbing
PHPBB3-13197
2014-11-09 13:43:26 +01:00
Marc Alexander
8dd32c2bb5 [ticket/13197] Correctly format sql query
PHPBB3-13197
2014-11-09 13:07:38 +01:00
Marc Alexander
e603451b2f Merge branch 'develop-ascraeus' into develop 2014-11-09 10:43:02 +01:00
Marc Alexander
10b628a20a Merge pull request #3120 from Elsensee/ticket/13301
[ticket/13301] Fix called function in apche auth module
2014-11-09 10:42:30 +01:00
Marc Alexander
b8636ab961 Merge branch 'develop-ascraeus' into develop 2014-11-09 10:39:17 +01:00
Marc Alexander
8e64652d80 Merge pull request #3119 from Elsensee/ticket/13243
[ticket/13243] Validate announcement entry for existence in version_helper
2014-11-09 10:38:48 +01:00
Oliver Schramm
054ab67771 [ticket/13310] Always use sql_build_query in acp_email.php
PHPBB3-13310
2014-11-09 02:46:50 +01:00
Oliver Schramm
98711450dd [ticket/13309] Add event acp_email_options_after
PHPBB3-13309
2014-11-09 02:31:20 +01:00
Oliver Schramm
ced316d88c [ticket/13300] Don't show jabber in profile if jabber is disabled
PHPBB3-13300
2014-11-09 02:22:39 +01:00
Oliver Schramm
c4628bd92a [ticket/13301] Fix called function in apche auth module
PHPBB3-13301
2014-11-09 01:37:28 +01:00
Oliver Schramm
3fba5e317a [ticket/13243] Validate announcement entry for existence in version_helper
PHPBB3-13243
2014-11-09 01:21:40 +01:00
Joas Schilling
5b7178badf Merge branch 'develop-ascraeus' into develop 2014-11-09 00:39:36 +01:00
Joas Schilling
101945acf9 Merge pull request #3110 from Elsensee/ticket/13242
[ticket/13242] Fix HTML validity
2014-11-09 00:39:19 +01:00
Cesar G
c136b4e5fa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13265] Don't show link to edit own profile to those without permission
2014-11-08 13:53:45 -08:00
Cesar G
92c509bc48 Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeus
* Elsensee/ticket/13265:
  [ticket/13265] Don't show link to edit own profile to those without permission
2014-11-08 13:53:11 -08:00
rxu
70641e701a [ticket/13220] Add template events to memberlist_search.html
PHPBB3-13220
2014-11-08 21:22:59 +07:00
Nicolas Grekas
d1a879a56c [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback 2014-11-08 11:41:58 +01:00
Nicolas Grekas
a2300eb3aa [feature/patchwork-utf8] Remove utf8_str_replace 2014-11-08 11:41:55 +01:00
Nicolas Grekas
5a7caf6508 [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback 2014-11-08 11:36:13 +01:00
Tristan Darricau
9aa8f44489 [ticket/13133] Rename $ok variable
PHPBB3-13133
2014-11-07 15:57:31 +01:00
Tristan Darricau
1601b61ef9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
2014-11-07 15:21:01 +01:00
Tristan Darricau
778e0e06f3 Merge pull request #3118 from prototech/ticket/13270
[ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.

* prototech/ticket/13270:
  [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
2014-11-07 15:19:35 +01:00
Tristan Darricau
b5ddd87c42 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13303] Speed up migration dependency calculation.
2014-11-07 11:40:40 +01:00
Tristan Darricau
8956ec0bd4 Merge pull request #3117 from prototech/ticket/13303
[ticket/13303] Speed up migration dependency calculation.

* prototech/ticket/13303:
  [ticket/13303] Speed up migration dependency calculation.
2014-11-07 11:38:40 +01:00
Cesar G
757e1eac7a [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
PHPBB3-13270
2014-11-07 02:31:11 -08:00
Cesar G
95140bb724 [ticket/13303] Speed up migration dependency calculation.
PHPBB3-13303
2014-11-07 02:30:44 -08:00
Cesar G
d60534d52c [ticket/13251] Escape container parameters defined from config.php.
PHPBB3-13251
2014-11-07 02:30:03 -08:00
Tristan Darricau
122c1c6e05 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13280] Remove unneeded str_replace in build_url()
  [ticket/13280] Only run sanitizer for server superglobal and modify tests
  [ticket/13280] Seperate server sanitizer call and add comment
  [ticket/13280] Add additional sanitizer for ampersands in server superglobal
  [ticket/13280] Correctly format user page for build_url()
  [ticket/13280] Properly format the current page and add sanitizer to tests
2014-11-07 11:10:26 +01:00
Tristan Darricau
a1b58d05d1 Merge pull request #3107 from marc1706/ticket/13280
[ticket/13280] Properly format the current page and add sanitizer to tests

* marc1706/ticket/13280:
  [ticket/13280] Remove unneeded str_replace in build_url()
  [ticket/13280] Only run sanitizer for server superglobal and modify tests
  [ticket/13280] Seperate server sanitizer call and add comment
  [ticket/13280] Add additional sanitizer for ampersands in server superglobal
  [ticket/13280] Correctly format user page for build_url()
  [ticket/13280] Properly format the current page and add sanitizer to tests
2014-11-07 11:10:03 +01:00
Marc Alexander
f432193e07 [ticket/13280] Remove unneeded str_replace in build_url()
PHPBB3-13280
2014-11-06 13:45:09 +01:00
Oliver Schramm
25a7c6e829 [ticket/13083] Fix language string NO_ENTRIES for logs
The string was misleading because there does not
always have to be a period when viewing log entries.

PHPBB3-13083
2014-11-05 21:16:04 +01:00
Oliver Schramm
307fa831d6 [ticket/13265] Don't show link to edit own profile to those without permission
PHPBB3-13265
2014-11-05 21:06:32 +01:00
Oliver Schramm
85031a66cc [ticket/13242] Fix HTML validity
PHPBB3-13242
2014-11-05 20:59:38 +01:00
Oliver Schramm
32010de36e [ticket/13284] Set message body in topic form too, so it will be sent
PHPBB3-13284
2014-11-04 18:33:59 +01:00
Oliver Schramm
b32dc8c667 [ticket/13284] Fix request name so users can cc themselves
PHPBB3-13284
2014-11-04 18:22:46 +01:00
Marc Alexander
32881dbe31 [ticket/13280] Only run sanitizer for server superglobal and modify tests
PHPBB3-13280
2014-11-04 16:54:45 +01:00
Marc Alexander
3986470b3c [ticket/13280] Seperate server sanitizer call and add comment
PHPBB3-13280
2014-11-04 16:14:11 +01:00
Oliver Schramm
e502c8db86 [ticket/13100] Remove pointless variable
PHPBB3-13100
2014-11-04 00:46:06 +01:00
Marc Alexander
13b59af1ff [ticket/13280] Add additional sanitizer for ampersands in server superglobal
PHPBB3-13280
2014-11-03 17:27:01 +01:00
Marc Alexander
6fd092b5df [ticket/13280] Correctly format user page for build_url()
PHPBB3-13280
2014-11-03 16:24:09 +01:00
Marc Alexander
6cc7da0c9c [ticket/13280] Properly format the current page and add sanitizer to tests
PHPBB3-13280
2014-11-03 16:07:32 +01:00
Marc Alexander
0868831675 [ticket/13204] Tell user that password was incorrect when exceeding attempts
At the end of the login method, the captcha was entered correctly and only
the password was incorrect. Therefore, just tell the user that the password
was incorrect. He will see that he still needs to enter a captcha.

PHPBB3-13204
2014-11-02 11:18:08 +01:00
Nils Adermann
29d2a7bc9f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13271] Disable CC sender feature for anonymous users
  [prep-release-3.1.1] Add 3.1.1 CHANGELOG
  [prep-release-3.1.1] Add 3.1.1 migration file
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
  [ticket/13248] Use functional framework login method in tests
  [ticket/13248] Correctly pass provider name
  [ticket/13248] Always use provider collection for getting provider
  [ticket/13248] Allow specifying different auth provider in provider collection
  [ticket/13248] Use auth provider collection for getting provider
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
  [ticket/13267] Update Automatic Update instructions to include vendor directory
  [ticket/13268] Properly append ternary result in get_existing_indexes()
  [prep-release-3.1.1] Update version number to 3.1.1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/memberlist_email.html
2014-11-02 01:29:04 +01:00
Nils Adermann
0e772afb9d Merge branch 'prep-release-3.1.1' into develop-ascraeus
* prep-release-3.1.1:
  [ticket/13271] Disable CC sender feature for anonymous users
  [prep-release-3.1.1] Add 3.1.1 CHANGELOG
  [prep-release-3.1.1] Add 3.1.1 migration file
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
  [ticket/13248] Use functional framework login method in tests
  [ticket/13248] Correctly pass provider name
  [ticket/13248] Always use provider collection for getting provider
  [ticket/13248] Allow specifying different auth provider in provider collection
  [ticket/13248] Use auth provider collection for getting provider
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
  [ticket/13267] Update Automatic Update instructions to include vendor directory
  [ticket/13268] Properly append ternary result in get_existing_indexes()
  [prep-release-3.1.1] Update version number to 3.1.1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2014-11-02 01:25:51 +01:00
Nils Adermann
b6a4f83c41 Merge remote-tracking branch 'github-security/ticket/security-164-alt' into prep-release-3.1.1
* github-security/ticket/security-164-alt:
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
2014-11-02 00:24:02 +01:00
Nils Adermann
c980402a4c Merge branch 'ticket/13271' into prep-release-3.1.1
* ticket/13271:
  [ticket/13271] Disable CC sender feature for anonymous users
2014-11-02 00:22:58 +01:00
Nils Adermann
27be69e3b3 [ticket/13271] Disable CC sender feature for anonymous users
PHPBB3-13271
2014-11-02 00:21:23 +01:00
Nils Adermann
aede89d408 [prep-release-3.1.1] Add 3.1.1 CHANGELOG 2014-11-02 00:20:44 +01:00
Nils Adermann
4ae9e8cf6e [prep-release-3.1.1] Add 3.1.1 migration file 2014-11-02 00:08:21 +01:00
Nils Adermann
0843fd4b77 Merge remote-tracking branch 'github-marc1706/ticket/13263' into prep-release-3.1.1
* github-marc1706/ticket/13263:
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist
2014-11-01 23:57:12 +01:00
Marc Alexander
7461536459 [ticket/13263] Make sure default style exists and clean up code
PHPBB3-13263
2014-11-01 23:53:58 +01:00
Marc Alexander
d1f85f0de3 [ticket/13263] Only install/set prosilver if no style available
Users that have a nonexistent style selectd will revert back to the default
style.

PHPBB3-13263
2014-11-01 23:53:53 +01:00
Marc Alexander
be8b5a41c8 [ticket/13263] Use prosilver as default style if user's style doesn't exist
If prosilver is not installed for whatever reason, it will be installed by
the newly added migration.

PHPBB3-13263
2014-11-01 23:53:48 +01:00
Marc Alexander
f534503a66 [ticket/security-164] Correctly format page_name
SECURITY-164
2014-11-01 22:43:28 +01:00
Marc Alexander
28ef238a5c [ticket/security-164] Sanitize all global variables in symfony_request class
SECURITY-164
2014-11-01 22:43:18 +01:00
Nils Adermann
dde1c7424f Merge pull request #3104 from marc1706/ticket/13248-alt
[ticket/13248] Login functions need to use provider collection for retrieving provider
2014-11-01 22:41:27 +01:00
Marc Alexander
8aec6b58e0 [ticket/13248] Use functional framework login method in tests
PHPBB3-13248
2014-11-01 21:54:34 +01:00
Marc Alexander
d9c868d0f5 [ticket/13248] Correctly pass provider name
PHPBB3-13248
2014-11-01 21:54:27 +01:00
Marc Alexander
a9249bce5e [ticket/13248] Always use provider collection for getting provider
PHPBB3-13248
2014-11-01 21:54:21 +01:00
Marc Alexander
c3f5dc75be [ticket/13248] Allow specifying different auth provider in provider collection
PHPBB3-13248
2014-11-01 21:54:14 +01:00
Marc Alexander
6b057e026c [ticket/13248] Use auth provider collection for getting provider
PHPBB3-13248
2014-11-01 21:54:06 +01:00
Nils Adermann
f3588c66ec Merge branch 'ticket/13262' into prep-release-3.1.1
* ticket/13262:
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
2014-11-01 19:14:11 +01:00
Matt Friedman
a269929f0e [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
PHPBB3-13262
2014-11-01 19:14:00 +01:00
Nils Adermann
45d054d295 Merge branch 'ticket/13267' into prep-release-3.1.1
* ticket/13267:
  [ticket/13267] Update Automatic Update instructions to include vendor directory
2014-11-01 19:13:21 +01:00
Patrick Webster
8bdbadabb2 [ticket/13267] Update Automatic Update instructions to include vendor directory
PHPBB3-13267
2014-11-01 19:13:09 +01:00
Nils Adermann
2cc9fe5267 Merge branch 'ticket/13268' into prep-release-3.1.1
* ticket/13268:
  [ticket/13268] Properly append ternary result in get_existing_indexes()
2014-11-01 19:12:43 +01:00
Patrick Webster
c3aca59cfb [ticket/13268] Properly append ternary result in get_existing_indexes()
PHPBB3-13268
2014-11-01 19:12:28 +01:00
Nils Adermann
3f3c8d74e8 [prep-release-3.1.1] Update version number to 3.1.1 2014-11-01 18:47:56 +01:00
Jakub Senko
4522db7624 [ticket/13266] Enable twig dump function
PHPBB3-13266
2014-11-01 12:31:58 +01:00
Marc Alexander
9908f8e3ea Merge branch 'develop-ascraeus' into develop 2014-11-01 09:10:48 +01:00
Marc Alexander
a61299a940 Merge pull request #3098 from VSEphpbb/ticket/13262
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
2014-11-01 09:10:34 +01:00
Marc Alexander
03537e1b94 Merge branch 'develop-ascraeus' into develop 2014-11-01 09:08:47 +01:00
Marc Alexander
af77106a2f Merge pull request #3097 from prototech/ticket/13253
[ticket/13253] Fix MCP queue link in active topics search.
2014-11-01 09:08:11 +01:00
Matt Friedman
416577f3dc [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
PHPBB3-13262
2014-10-31 13:08:36 -07:00
Cesar G
65c3f2a8f1 [ticket/13253] Fix MCP queue link in active topics search.
PHPBB3-13253
2014-10-30 22:47:51 -07:00
Andreas Fischer
57afbbb48a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13241] Remove sleep() and change flood interval instead
  [ticket/13241] Remove sleep() since the method takes care of this now
  [ticket/13241] Sleep for 1 second when posting twice in the same second
  [ticket/13241] Fix pagination with global announcements
  [ticket/13241] Correctly ignore announcements from topics list
  [ticket/13241] Add a functional test for viewforum with global announcement
2014-10-29 15:10:40 +01:00
Andreas Fischer
17928563a2 Merge pull request #3093 from nickvergessen/ticket/13241
[ticket/13241] Fix pagination of viewforum with global announcements

* nickvergessen/ticket/13241:
  [ticket/13241] Remove sleep() and change flood interval instead
  [ticket/13241] Remove sleep() since the method takes care of this now
  [ticket/13241] Sleep for 1 second when posting twice in the same second
  [ticket/13241] Fix pagination with global announcements
  [ticket/13241] Correctly ignore announcements from topics list
  [ticket/13241] Add a functional test for viewforum with global announcement
2014-10-29 15:10:39 +01:00
Andreas Fischer
ae55db6da4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12703] Only query database for subscription types once
2014-10-29 15:09:55 +01:00
Andreas Fischer
bb4f65d743 Merge pull request #3076 from marc1706/ticket/12703
[ticket/12703] Only query database for subscription types once

* marc1706/ticket/12703:
  [ticket/12703] Only query database for subscription types once
2014-10-29 15:09:55 +01:00
Andreas Fischer
c755aa91e8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
2014-10-29 15:09:22 +01:00
Andreas Fischer
932b75c166 Merge pull request #3065 from dhruvgoel92/feature/phantom
[feature/phantom]

* dhruvgoel92/feature/phantom:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
2014-10-29 15:09:22 +01:00
Joas Schilling
1787ccb585 [ticket/13241] Remove sleep() and change flood interval instead
PHPBB3-13241
2014-10-29 14:17:15 +01:00
Joas Schilling
b868886b25 [ticket/13241] Remove sleep() since the method takes care of this now
PHPBB3-13241
2014-10-29 13:42:44 +01:00
Joas Schilling
e42202e794 [ticket/13241] Sleep for 1 second when posting twice in the same second
PHPBB3-13241
2014-10-29 13:42:43 +01:00
Joas Schilling
9ee177573d [ticket/13241] Fix pagination with global announcements
PHPBB3-13241
2014-10-29 13:42:42 +01:00
Joas Schilling
ae6a3b03c4 [ticket/13241] Correctly ignore announcements from topics list
PHPBB3-13241
2014-10-29 13:42:41 +01:00
Joas Schilling
82aed75b3b [ticket/13241] Add a functional test for viewforum with global announcement
PHPBB3-13241
2014-10-29 13:42:41 +01:00
Joas Schilling
e874e1ea47 Merge branch 'develop-ascraeus' into develop 2014-10-28 13:35:34 +01:00
Joas Schilling
3a2ccd079e Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-28 13:35:27 +01:00
Joas Schilling
197fed16bd [prep-release-3.1.0] Update changelog with final changes 2014-10-28 13:08:52 +01:00
Joas Schilling
d27deeef02 Merge branch 'develop-ascraeus' into develop 2014-10-28 12:58:52 +01:00
Joas Schilling
c57fbe9d0d Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-28 12:58:45 +01:00
Joas Schilling
12033bc499 Merge branch 'develop-olympus' into prep-release-3.1.0
Conflicts:
	phpBB/phpbb/session.php
2014-10-28 12:57:38 +01:00
Joas Schilling
71c19f6eb7 Merge pull request #3091 from Nicofuma/ticket/13234-2
Ticket/13234 2
2014-10-28 12:56:47 +01:00
Joas Schilling
d2cd24e875 Merge pull request #3090 from Nicofuma/ticket/13234
Ticket/13234
2014-10-28 12:56:15 +01:00
Tristan Darricau
9036edd935 [ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2
* ticket/13234:
  [ticket/13234] Fix conditions and CS

Conflicts:
	phpBB/phpbb/session.php

PHPBB3-13234
2014-10-28 12:27:16 +01:00
Tristan Darricau
fcc320e385 [ticket/13234] Fix conditions and CS
PHPBB3-13234
2014-10-28 12:19:53 +01:00
Joas Schilling
5426e9c700 Merge branch 'develop-ascraeus' into develop 2014-10-28 10:03:09 +01:00
Joas Schilling
0682e5719d Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-28 10:02:53 +01:00
Joas Schilling
679559ce18 Merge branch 'naderman-ticket/13232' into prep-release-3.1.0 2014-10-28 10:02:33 +01:00
Joas Schilling
2e814cc43f [ticket/13232] Fix spaces vs tabs
PHPBB3-13232
2014-10-28 10:01:28 +01:00
Nils Adermann
087a5363bb [ticket/13234-2] Correctly verify that user_id is set in user data array
PHPBB3-13234-2
2014-10-27 23:56:20 -07:00
Nils Adermann
3472b6c5bc [ticket/13234-2] Never allow autologin/remember me to modify the userid
Ascraeus version of 64d97d0787 commit

PHPBB3-13234
2014-10-27 19:58:32 -07:00
Nils Adermann
e1277c26ca Merge branch 'ticket/13234' into ticket/13234-2
* ticket/13234:
  [ticket/13234] Never allow autologin/remember me to modify the userid
2014-10-27 19:57:16 -07:00
Nils Adermann
64d97d0787 [ticket/13234] Never allow autologin/remember me to modify the userid
This prevents admin relogin with forced user id from overwriting
remember me cookies

PHPBB3-13234
2014-10-27 19:55:56 -07:00
Nils Adermann
2438bfbfc6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13227] Properly handle curlwrapper headers in remote avatars
  [ticket/13231] Update the dependencies of the migration contact_admin_form
2014-10-27 19:04:13 -07:00
Nils Adermann
b9c08cddd4 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [ticket/13227] Properly handle curlwrapper headers in remote avatars
  [ticket/13231] Update the dependencies of the migration contact_admin_form
2014-10-27 19:04:01 -07:00
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
efe3aaaf0b Merge pull request #3085 from naderman/ticket/13227
[ticket/13227] Properly handle curlwrapper headers in remote avatars
2014-10-27 18:58:11 -07:00
Nils Adermann
df1212ce27 Merge pull request #3083 from Nicofuma/ticket/13231
[ticket/13231] Update the dependencies of the migration contact_admin_form
2014-10-27 18:51:47 -07:00
Nils Adermann
66c23d6855 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
2014-10-27 17:02:09 -07:00
Nils Adermann
4c75f013de Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
2014-10-27 17:01:57 -07:00
Nils Adermann
1f31e8e243 Merge branch 'ticket/13229' into prep-release-3.1.0
* ticket/13229:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
2014-10-27 17:01:46 -07:00
rxu
16d78407db [ticket/13229] Fix overloading memberlist with redundant SQL queries
PHPBB3-13229
2014-10-27 17:01:29 -07:00
Nils Adermann
4e4c3de103 [ticket/13227] Properly handle curlwrapper headers in remote avatars
Read a bit of the file to ensure header values are populated and then
handle headers in the nested array structure too.

PHPBB3-13227
2014-10-27 16:49:30 -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
Tristan Darricau
47663a4ad3 [ticket/13231] Update the dependencies of the migration contact_admin_form
PHPBB3-13231
2014-10-27 23:45:24 +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
Joas Schilling
120bdf9364 Merge branch 'develop-ascraeus' into develop 2014-10-27 23:40:19 +01:00
Joas Schilling
91a9d25a38 Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-27 23:40:04 +01:00
Joas Schilling
aa916fc43f Merge pull request #3077 from marc1706/ticket/13225
[ticket/13225] Use passwords manager instead of phpbb_hash in migration
2014-10-27 23:38:53 +01:00
Dhruv
505ee586ff [ticket/12962] Rename setup-phpbb-test
PHPBB3-12962
2014-10-27 18:36:33 -04:00
Marc Alexander
b295fa4f4f [ticket/13225] Prefix converted passwords with $CP$ in phpBB 3.0.5-RC1
PHPBB3-13225
2014-10-27 20:57:31 +01:00
Nils Adermann
d74bf0f370 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13230] Add missing globals and missing request object for path helper
  [ticket/13226] Add functional test for group ranks
  [ticket/13226] Fix the usage of $rank_img
2014-10-27 12:25:53 -07:00
Nils Adermann
b1d7386075 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [ticket/13230] Add missing globals and missing request object for path helper
  [ticket/13226] Add functional test for group ranks
  [ticket/13226] Fix the usage of $rank_img
2014-10-27 12:25:41 -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
Dhruv
cc82f95c8f [ticket/12962] Use phpVersion in phpunit.xml
PHPBB3-12962
2014-10-27 08:13:41 -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
Dhruv
c6cca9d0d2 [ticket/12962] Functional tests run for php <5.3.19
PHPBB3-12962
2014-10-26 21:30:31 -07:00
Dhruv
98554475be [ticket/12962] Clean up composer.json
PHPBB3-12962
2014-10-26 20:58:21 -07:00
Marc Alexander
6cc5160d60 [ticket/13225] Use passwords manager instead of phpbb_hash in migration
PHPBB3-13225
2014-10-26 17:14:34 -07:00
Marc Alexander
cb65cd363a [ticket/12703] Only query database for subscription types once
PHPBB3-12703
2014-10-26 13:56:34 -07:00
Nils Adermann
741bac5b2e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes
2014-10-26 12:54:09 -07:00
Nils Adermann
222bec0204 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes
2014-10-26 12:54:02 -07: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
10251b43db Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13223] Fix USERNAME email template variable in notification
2014-10-26 12:48:35 -07:00
Nils Adermann
78aa120089 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [ticket/13223] Fix USERNAME email template variable in notification
2014-10-26 12:48:25 -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
a686ed3df0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13221] Add bot_update as a dependency to gold
  [ticket/13221] Perform bot updates after user table changes
2014-10-26 12:43:33 -07:00
Nils Adermann
c19ab58420 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [ticket/13221] Add bot_update as a dependency to gold
  [ticket/13221] Perform bot updates after user table changes
2014-10-26 12:43:17 -07:00
Marc Alexander
b0942fe31d [ticket/13197] Test that user's group avatar is deleted by group avatar delete
PHPBB3-13197
2014-10-26 12:42:47 -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
Andreas Fischer
e4277525a0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
2014-10-26 14:20:34 +01:00
Andreas Fischer
69cf5782d4 Merge pull request #3054 from Senky/ticket/13193
[ticket/13193] Post count in PMs not a link

* Senky/ticket/13193:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
2014-10-26 14:20:33 +01:00
brunoais
1fc7bd107d [ticket/13141] Ups wrong version
PHPBB3-13141
2014-10-26 10:58:53 +00:00
brunoais
203f9c24d4 [ticket/13141] Implement core.mcp_global_f_read_auth_after
PHPBB3-13141
2014-10-26 10:58:23 +00:00
Jakub Senko
79274e904c [ticket/13193] Swap ternary condition members
PHPBB3-13193
2014-10-26 08:44:21 +01:00
Nils Adermann
5b42bcfe62 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13216] Use gmdate() instead of date() in datetime tests
2014-10-25 21:27:02 -07:00
Nils Adermann
5441a4ea13 Merge pull request #3067 from marc1706/ticket/13216
[ticket/13216] Use gmdate() instead of date() in datetime tests
2014-10-25 21:26:38 -07:00
Nils Adermann
85e3b135f8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13207] Use assert_checkbox_is_checked for registration test
2014-10-25 21:01:58 -07:00
Nils Adermann
5c1ef45488 Merge remote-tracking branch 'github-marc1706/ticket/13207' into develop-ascraeus
* github-marc1706/ticket/13207:
  [ticket/13207] Use assert_checkbox_is_checked for registration test
2014-10-25 21:01:51 -07:00
Nils Adermann
ad25f2b182 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [develop-ascraeus] Update version number to 3.1.1-RC1-dev
2014-10-25 20:30:39 -07:00
Nils Adermann
7a4b404af7 [develop-ascraeus] Update version number to 3.1.1-RC1-dev 2014-10-25 20:28:46 -07:00
Marc Alexander
1046ada9fc [ticket/13216] Use gmdate() instead of date() in datetime tests
PHPBB3-13216
2014-10-25 20:25:57 -07:00
Marc Alexander
cafd3b79fd [ticket/13207] Use assert_checkbox_is_checked for registration test
PHPBB3-13207
2014-10-25 20:05:25 -07:00
Nils Adermann
d70d2cfcd1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
2014-10-25 18:11:09 -07:00
Nils Adermann
a5830fe0d5 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
2014-10-25 18:11:03 -07:00
Nils Adermann
5cee745fc5 [prep-release-3.1.0] Add missing CHANGELOG entries for RC6 2014-10-25 18:10:30 -07:00
Dhruv
1c88a2cb25 [ticket/12962] Fix Line Endings in bootstrap
PHPBB3-12962
2014-10-25 17:33:47 -07:00
Nils Adermann
cfe1a7d6d1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0] Add CHANGELOG for 3.1.0
2014-10-25 17:12:42 -07:00
Nils Adermann
9c95831f35 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [prep-release-3.1.0] Add CHANGELOG for 3.1.0
2014-10-25 17:12:34 -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
76cdc2d891 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0] Add 3.1.0 gold release migration
2014-10-25 17:05:13 -07:00
Nils Adermann
8de93bee95 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [prep-release-3.1.0] Add 3.1.0 gold release migration
2014-10-25 17:05:07 -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
33d0872a18 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:56:26 -07:00
Nils Adermann
26d4483d36 Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [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:56:05 -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
1da1a70650 [ticket/13197] Also delete group avatar from users that have it set
PHPBB3-13197
2014-10-25 15:57:41 -07:00
Dhruv
e78210dc96 [ticket/12962] Load composer test dependencies for php >= 5.3.19
PHPBB3-12962
2014-10-25 15:34:39 -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
12f7275c8e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13215] Update Symfony components to v2.3.21.

Conflicts:
	phpBB/composer.lock
2014-10-25 14:04:18 -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
3b821d383f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
2014-10-25 12:10:00 -07: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
d9f84da577 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:04:58 -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
d3026bd895 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13210] Use the correct config value
2014-10-25 19:50:34 +02: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
f6d8183f47 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-10-25 19:46:24 +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
947ab91473 Merge branch 'develop-ascraeus' into develop
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-10-23 02:45:54 +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
acf6eaf8a8 Merge branch 'develop-ascraeus' into develop 2014-10-23 01:38:54 +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
Marc Alexander
378fef022f Merge branch 'develop-ascraeus' into develop 2014-10-22 17:42:51 -05:00
Marc Alexander
6a0727acdc Merge pull request #3058 from naderman/ticket/13205
[ticket/13205] Add a mark all messages read link to PM folders
2014-10-22 17:39:13 -05:00
Nils Adermann
df72846b89 [ticket/13205] Explicitly cast ids to integers and reformat SQL
PHPBB3-13205
2014-10-22 18:35:07 -04:00
Nils Adermann
b5594371ab [ticket/13205] Remove superfluous newline
PHPBB3-13205
2014-10-22 18:31:29 -04:00
Nils Adermann
00c57ed122 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/security-159] Only show first 8 characters of login keys in UCP
2014-10-22 18:21:12 -04:00
Nils Adermann
d7553893c4 Merge pull request #3057 from marc1706/ticket/security-159
[ticket/security-159] Only show first 8 characters of login keys in UCP
2014-10-22 18:20:46 -04:00
Nils Adermann
48dc4c02ae [ticket/13205] Add a mark all messages read link to PM folders
PHPBB3-13205
2014-10-22 18:02:43 -04:00
Marc Alexander
f796f92058 [ticket/security-159] Only show first 8 characters of login keys in UCP
SECURITY-159
2014-10-22 16:21:16 -05:00
Nils Adermann
d08a47d857 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13203] Fix passwords manager tests
  [ticket/13203] Use string_compare method in passwords drivers
  [ticket/13203] Add method for byte by byte comparison to drivers helper
2014-10-22 16:58:50 -04:00
Nils Adermann
fad280f94b Merge pull request #3056 from marc1706/ticket/13203
[ticket/13203] Use constant time comparison method for comparing password hashes
2014-10-22 16:57:50 -04:00
Marc Alexander
cf9d1fbd1a [ticket/13203] Fix passwords manager tests
PHPBB3-13203
2014-10-22 15:09:58 -05:00
Marc Alexander
0bc04a4df0 [ticket/13203] Use string_compare method in passwords drivers
PHPBB3-13203
2014-10-22 14:54:55 -05:00
Marc Alexander
2b47ef1266 [ticket/13203] Add method for byte by byte comparison to drivers helper
PHPBB3-13203
2014-10-22 14:54:22 -05:00
Tristan Darricau
fdece6cdf3 [ticket/13126] Add missing use statement
PHPBB3-13126
2014-10-22 15:25:50 +02:00
Marc Alexander
a623868f20 [ticket/13192] Pass correct parameters and rename method to get_valid_page
PHPBB3-13192
2014-10-21 22:38:03 -05:00
Marc Alexander
ce8c09f51f [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
The $request global existed twice and the $phpEx global is not being used
in confirm_box().

PHPBB3-13192
2014-10-21 22:17:48 -05:00
Marc Alexander
c381ad2002 [ticket/13192] Use get_valid_user_page method in build_url function
PHPBB3-13192
2014-10-21 22:17:24 -05:00
Marc Alexander
40497ec824 [ticket/13192] Add method for generating valid user page links
PHPBB3-13192
2014-10-21 22:16:53 -05:00
Marc Alexander
14bfba5070 Merge branch 'develop-ascraeus' into develop 2014-10-21 19:25:09 -05:00
Marc Alexander
e43d1781bf Merge branch 'develop-olympus' into develop-ascraeus
Conflicts:
	phpBB/docs/AUTHORS
2014-10-21 19:24:48 -05:00
Marc Alexander
d51c1707e3 Merge pull request #3051 from nickvergessen/ticket/12120
[ticket/12120] Remove EXreaction from active authors
2014-10-21 19:22:11 -05:00
Marc Alexander
7c4b7f63fc Merge branch 'develop-ascraeus' into develop 2014-10-21 18:58:06 -05:00
Marc Alexander
faec26b873 Merge pull request #3053 from Senky/ticket/13194
[ticket/13194] BBCode isn't parsed when issuing a warning for a post
2014-10-21 18:57:43 -05:00
Marc Alexander
49d91a2ceb Merge branch 'develop-ascraeus' into develop 2014-10-21 18:54:12 -05:00
Marc Alexander
0de7adfa37 Merge pull request #3052 from VSEphpbb/ticket/13041
[ticket/13041] Help_faq.php language file needs to be revised
2014-10-21 18:53:51 -05:00
Jakub Senko
5581a30f58 [ticket/13193] Make template more readable
PHPBB3-13193
2014-10-21 23:12:00 +02:00
Jakub Senko
0dcfcf5854 [ticket/13193] Add load_search config check
PHPBB3-13193
2014-10-21 22:53:59 +02:00
Jakub Senko
92f077a4e9 [ticket/13193] Add link to post count in PMs
PHPBB3-13193
2014-10-21 22:32:57 +02:00
Jakub Senko
defeb1a56f [ticket/13194] Use correct array to access bbcode_bitfield
PHPBB3-13194
2014-10-21 22:21:48 +02:00
Matt Friedman
4b99ab7066 [ticket/13041] Final grammar and language changes to help_faq
PHPBB3-13041
2014-10-21 09:54:25 -07:00
Joas Schilling
9cf81ac7f5 [ticket/12120] Remove EXreaction from active authors
PHPBB3-12120
2014-10-21 18:17:59 +02:00
Nils Adermann
b7386c0c82 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13189] Do not use confirm box for marking all notifications read
2014-10-21 09:49:42 -04:00
Nils Adermann
1358acfd7c Merge pull request #3049 from marc1706/ticket/13189
[ticket/13189] Do not use confirm box for marking all notifications read
2014-10-21 09:49:16 -04:00
Marc Alexander
75c5d6085b Merge branch 'develop-ascraeus' into develop 2014-10-20 22:44:47 -05:00
Marc Alexander
99eeb52b76 Merge pull request #3050 from prototech/ticket/13070
[ticket/13070] Adjust template hook name to match that provided in the class.
2014-10-20 22:44:33 -05:00
Cesar G
b9b15b7007 [ticket/13070] Adjust template hook name to match that provided in the class.
PHPBB3-13070
2014-10-20 19:59:56 -07:00
Marc Alexander
293d64e122 [ticket/13189] Do not use confirm box for marking all notifications read
We already use a token for preventing CSRF when marking notifications read.
Making a user confirm the marking read action serves no real purpose. No
information will be lost by just marking the notifications read but it will
prevent users from always having to confirm this action.

PHPBB3-13189
2014-10-20 21:55:36 -05:00
Andreas Fischer
a16f185413 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
2014-10-20 23:20:43 +02:00
Andreas Fischer
b71cf56bda Merge pull request #3047 from Elsensee/ticket/13168
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility

* Elsensee/ticket/13168:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
2014-10-20 23:20:42 +02:00
Andreas Fischer
afada9ed40 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
2014-10-20 23:20:42 +02:00
Joas Schilling
7c2ed57a99 Merge branch 'develop-ascraeus' into develop 2014-10-20 22:19:43 +02:00
Joas Schilling
75b6545bc2 Merge pull request #3040 from nickvergessen/ticket/13138-asc
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id

Conflicts:
	phpBB/phpbb/session.php
2014-10-20 22:19:25 +02:00
Nils Adermann
79d6f67e81 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13188] Correctly format string concatenation
  [ticket/13188] Add missing where clause to post_id query in sphinx index
2014-10-20 15:31:06 -04:00
Nils Adermann
973dfbf868 Merge pull request #3048 from naderman/ticket/13188
[ticket/13188] Add missing where clause to post_id query in sphinx index
2014-10-20 15:30:08 -04:00
Nils Adermann
ee97b92e5d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id
2014-10-20 14:53:52 -04:00
Nils Adermann
99f63f39eb Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id

Conflicts:
	phpBB/phpbb/session.php
2014-10-20 14:53:38 -04:00
Nils Adermann
d4faeb064b Merge pull request #3039 from nickvergessen/ticket/13138
[ticket/13138] Only use cookie data when we do not force a user_id
2014-10-20 14:49:29 -04:00
Tristan Darricau
981d3005f3 [ticket/13126] Fix tests
PHPBB3-13126
2014-10-20 20:46:11 +02:00
Tristan Darricau
faf4b03c43 [ticket/13126] Change messages verbosity levels
PHPBB3-13126
2014-10-20 19:42:54 +02:00
Tristan Darricau
8f6fcd2744 [ticket/13126] Move migrator_output_handler to an interface
PHPBB3-13126
2014-10-20 19:41:32 +02:00
Nils Adermann
941cf6979e [ticket/13188] Correctly format string concatenation
PHPBB3-13188
2014-10-20 12:20:44 -04:00
Nils Adermann
566c8a1bbc [ticket/13188] Add missing where clause to post_id query in sphinx index
PHPBB3-13188
2014-10-20 12:08:35 -04:00
Oliver Schramm
53f166274a [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
PHPBB3-13168
2014-10-20 16:47:52 +02:00
Joas Schilling
ac29211f91 Merge branch 'develop-ascraeus' into develop 2014-10-20 16:28:59 +02:00
Joas Schilling
57a575b5f0 Merge pull request #3046 from Elsensee/ticket/13187
[ticket/13187] Fix HTML validity of INSTALL.html
2014-10-20 16:28:44 +02:00
Oliver Schramm
51044167d1 [ticket/13187] Fix HTML validity of INSTALL.html
PHPBB3-13187
2014-10-20 15:36:27 +02:00
Joas Schilling
9c6b3d3931 Merge branch 'develop-ascraeus' into develop 2014-10-20 15:21:11 +02:00
Joas Schilling
009d59335f Merge pull request #2960 from prototech/ticket/12568
[ticket/12568] Update user docs
2014-10-20 15:21:00 +02:00
Joas Schilling
c08563b6a8 Merge branch 'develop-ascraeus' into develop 2014-10-20 14:24:15 +02:00
Joas Schilling
ec5729a99f Merge pull request #3045 from Elsensee/ticket/13186
[ticket/13186] Don't show link on post count when search disabled
2014-10-20 14:23:46 +02:00
Oliver Schramm
86c472f4f7 [ticket/13186] Don't show link on post count when search disabled
PHPBB3-13186
2014-10-20 13:25:07 +02:00
Oliver Schramm
30213816ae [ticket/13100] Display only confirmation buttons when deleting shadow topic
PHPBB3-13100
2014-10-20 00:24:16 +02:00
Marc Alexander
c6d65b051c Merge branch 'develop-ascraeus' into develop 2014-10-18 21:47:36 -04:00
Marc Alexander
c939f1b2c7 Merge pull request #3030 from Senky/ticket/13164
[ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility
2014-10-18 21:47:15 -04:00
Marc Alexander
6216771ac0 Merge branch 'develop-ascraeus' into develop 2014-10-18 18:00:38 -04:00
Marc Alexander
b3421e397d Merge pull request #3041 from nickvergessen/ticket/13171
[ticket/13171] Check the correct (soft)delete permission when deleting in MCP
2014-10-18 17:59:48 -04:00
Dhruv
1bb3d6b410 Merge branch 'develop-ascraeus' into develop
# By Nils Adermann
# Via Dhruv Goel (1) and Nils Adermann (1)
* develop-ascraeus:
  [ticket/13181] Replace database credentials with placeholders in sphinx conf
2014-10-19 01:30:26 +05:30
Dhruv Goel
c6272fca07 Merge pull request #3042 from naderman/ticket/13181
[ticket/13181] Replace database credentials with placeholders in sphinx conf
2014-10-19 01:28:36 +05:30
Nils Adermann
e7ad87e15f [ticket/13181] Replace database credentials with placeholders in sphinx conf
PHPBB3-13181
2014-10-18 12:32:39 -04:00
Mario Skouat
737894027a [ticket/13041] Added multiple changes
- Improper english in some sentences.
- Improper use of singular/plural in some sentences
- Replace "the board administrator" by "a board administrator"
- Update the category "Posting Issues" and "Subscriptions and Bookmarks"

PHPBB3-13041
2014-10-18 13:28:18 +02:00
Oliver Schramm
0ba3bd9aed [ticket/11863] Add functional test
PHPBB3-11863
2014-10-17 23:33:28 +02:00
Oliver Schramm
f049fcd604 [ticket/11863] Display warning to user because of activation method
PHPBB3-11863
2014-10-17 15:42:11 +02:00
Oliver Schramm
01df1d3301 [ticket/11863] Grey out unavailable activation methods when emails disabled
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
2014-10-17 15:40:03 +02:00
Joas Schilling
66342f5b89 [ticket/13171] Check the correct (soft)delete permission when deleting in MCP
PHPBB3-13171
2014-10-17 15:39:20 +02:00
Joas Schilling
dec6c7ea8c [ticket/13138] Type hint the variables for IDE usage
PHPBB3-13138
2014-10-17 14:53:56 +02:00
Joas Schilling
f847a1a567 [ticket/13138] Fix the session key tests
PHPBB3-13138
2014-10-17 14:50:14 +02:00
Cesar G
6763de2f25 [ticket/12568] Fix awkward use of "phpBB Limited."
PHPBB3-12568
2014-10-16 20:37:26 -07:00
Cesar G
09b6add6ee [ticket/12568] The "Purge cache" option in the Customise tab no longer exists.
PHPBB3-12568
2014-10-16 20:33:24 -07:00
Cesar G
810d249ca2 [ticket/12568] Update GitHub link.
PHPBB3-12568
2014-10-16 20:20:15 -07:00
Cesar G
29ea1c85b4 [ticket/12568] Fix typo - "directorie" -> "directories"
PHPBB3-12568
2014-10-16 20:18:52 -07:00
Cesar G
f19a6b9714 [ticket/12568] Remove various unnecessary references to phpBB3.
PHPBB3-12568
2014-10-16 20:17:01 -07:00
Cesar G
d06c2cf0f7 [ticket/12568] Update style installation instructions.
PHPBB3-12568
2014-10-16 19:47:02 -07:00
Cesar G
7e08109229 [ticket/12568] Update path to language pack installation page.
PHPBB3-12568
2014-10-16 19:47:02 -07:00
Cesar G
defd36ad7f [ticket/12568] Replace modifications explanation with extensions.
PHPBB3-12568
2014-10-16 19:47:02 -07:00
Cesar G
b22650d323 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12796] Use dedicated lang vars
  [ticket/12796] Use &amp; in path
  [ticket/12796] Add view own profile to UCP (and vice versa)
2014-10-16 19:32:28 -07:00
Cesar G
39e51e5599 Merge remote-tracking branch 'PayBas/ticket/12796' into develop-ascraeus
* PayBas/ticket/12796:
  [ticket/12796] Use dedicated lang vars
  [ticket/12796] Use &amp; in path
  [ticket/12796] Add view own profile to UCP (and vice versa)
2014-10-16 19:32:11 -07:00
Cesar G
1dbc5fc092 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13163] Check for images
  [ticket/13163] Terminate timely when no data-last links exist
  [ticket/13163] Fix responsive link lists
2014-10-16 19:20:17 -07:00
Cesar G
6768490f69 Merge remote-tracking branch 'PayBas/ticket/13163' into develop-ascraeus
* PayBas/ticket/13163:
  [ticket/13163] Check for images
  [ticket/13163] Terminate timely when no data-last links exist
  [ticket/13163] Fix responsive link lists
2014-10-16 19:19:53 -07:00
Joas Schilling
55b97ffc27 Merge branch 'ticket/13138-2' into ticket/13138-asc
Conflicts:
	phpBB/phpbb/session.php
2014-10-16 12:48:13 +02:00
Joas Schilling
e7e016637b [ticket/13138] Do not use cookie data and autologin while forcing a user_id
PHPBB3-13138
2014-10-16 12:32:48 +02:00
Tristan Darricau
58075e25e8 [ticket/13126] Extends migrator_output_handler instead of using a closure
PHPBB3-13126
2014-10-16 01:34:23 +02:00
Joas Schilling
819ba38a79 Merge branch 'develop-ascraeus' into develop 2014-10-15 21:15:13 +02:00
Joas Schilling
e1af6584d9 Merge pull request #3038 from prototech/ticket/12530
[ticket/12530] Move style and class to parent <a>.
2014-10-15 21:15:08 +02:00
Cesar G
23a513baec [ticket/12530] Move style and class to parent <a>.
PHPBB3-12530
2014-10-15 10:35:13 -07:00
Joas Schilling
9b6ac5e938 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:56:51 +02:00
Joas Schilling
b343bf783a Merge pull request #3037 from PayBas/ticket/13169
[ticket/13169] Fix RTL forms in responsive mode
2014-10-15 18:56:11 +02:00
Joas Schilling
2fbaffa561 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:47:53 +02:00
Joas Schilling
8be701db0a Merge pull request #2938 from PayBas/ticket/12530
[ticket/12530] Fix captcha challange image breaking responsive layout
2014-10-15 18:47:45 +02:00
Joas Schilling
7de0e17711 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:31:55 +02:00
Joas Schilling
90771c1762 Merge pull request #3024 from marc1706/ticket/13124
[ticket/13124] Also trim spaces in front of comments except for first line
2014-10-15 18:31:46 +02:00
Joas Schilling
e64c2b275d Merge branch 'develop-ascraeus' into develop 2014-10-15 18:29:43 +02:00
Joas Schilling
759950c1a6 Merge pull request #3036 from prototech/ticket/13177
[ticket/13177] Fix display of post count-based ranks in viewtopic.
2014-10-15 18:29:23 +02:00
PayBas
205be67622 [ticket/13169] Fix RTL forms in responsive mode
PHPBB3-13169
2014-10-15 17:08:11 +02:00
PayBas
1a128f9a76 [ticket/12796] Use dedicated lang vars
PHPBB3-12796
2014-10-15 16:07:01 +02:00
PayBas
223ae1dfc2 [ticket/13163] Check for images
PHPBB3-13163
2014-10-15 13:06:54 +02:00
PayBas
965894a875 [ticket/12530] Combine logo and TOS link into one
PHPBB3-12530
2014-10-15 12:08:55 +02:00
Cesar G
5c54e96aab [ticket/13177] Fix display of post count-based ranks in viewtopic.
PHPBB3-13177
2014-10-14 15:24:57 -07:00
Tristan Darricau
56d7c2c6ed [ticket/13126] Improve the feedback when running the migrations
PHPBB3-13126
2014-10-14 17:58:29 +02:00
Cesar G
f8019464c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage
2014-10-14 07:33:15 -07:00
Cesar G
df75b70f3e Merge remote-tracking branch 'PayBas/ticket/13174' into develop-ascraeus
* PayBas/ticket/13174:
  [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage
2014-10-14 07:32:54 -07:00
PayBas
4bdae294cb [ticket/12796] Use &amp; in path
PHPBB3-12796
2014-10-14 12:58:07 +02:00
PayBas
253c6e1fc1 [ticket/12796] Add view own profile to UCP (and vice versa)
PHPBB3-12796
2014-10-14 10:59:03 +02:00
PayBas
9c4ba813d4 [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage
PHPBB3-13174
2014-10-14 10:08:48 +02:00
PayBas
41d660dd98 [ticket/13163] Terminate timely when no data-last links exist
PHPBB3-13163
2014-10-14 00:05:22 +02:00
PayBas
36d1f87c5a [ticket/13163] Fix responsive link lists
PHPBB3-13163
2014-10-13 23:29:01 +02:00
Jakub Senko
9bc9e42c94 [ticket/13164] Fix syntax error
PHPBB3-13164
2014-10-11 17:58:41 +02:00
Jakub Senko
eb7152436c [ticket/13164] Add post_visibility to core.submit_post_end event
PHPBB3-13164
2014-10-11 16:56:03 +02:00
Mario Skouat
2bc79701e6 [ticket/13041] Added multiple changes
- Added the changes reported by VSE.

PHPBB3-13041
2014-10-11 10:43:01 +02:00
Tristan Darricau
1941328629 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13161] Check whether the schema exists, before deleting it
  [ticket/13161] Avoid problems when running tests with different migrations
2014-10-10 15:56:31 +02:00
Tristan Darricau
29b54d12cc Merge pull request #3029 from nickvergessen/ticket/13161
Ticket/13161 PHP Warnings issued from phpbb database test case

* nickvergessen/ticket/13161:
  [ticket/13161] Check whether the schema exists, before deleting it
  [ticket/13161] Avoid problems when running tests with different migrations
2014-10-10 15:55:03 +02:00
Joas Schilling
1a04d15d4d [ticket/13161] Check whether the schema exists, before deleting it
PHPBB3-13161
2014-10-10 15:26:29 +02:00
Joas Schilling
f6fc8c08a4 [ticket/13161] Avoid problems when running tests with different migrations
PHPBB3-13161
2014-10-10 15:26:28 +02:00
Jakub Senko
699c642128 [ticket/13164] Update post_visibility before event is triggered
PHPBB3-13164
2014-10-10 14:24:46 +02:00
Tristan Darricau
d285363700 [ticket/13133] Add unit tests
PHPBB3-13133
2014-10-09 19:54:56 +02:00
Marc Alexander
a9ed32663a [ticket/13124] Add another test case as requested
PHPBB3-13124
2014-10-09 13:30:10 -04:00
Tristan Darricau
911831a9c5 [ticket/13133] Allow @vendor_name for includecss
PHPBB3-13133
2014-10-08 18:25:36 +02:00
Mario Skouat
97db218829 [ticket/13041] Added multiple changes
- "phpBB3" replaced by "phpBB"
- Added the changes suggested by VSE.
- "Subscriptions and Bookmarks" reviewed
- Added trailing comma on modified lines

PHPBB3-13041
2014-10-08 00:14:00 +02:00
Joas Schilling
9d6cef2225 Merge branch 'develop-ascraeus' into develop
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-10-07 22:12:37 +02:00
Joas Schilling
5b186c936d Merge branch 'prep-release-3.1.0-RC5' into develop-ascraeus 2014-10-07 22:11:14 +02:00
Joas Schilling
eed4d0d30f [prep-release-3.1.0-RC5] Update phpBB Version for RC6 development 2014-10-07 22:10:45 +02:00
Joas Schilling
366451c11c [prep-release-3.1.0-RC5] Add changelog for 3.1.0-RC5 2014-10-07 21:16:34 +02:00
Joas Schilling
9d13b91f46 [prep-release-3.1.0-RC5] Prepare Changelog 2014-10-07 21:14:55 +02:00
Joas Schilling
7f692e7b28 [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5 2014-10-07 21:12:06 +02:00
Joas Schilling
7137dc387a [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5 2014-10-07 21:10:14 +02:00
PayBas
757c67b7d8 [ticket/12530] Show logo and policy in responsive
PHPBB3-12530
2014-10-07 20:49:39 +02:00
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
2014-10-07 20:30:40 +02:00
Andreas Fischer
63bdd193e0 Merge pull request #3027 from nickvergessen/ticket/13137
[ticket/13137] Remove schema.json from repository

* nickvergessen/ticket/13137:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
2014-10-07 20:30:40 +02:00
PayBas
66ecbd8545 [ticket/12530] Fix captcha challange image breaking responsive layout
PHPBB3-12530
2014-10-07 18:30:20 +02:00
Joas Schilling
d64a515476 [ticket/13137] Create schema.json in build script
PHPBB3-13137
2014-10-07 17:18:00 +02:00
Joas Schilling
34a9ed3587 [ticket/13137] Improve output of create_schema_files.php
PHPBB3-13137
2014-10-07 17:17:59 +02:00
Joas Schilling
ba1776d6a9 [ticket/13137] Add schema.json file to .gitignore
PHPBB3-13137
2014-10-07 16:33:26 +02:00
Joas Schilling
4fe95d6870 [ticket/13137] Generate the schema when the schema.json file is not available
PHPBB3-13137
2014-10-07 14:55:08 +02:00
Joas Schilling
943f2e1a7b [ticket/13137] Remove schema.json file
PHPBB3-13137
2014-10-07 14:55:05 +02:00
Nils Adermann
c8c50b3c89 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13136] Update schema.json with latest changes
2014-10-07 13:58:12 +02:00
Nils Adermann
c77d6f39f2 Merge pull request #3026 from nickvergessen/ticket/13136
[ticket/13136] Update schema.json with latest changes
2014-10-07 13:57:31 +02:00
Joas Schilling
7bd5c793bb [ticket/13136] Update schema.json with latest changes
PHPBB3-13136
2014-10-07 13:14:33 +02:00
Joas Schilling
202e43b11b Merge branch 'develop-ascraeus' into develop 2014-10-07 11:42:05 +02:00
Joas Schilling
61601a052c Merge pull request #2942 from Senky/ticket/12489
[ticket/12489] Description for Contact link in custom profile fields
2014-10-07 11:41:47 +02:00
Jakub Senko
0c0024497d [ticket/12489] Language correction
PHPBB3-12489
2014-10-07 10:24:30 +02:00
Andreas Fischer
441db59db0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12987] Cleanup the services.yml file

Conflicts:
	phpBB/config/services.yml
2014-10-07 00:52:00 +02:00
Andreas Fischer
46a9e5657f Merge pull request #3002 from Nicofuma/ticket/12987
[ticket/12987] Cleanup the services.yml file

* Nicofuma/ticket/12987:
  [ticket/12987] Cleanup the services.yml file
2014-10-07 00:51:11 +02:00
Joas Schilling
1fa0c861b7 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:45:18 +02:00
Joas Schilling
4b90357d79 Merge pull request #2307 from PayBas/ticket/12408
[ticket/12408] Add quick setting for "default guest style" to ACP
2014-10-06 23:43:27 +02:00
Andreas Fischer
01e200d49a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13077] Move extension module to the top of the Customise tab
2014-10-06 23:35:35 +02:00
Andreas Fischer
38ac0bcc8e Merge pull request #2991 from nickvergessen/ticket/13077
[ticket/13077] Move extension module to the top of the Customise tab

* nickvergessen/ticket/13077:
  [ticket/13077] Move extension module to the top of the Customise tab
2014-10-06 23:35:35 +02:00
Joas Schilling
8d9e6653b4 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:21:35 +02:00
Joas Schilling
b300e06226 Merge branch 'develop-olympus' into develop-ascraeus 2014-10-06 23:21:19 +02:00
Joas Schilling
f3eaf6fe04 Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus
[ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined
2014-10-06 23:21:13 +02:00
Joas Schilling
a12a7d0b90 Merge pull request #2460 from Nicofuma/ticket/11224
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
2014-10-06 23:20:50 +02:00
Joas Schilling
af530b65ce Merge branch 'develop-ascraeus' into develop 2014-10-06 22:38:12 +02:00
Joas Schilling
7479c61d05 Merge pull request #2828 from brunoais/ticket/12930
[ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
2014-10-06 22:37:48 +02:00
Joas Schilling
a3221e21bf Merge branch 'develop-ascraeus' into develop 2014-10-06 22:25:57 +02:00
Joas Schilling
3c91fbeaa6 Merge pull request #2827 from brunoais/ticket/12929
[ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
2014-10-06 22:25:08 +02:00
Joas Schilling
1ed3eb7b0b Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2014-10-06 22:22:05 +02:00
Joas Schilling
2f2a306994 Merge pull request #3019 from Senky/ticket/13025
[ticket/13025] Add template events for buttons on viewforum and viewtopic
2014-10-06 22:20:16 +02:00
Joas Schilling
084adc61bc Merge branch 'develop-ascraeus' into develop 2014-10-06 22:12:38 +02:00
Joas Schilling
6c284060d7 Merge pull request #3025 from rxu/ticket/13134
[ticket/13134] Add core event to the root of the function display_forums()
2014-10-06 22:10:33 +02:00
rxu
1e8735eac1 [ticket/13134] Add core event to the root of the function display_forums()
PHPBB3-13134
2014-10-07 01:47:01 +08:00
Marc Alexander
7bcf6a621f [ticket/13124] Fix tests for event exporter
PHPBB3-13124
2014-10-06 16:53:41 +02:00
Marc Alexander
825af557ae [ticket/13124] Also trim spaces in front of comments except for first line
PHPBB3-13124
2014-10-06 16:09:56 +02:00
Nils Adermann
b354afdeb4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
2014-10-06 02:08:39 +02:00
Nils Adermann
5e86c89989 Merge pull request #3017 from nickvergessen/ticket/13033
[ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
2014-10-06 02:07:52 +02:00
Andreas Fischer
d37f196d33 Merge pull request #3020 from Nicofuma/ticket/13130
[ticket/13130] Updates dependencies to Symfony 2.5

* Nicofuma/ticket/13130:
  [ticket/13130] Fix tests
  [ticket/13130] Updates dependencies to Symfony 2.5
2014-10-05 23:39:14 +02:00
Tristan Darricau
a712d8a3b3 [ticket/13130] Fix tests
PHPBB3-13130
2014-10-05 19:18:19 +02:00
Marc Alexander
f1d37b52fb Merge branch 'develop-ascraeus' into develop 2014-10-05 15:25:13 +02:00
Marc Alexander
ce4cb9c917 Merge pull request #3022 from Nicofuma/ticket/12368
[ticket/12368] Always clean the cache prior to run the migrations
2014-10-05 15:00:40 +02:00
Tristan Darricau
bda6879305 [ticket/12368] Always clean the cache prior to run the migrations
PHPBB3-12368
2014-10-05 12:25:14 +02:00
Tristan Darricau
03a1c7ed2e [ticket/13130] Updates dependencies to Symfony 2.5
PHPBB3-13130
2014-10-04 21:16:12 +02:00
Jakub Senko
608d3f4d8d [ticket/13025] Correct events in subsilver2 viewforum_body
PHPBB3-13025
2014-10-04 11:38:21 +02:00
Jakub Senko
51ece03612 [ticket/13025] Make RC uppercase
PHPBB3-13025
2014-10-04 10:36:45 +02:00
Andreas Fischer
c8a1826823 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13125] $user->browser to $browser
2014-10-04 00:41:25 +02:00
Andreas Fischer
682527f509 Merge pull request #3018 from Senky/ticket/13125
[ticket/13125] Uploaded avatars are not displayed

* Senky/ticket/13125:
  [ticket/13125] $user->browser to $browser
2014-10-04 00:41:25 +02:00
Tristan Darricau
5354c46e01 [ticket/11224] Updates tests
PHPBB3-11224
2014-10-03 23:51:16 +02:00
Tristan Darricau
8e638dbf6d [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224"
This reverts commit 40cd7570e6.
2014-10-03 23:50:24 +02:00
Jakub Senko
a0673f8e10 [ticket/13025] rc4 -> rc5
PHPBB3-13025
2014-10-03 13:18:41 +02:00
Jakub Senko
4193bf5641 [ticket/13025] Add button template events
PHPBB3-13025
2014-10-03 13:16:44 +02:00
Tristan Darricau
ebaec047f2 [ticket/12987] Cleanup the services.yml file
PHPBB3-12987
2014-10-03 00:32:08 +02:00
Joas Schilling
3d9b257597 [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
Caused by the solution of PHPBB3-12990

PHPBB3-13033
2014-10-02 16:04:33 +02:00
brunoais
9d9685eec9 [ticket/12929] BUMP to RC5
PHPBB3-12929
2014-10-02 14:44:43 +01:00
brunoais
cf2ac56950 [ticket/12930] BUMP to RC5
PHPBB3-12930
2014-10-02 14:43:50 +01:00
Joas Schilling
6cb5e6c3b4 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:38:27 +02:00
Joas Schilling
240ff27707 Merge pull request #3000 from rxu/ticket/13110
[ticket/13110] Add core event to the page_footer() function
2014-10-02 15:38:22 +02:00
Joas Schilling
ea1eff4fa5 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:36:02 +02:00
Joas Schilling
90241ae4e6 Merge pull request #2947 from rxu/ticket/13059
[ticket/13059] Add core event to generate_page_link()
2014-10-02 15:35:55 +02:00
Jakub Senko
6400902a01 [ticket/13125] $user->browser to $browser
PHPBB3-13125
2014-10-02 15:34:56 +02:00
Joas Schilling
a3456c90c9 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:33:40 +02:00
Joas Schilling
ee758e22a6 Merge pull request #2999 from rxu/ticket/13108
[ticket/13108] Add core event to the parse_attachments() function
2014-10-02 15:33:32 +02:00
Joas Schilling
b7610b444a Merge branch 'develop-ascraeus' into develop 2014-10-02 15:18:44 +02:00
Joas Schilling
2ee13bbc24 Merge pull request #3004 from Senky/ticket/13116
[ticket/13116] Topic and post approval notifications got interchanged
2014-10-02 15:18:23 +02:00
Mario Skouat
e5a5933db6 [ticket/13041] Updating "Topic Subscriptions and Bookmarks"
PHPBB3-13041
2014-10-02 12:57:17 +02:00
Mario Skouat
8c628a6dc2 [ticket/13041] Updating "phpBB3 Issues"
PHPBB3-13041
2014-10-02 12:56:56 +02:00
Mario Skouat
1fb4ebb34a [ticket/13041] Updating "Searching the Forums"
PHPBB3-13041
2014-10-02 11:54:48 +02:00
Mario Skouat
64eec22884 [ticket/13041] Updating "Posting Issues"
PHPBB3-13041
2014-10-02 11:53:39 +02:00
Mario Skouat
abb1244b44 [ticket/13041] Updating "Login and Registration Issues"
PHPBB3-13041
2014-10-02 10:27:48 +02:00
Mario Skouat
e816006b8e [ticket/13041] Updating "User Preferences and settings"
PHPBB3-13041
2014-10-01 20:14:30 +02:00
Tristan Darricau
fbbb5c47da Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13123] Add events to allow modifying post data
2014-10-01 16:09:59 +02:00
Tristan Darricau
c123c93ca0 Merge pull request #3012 from nickvergessen/ticket/13123
[ticket/13123] Add events to allow modifying post data

* nickvergessen/ticket/13123:
  [ticket/13123] Add events to allow modifying post data
2014-10-01 16:09:04 +02:00
Marc Alexander
ec34fb85ca Merge branch 'develop-ascraeus' into develop 2014-10-01 15:59:15 +02:00
Marc Alexander
0e27b10b8f Merge pull request #3015 from nickvergessen/ticket/13119
[ticket/13119] Add another event which is triggered independent from actions
2014-10-01 15:59:00 +02:00
rxu
a876cc8c26 [ticket/13108] Add core event to the parse_attachments() function
Add core event to the parse_attachments() function in functions_content.php
to allow modifying/adding attachment template data.

PHPBB3-13108
2014-10-01 21:00:37 +08:00
rxu
ce4035fdd3 [ticket/13059] Add core event to generate_page_link()
Add core event to generate_page_link() to allow
overriding/modifying pagination URLs.
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905

PHPBB3-13059
2014-10-01 20:55:07 +08:00
Joas Schilling
95c0d81ba1 [ticket/13119] Add another event which is triggered independent from actions
PHPBB3-13119
2014-10-01 14:54:26 +02:00
Joas Schilling
b9226c6877 Merge branch 'develop-ascraeus' into develop 2014-10-01 11:39:35 +02:00
Joas Schilling
40cd7570e6 [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"
This reverts commit d264369441, reversing
changes made to 75fcfb1c1d.

PHPBB3-11224
2014-10-01 11:38:45 +02:00
Joas Schilling
dceb334a0c Merge branch 'develop-ascraeus' into develop 2014-10-01 10:34:42 +02:00
Joas Schilling
b003019958 Merge pull request #3013 from VSEphpbb/ticket/13121
[ticket/13121] Remove cache mode from style management module
2014-10-01 10:34:08 +02:00
Joas Schilling
0a58cca031 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:27:56 +02:00
Joas Schilling
d264369441 Merge pull request #2460 from Nicofuma/ticket/11224
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
2014-10-01 10:27:47 +02:00
Joas Schilling
b1d35363db Merge branch 'develop-ascraeus' into develop 2014-10-01 10:24:27 +02:00
Joas Schilling
75fcfb1c1d Merge pull request #2545 from ptitlazy/ticket/12657
[ticket/12657] Add a test file for base case of command cache:purge
2014-10-01 10:24:19 +02:00
Joas Schilling
d73194a415 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:19:39 +02:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993
[ticket/12993] Improve get_user_ranks
2014-10-01 10:19:24 +02:00
Joas Schilling
9ad7eddc25 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:09:39 +02:00
Joas Schilling
994a0dcd4c Merge branch 'ticket/12985' into develop-ascraeus 2014-10-01 10:09:29 +02:00
david63
5314c2bddf [ticket/12985] Add core.login_box_redirect
Add core.login_box_redirect core event to allow extensions to redirect a
user to a specific page when logging in.

PHPBB3-12985
2014-10-01 10:09:10 +02:00
Joas Schilling
b99ba4d416 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:03:16 +02:00
Joas Schilling
b6acc1b9db Merge pull request #2978 from blitze/ticket/13071
[ticket/13071] Only use total_match_count after event dispatcher
2014-10-01 10:01:09 +02:00
Joas Schilling
48dd87bd34 Merge branch 'develop-ascraeus' into develop 2014-10-01 09:56:51 +02:00
Joas Schilling
1b393b1d0b Merge pull request #2979 from blitze/ticket/13072
[ticket/13072] Add total_match_count to core.search_get_topic_data event
2014-10-01 09:56:39 +02:00
Joas Schilling
d3ee8d24bc Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
2014-10-01 09:53:08 +02:00
Joas Schilling
effb5d95d0 Merge pull request #2998 from rxu/ticket/13107
[ticket/13107] Add template events to forum row in forumlist_body.html
2014-10-01 09:50:38 +02:00
Cesar G
d644de5217 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
2014-10-01 00:44:16 -07:00
Cesar G
8ab7f6b595 Merge remote-tracking branch 'nickvergessen/ticket/13119' into develop-ascraeus
* nickvergessen/ticket/13119:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
2014-10-01 00:43:41 -07:00
Matt Friedman
1ee4894271 [ticket/13121] Fix migration file
PHPBB3-13121
2014-10-01 00:29:45 -07:00
Matt Friedman
65539df39a [ticket/13121] Remove cache mode from style management module
https://tracker.phpbb.com/browse/PHPBB3-13121

PHPBB3-13121
2014-10-01 00:03:54 -07:00
Andreas Fischer
7c8b8877df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
2014-10-01 02:15:26 +02:00
Andreas Fischer
8fef959418 Merge pull request #3011 from fredemmott/ticket/13122
[ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable

* fredemmott/ticket/13122:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
2014-10-01 02:15:25 +02:00
Fred Emmott
f30c5f730e [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
If you're unlucky, calling time() or similar twice in a row will
give you different results. Facebook runs these tests thousands of
times a day, so we occasionally get bogus failures.

PHPBB3-13122
2014-09-30 15:53:02 -07:00
Andreas Fischer
236f75c6cb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
2014-10-01 00:26:39 +02:00
Andreas Fischer
a8e74fff9b Merge pull request #3010 from Nicofuma/ticket/13120
[ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders

* Nicofuma/ticket/13120:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
2014-10-01 00:26:39 +02:00
Joas Schilling
cb49a0c4cc [ticket/13123] Add events to allow modifying post data
PHPBB3-13123
2014-10-01 00:13:37 +02:00
Tristan Darricau
3a413cbf30 [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
PHPBB3-13120
2014-09-30 21:20:42 +02:00
Andreas Fischer
ec89d11609 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13105] Fix the code logic as described in the comment
2014-09-30 21:15:27 +02:00
Andreas Fischer
cb8b245639 Merge pull request #3005 from nickvergessen/ticket/13105
[ticket/13105] Fix the code logic as described in the comment

* nickvergessen/ticket/13105:
  [ticket/13105] Fix the code logic as described in the comment
2014-09-30 21:15:26 +02:00
Andreas Fischer
7694623cd2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13111] Dropdown options are already an array in the field data
2014-09-30 21:04:25 +02:00
Andreas Fischer
8fb9f19aae Merge pull request #3008 from nickvergessen/ticket/13111
[ticket/13111] Dropdown options are already an array in the field data

* nickvergessen/ticket/13111:
  [ticket/13111] Dropdown options are already an array in the field data
2014-09-30 21:04:25 +02:00
Andreas Fischer
be5638c110 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13118] Correctly use the provided datetime class
2014-09-30 21:00:06 +02:00
Andreas Fischer
a0db23bd0e Merge pull request #3007 from nickvergessen/ticket/13118
[ticket/13118] Correctly use the provided datetime class

* nickvergessen/ticket/13118:
  [ticket/13118] Correctly use the provided datetime class
2014-09-30 21:00:05 +02:00
Joas Schilling
6f66423de9 [ticket/13119] Remove unused globals and use the request class
PHPBB3-13119
2014-09-30 18:22:06 +02:00
Joas Schilling
7efc624b0a [ticket/13119] Add events to ACP's ban module
PHPBB3-13119
2014-09-30 18:22:05 +02:00
Joas Schilling
9c3126add0 [ticket/13119] Add events to MCP's ban module
PHPBB3-13119
2014-09-30 18:22:04 +02:00
Nils Adermann
e64c1b463e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
2014-09-30 14:00:25 +02:00
Nils Adermann
f1ab6f31a1 Merge pull request #3003 from nickvergessen/ticket/13117
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
2014-09-30 14:00:02 +02:00
Joas Schilling
f64a937a57 [ticket/13111] Dropdown options are already an array in the field data
PHPBB3-13111
2014-09-30 12:27:14 +02:00
Joas Schilling
526329e697 [ticket/13118] Correctly use the provided datetime class
PHPBB3-13118
2014-09-30 11:58:02 +02:00
Joas Schilling
89fdd1baf2 [ticket/13105] Fix the code logic as described in the comment
PHPBB3-13105
2014-09-29 21:39:31 +02:00
Jakub Senko
e132cdd325 [ticket/13116] Interchange post and topic approval notification
PHPBB3-13116
2014-09-29 21:13:53 +02:00
Joas Schilling
bc24c78e06 [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
Unintended change from 95ab4b3e93

PHPBB3-13117
2014-09-29 20:48:47 +02:00
Nils Adermann
8de97b8dbe Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13113] Updates the base url only when the front-end isn't app.php
2014-09-29 16:17:25 +02:00
Nils Adermann
6f093ade8a Merge pull request #3001 from Nicofuma/ticket/13113
[ticket/13113] Updates the base url only when the front-end isn't app.php
2014-09-29 16:16:30 +02:00
Tristan Darricau
a159899d02 [ticket/13113] Updates the base url only when the front-end isn't app.php
PHPBB3-13113
2014-09-28 23:32:56 +02:00
rxu
eb2aa1f83a [ticket/13110] Add core event to the page_footer() function
Add core event to the page_footer() in includes/functions.php to allow
extensions handling overall page output before its displaying.

PHPBB3-13110
2014-09-28 15:39:06 +08:00
rxu
cee8ac9dbe [ticket/13107] Add template events to forum row in forumlist_body.html
PHPBB3-13107
2014-09-27 09:26:35 +08:00
Joas Schilling
573c2af336 Merge branch 'develop-ascraeus' into develop 2014-09-25 22:03:01 +02:00
Joas Schilling
71ac6ab2b8 Merge pull request #2996 from Senky/ticket/13104
[ticket/13104] Responsive tabs display bug in IE11
2014-09-25 22:02:23 +02:00
Andreas Fischer
b703d1e8df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
2014-09-25 21:52:53 +02:00
Andreas Fischer
be769d4ca6 Merge pull request #2995 from nickvergessen/ticket/13105
[ticket/13105] Future relative dates are always displayed as "Tomorrow"

* nickvergessen/ticket/13105:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
2014-09-25 21:52:53 +02:00
Andreas Fischer
a3e910f23f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
2014-09-25 21:47:28 +02:00
Andreas Fischer
e802c5f082 Merge pull request #2997 from Senky/ticket/13106
[ticket/13106] Remove the \phpbb\di\pass\kernel_pass class

* Senky/ticket/13106:
  [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
2014-09-25 21:47:28 +02:00
Jakub Senko
f64373a29f [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
PHPBB3-13106
2014-09-25 20:12:33 +02:00
Jakub Senko
a1683dfb67 [ticket/13104] inline-block -> block
PHPBB3-13104
2014-09-25 20:07:06 +02:00
Joas Schilling
e803efc6fc [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
PHPBB3-13105
2014-09-25 18:09:32 +02:00
Joas Schilling
459c62b339 [ticket/13105] Add a test for relative dates
PHPBB3-13105
2014-09-25 18:09:24 +02:00
Andreas Fischer
c55a666347 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13086] String replaces 50 with 20
2014-09-24 21:24:42 +02:00
Andreas Fischer
1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php
2014-09-24 21:24:29 +02:00
Andreas Fischer
ce0c33f62a Merge pull request #2994 from Skouat/ticket/13086-olympus
[ticket/13086] Update ACP_MASS_EMAIL_EXPLAIN language key

* Skouat/ticket/13086-olympus:
  [ticket/13086] String replaces 50 with 20
2014-09-24 21:21:53 +02:00
Mario Skouat
077db77259 [ticket/13086] String replaces 50 with 20
PHPBB3-13086
2014-09-24 19:03:33 +02:00
Marc Alexander
0b0e00edd7 Merge branch 'develop-ascraeus' into develop 2014-09-24 18:29:12 +02:00
Marc Alexander
30e1d29f58 Merge pull request #2993 from nickvergessen/ticket/13087
[ticket/13087] Correctly link to user profile when contact field has no URL
2014-09-24 18:27:37 +02:00
blitze
04e9789e7f [ticket/13072] Added '@changed 3.1.0-RC5 Added total_match_count'
PHPBB3-13072
2014-09-24 16:15:38 +00:00
Joas Schilling
b51b4c92e2 [ticket/13087] Correctly link to user profile when contact field has no URL
Broken by 975c5655f0

PHPBB3-13087
2014-09-24 17:33:54 +02:00
Tristan Darricau
74a96bf7c2 [ticket/11224] Adds a test case
PHPBB3-11224
2014-09-24 16:16:47 +02:00
Tristan Darricau
cd7b21a703 [ticket/12993] Update doc block
PHPBB3-12993
2014-09-24 16:07:23 +02:00
Tristan Darricau
834aea70a7 [ticket/12657] Fix unit tests
PHPBB3-12657
2014-09-24 15:24:56 +02:00
Joas Schilling
77ed437b79 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html
2014-09-24 14:49:50 +02:00
Joas Schilling
85bc9b69ae Merge pull request #2844 from marc1706/ticket/12858
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
2014-09-24 13:47:59 +02:00
Joas Schilling
cb92b4668e Merge branch 'develop-ascraeus' into develop 2014-09-24 12:26:21 +02:00
Joas Schilling
f3fef8934e Merge pull request #2954 from rxu/ticket/13055
[ticket/13055] Fix string profile fields validation to support unicode
2014-09-24 12:25:57 +02:00
Joas Schilling
9717d860da Merge branch 'develop-ascraeus' into develop 2014-09-24 10:34:08 +02:00
Joas Schilling
43279ee010 Merge pull request #2983 from Senky/ticket/13094
[ticket/13094] Remove the search box if there are no new posts to search for
2014-09-24 10:33:58 +02:00
Joas Schilling
6d0697eb89 [ticket/13077] Move extension module to the top of the Customise tab
PHPBB3-13077
2014-09-24 00:34:17 +02:00
Andreas Fischer
a437c8fdfd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
2014-09-23 23:34:03 +02:00
Andreas Fischer
d5128b3e87 Merge pull request #2988 from prototech/ticket/13011
[ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.

* prototech/ticket/13011:
  [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
2014-09-23 23:34:03 +02:00
Andreas Fischer
138d320960 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13048] Only do not update the session page for ajax requests
2014-09-23 23:29:52 +02:00
Andreas Fischer
9feb7096ee Merge pull request #2985 from nickvergessen/ticket/13048
[ticket/13048] Only do not update the session page for ajax requests

* nickvergessen/ticket/13048:
  [ticket/13048] Only do not update the session page for ajax requests
2014-09-23 23:29:52 +02:00
Andreas Fischer
f20e3e9feb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13070] Use old 'template' class for template class hook
2014-09-23 23:25:59 +02:00
Andreas Fischer
34aad4046f Merge pull request #2982 from marc1706/ticket/13070
[ticket/13070] Use old 'template' class for template class hook

* marc1706/ticket/13070:
  [ticket/13070] Use old 'template' class for template class hook
2014-09-23 23:25:59 +02:00
Jakub Senko
ca7f4fb531 [ticket/10985] Add fix to properly inherit style during update process
PHPBB3-10985
2014-09-23 23:03:07 +02:00
Andreas Fischer
cdd36f3243 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()
2014-09-23 22:55:24 +02:00
Andreas Fischer
80f15a41c4 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()

Conflicts:
	phpBB/includes/auth/auth_ldap.php
2014-09-23 22:55:13 +02:00
Andreas Fischer
2f773fca18 Merge pull request #2989 from Senky/ticket/13096
[ticket/13096] ldap_escape() added to PHP 5.6.0

* Senky/ticket/13096:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()
2014-09-23 22:54:27 +02:00
Jakub Senko
ba464ec93a [ticket/13096] Add phpbb_ prefix to ldap_escape()
PHPBB3-13096
2014-09-23 22:43:52 +02:00
Cesar G
80d5a1ec1f [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
PHPBB3-13011
2014-09-23 12:56:20 -07:00
Cesar G
b57f050d8e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12889] Fix multiple select lists
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
2014-09-23 12:49:28 -07:00
Cesar G
f2a98339e2 Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeus
* hanakin/ticket/12889:
  [ticket/12889] Fix multiple select lists
2014-09-23 12:49:04 -07:00
Cesar G
2478eef550 Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeus
* Senky/ticket/13082:
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
2014-09-23 12:48:23 -07:00
Cesar G
ead5276106 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13097] Add missing unit type
2014-09-23 10:06:33 -07:00
Cesar G
7307380091 Merge remote-tracking branch 'hanakin/ticket/13097' into develop-ascraeus
* hanakin/ticket/13097:
  [ticket/13097] Add missing unit type
2014-09-23 10:06:00 -07:00
hanakin
fb610f99df [ticket/12889] Fix multiple select lists
PHPBB3-12889
2014-09-23 17:24:26 +02:00
hanakin
aa1ffc9319 [ticket/13097] Add missing unit type
PHPBB3-13097
2014-09-23 17:11:51 +02:00
Joas Schilling
c4428a507a Merge branch 'develop-ascraeus' into develop 2014-09-23 15:32:22 +02:00
Joas Schilling
ef9e0e743a Merge pull request #2937 from Senky/ticket/13027
[ticket/13027] PM folder full percentage could be a bit more accurate
2014-09-23 15:32:14 +02:00
Joas Schilling
820db008ff [ticket/13048] Only do not update the session page for ajax requests
The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.

PHPBB3-13048
2014-09-23 15:25:40 +02:00
Joas Schilling
d5691431ef Merge branch 'develop-ascraeus' into develop 2014-09-23 14:43:17 +02:00
Joas Schilling
05ae327553 Merge pull request #2974 from hanakin/ticket/13080
[Ticket/13080] Fix text overflow issue in mobile
2014-09-23 14:43:04 +02:00
Marc Alexander
397be4d93f Merge branch 'develop-ascraeus' into develop 2014-09-23 11:12:39 +02:00
Marc Alexander
9b8d8b020f Merge branch 'develop-olympus' into develop-ascraeus 2014-09-23 11:10:47 +02:00
Marc Alexander
92b096b05b Merge pull request #2984 from nickvergessen/ticket/10729-asc
[3.1][ticket/10729] Update editor information when user being deleted
2014-09-23 11:09:29 +02:00
Marc Alexander
8bd1853b56 Merge pull request #2981 from nickvergessen/ticket/10729
Ticket/10729 Update editor information when user being deleted
2014-09-23 11:08:56 +02:00
Joas Schilling
96024e88e9 [ticket/10729] Also test *delete_user on posts and topics
PHPBB3-10729
2014-09-23 09:54:21 +02:00
Joas Schilling
d6008e896a [ticket/10729] Fix handling of third parameter in 3.1
PHPBB3-10729
2014-09-23 09:42:30 +02:00
Joas Schilling
10b6399d30 [ticket/10729] Fix setup of the tests for 3.1
PHPBB3-10729
2014-09-23 09:38:35 +02:00
Joas Schilling
eeeb62b433 [ticket/10729] Update fixture to 3.1 database structure
PHPBB3-10729
2014-09-23 09:31:33 +02:00
Joas Schilling
9ff6358dc9 Merge branch 'ticket/10729' into ticket/10729-asc
Conflicts:
	phpBB/includes/functions_user.php
2014-09-23 09:31:13 +02:00
Joas Schilling
bea5f94de6 [ticket/10729] Use mocked null cache for phpunit 3.6 on travis with php 5.2
PHPBB3-10729
2014-09-23 09:03:44 +02:00
Joas Schilling
e28b93e0cc [ticket/10729] Ensure that no bans exist before testing create_session
PHPBB3-10729
2014-09-22 23:56:31 +02:00
Jakub Senko
9a8a0af7ba [ticket/13094] Condition search properly
PHPBB3-13094
2014-09-22 21:12:18 +02:00
Marc Alexander
d03be5ea5f [ticket/13070] Use old 'template' class for template class hook
PHPBB3-13070
2014-09-22 20:03:55 +02:00
Joas Schilling
7fca351e05 [ticket/10729] Add assert messages and finish up tests
PHPBB3-10729
2014-09-22 02:01:54 +02:00
Joas Schilling
d7c12ccd60 [ticket/10729] Add tests for some special tables with unique conditions
PHPBB3-10729
2014-09-22 01:42:36 +02:00
Joas Schilling
74854ac65d [ticket/10729] Add tests for user posts, reports and attachments
PHPBB3-10729
2014-09-22 00:55:34 +02:00
Joas Schilling
d48e4b680e [ticket/10729] Fix doc block for user_delete
PHPBB3-10729
2014-09-22 00:55:08 +02:00
Dhruv
29ffddee71 [ticket/12962] bootstrap functional and ui test when php >5.3.19
PHPBB3-12962
2014-09-21 15:54:52 +05:30
Dhruv
7fa596a991 [ticket/12962] Install test dependencies on travis
PHPBB3-12962
2014-09-21 14:24:36 +05:30
Dhruv
77d52982c8 [ticket/12962] Add facebook/webdriver dependency
Create a new composer.json for tests dir and add
facebook/webdriver dependency

PHPBB3-12962
2014-09-21 14:24:29 +05:30
Mario Skouat
39d46e2599 [ticket/13041] Reordering "Login and Registration Issues"
PHPBB3-13041
2014-09-21 10:43:10 +02:00
Dhruv
a1dff65cd1 [ticket/12962] Fix whitespace characters
PHPBB3-12962
2014-09-21 13:53:28 +05:30
Dhruv
a2627e8790 [ticket/12962] Run tests for all databases on Travis
PHPBB3-12962
2014-09-21 13:53:26 +05:30
Dhruv
20dfb23dd4 [ticket/12962] Force language=en for UI tests installation
PHPBB3-12962
2014-09-21 13:53:24 +05:30
Dhruv
d1935b0b0b [ticket/12962] Dump server output to /dev/null
PHPBB3-12962
2014-09-21 13:53:23 +05:30
Dhruv
039b466bd0 [ticket/12962] Start phantomjs on travis in background
PHPBB3-12962
2014-09-21 13:53:20 +05:30
Dhruv
c371e86fa1 [ticket/12962] Mark test skipped when phantom server not running
PHPBB3-12962
2014-09-21 13:53:19 +05:30
Dhruv
8d0933ca4b [ticket/12962] Add setup-phantomjs-server.sh
PHPBB3-12962
2014-09-21 13:53:17 +05:30
Dhruv
6de352f7da [ticket/12962] Run UI tests on Travis-mysql
PHPBB3-12962
2014-09-21 13:53:15 +05:30
Dhruv
c0d3cf6a27 [ticket/12962] Add UI tests to phpunit.xml.dist
PHPBB3-12962
2014-09-21 13:53:14 +05:30
Dhruv
f21ef60175 [ticket/12962] Add quick-links JS test
PHPBB3-12962
2014-09-21 13:53:08 +05:30
blitze
d6de9ce5d9 [ticket/13072] Add total_match_count to core.search_get_topic_data event
PHPBB3-13072
2014-09-21 08:22:15 +00:00
Jakub Senko
9f981a7741 [ticket/13082] Repair fix
PHPBB3-13082
2014-09-21 10:03:48 +02:00
blitze
6a33472214 [ticket/13071] Only use total_match_count after event dispatcher
PHPBB3-13071
2014-09-21 07:39:50 +00:00
Dhruv
77f8bb48fe [ticket/12962] Add initial class for ui_testing
PHPBB3-12962
2014-09-21 12:07:06 +05:30
Dhruv
93dc33b002 Merge branch 'develop-ascraeus' into develop
# By Jakub Senko
# Via Dhruv Goel (1) and Jakub Senko (1)
* develop-ascraeus:
  [ticket/13045] Remove Pragma headers
2014-09-21 11:31:13 +05:30
Dhruv Goel
84e68b3a73 Merge pull request #2963 from Senky/ticket/13045
[ticket/13045] Remove Pragma headers
2014-09-21 11:29:56 +05:30
Dhruv
314cda1834 Merge branch 'develop-ascraeus' into develop
# By n-aleha
# Via Dhruv Goel (1) and n-aleha (1)
* develop-ascraeus:
  [ticket/13085] Fix typo in oauth.php
2014-09-21 10:30:01 +05:30
Dhruv Goel
b02e579c1c Merge pull request #2976 from n-aleha/ticket/13085
[ticket/13085] Fix typo in oauth.php
2014-09-21 10:29:07 +05:30
Jakub Senko
6851ff8fab [ticket/13082] Join classes
PHPBB3-13082
2014-09-21 00:07:39 +02:00
n-aleha
7313cc777e [ticket/13085] Fix typo in oauth.php
PHPBB3-13085
2014-09-21 00:33:07 +03:00
Jakub Senko
ace3b806a9 [ticket/13082] move style to css file
PHPBB3-13082
2014-09-20 20:35:14 +02:00
Jakub Senko
ef58752db8 [ticket/13082] Replace float by text-align
PHPBB3-13082
2014-09-20 18:35:26 +02:00
hanakin
8b8e065441 [ticket/13080] Fix mediaqueries formating
open { are should not to be on new lines for
media queries per spec, causes code highlight
issues in reputible code editors

PHPBB3-13080
2014-09-20 16:55:20 +02:00
hanakin
e3eff2a976 [ticket/13080] Remove nowrap from dd in responsive
PHPBB3-13080
2014-09-20 16:51:01 +02:00
Joas Schilling
e23d2e7b20 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Prepare Changelog
  [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-09-20 09:55:56 +02:00
Joas Schilling
e005455881 Merge branch 'prep-release-3.1.0-RC4' into develop-ascraeus
* prep-release-3.1.0-RC4:
  [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Prepare Changelog
  [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
2014-09-20 09:53:23 +02:00
Joas Schilling
26c6ffa458 [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development 2014-09-20 09:52:53 +02:00
Marc Alexander
457e13634e [ticket/12858] Properly format UTC offset in footer
PHPBB3-12858
2014-09-19 23:45:03 +02:00
Joas Schilling
2c5e184ea1 [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 2014-09-19 19:09:46 +02:00
Joas Schilling
841abf712e [prep-release-3.1.0-RC4] Prepare Changelog 2014-09-19 19:07:41 +02:00
Joas Schilling
221f4a4a8c [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 2014-09-19 19:04:21 +02:00
Joas Schilling
301694e922 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 2014-09-19 19:02:31 +02:00
Joas Schilling
0a6015ad4b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
2014-09-19 18:59:18 +02:00
Joas Schilling
1d53383481 Merge pull request #2973 from marc1706/ticket/13073-develop
Ticket/13073 develop

* marc1706/ticket/13073-develop:
  [ticket/13073] Remove _test suffix from common test class
  [ticket/13073] Switch $input with $expected and add paths with letters
  [ticket/13073] Use abstract class for controller helper route tests
  [ticket/13073] Add path regex to get_preg_expression() and add unit tests
  [ticket/13073] Use just one regex in helper route()
  [ticket/13073] Properly place comments in helper
  [ticket/13073] Use correct class names in test files
  [ticket/13073] Rework route tests and add tests for more directory types
  [ticket/13073] Test that routes from subfolders like /adm work
  [ticket/13073] Add tests for routes from adm pages
  [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
2014-09-19 18:59:09 +02:00
Joas Schilling
fc252f1ba5 Merge pull request #2969 from marc1706/ticket/13073
[ticket/13073] Correctly generate routes from subfolders like /adm

* marc1706/ticket/13073:
  [ticket/13073] Remove _test suffix from common test class
  [ticket/13073] Switch $input with $expected and add paths with letters
  [ticket/13073] Use abstract class for controller helper route tests
  [ticket/13073] Add path regex to get_preg_expression() and add unit tests
  [ticket/13073] Use just one regex in helper route()
  [ticket/13073] Properly place comments in helper
  [ticket/13073] Use correct class names in test files
  [ticket/13073] Rework route tests and add tests for more directory types
  [ticket/13073] Test that routes from subfolders like /adm work
  [ticket/13073] Add tests for routes from adm pages
  [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
2014-09-19 18:58:53 +02:00
Marc Alexander
9bf58697dc Merge branch 'ticket/13073' into ticket/13073-develop
Conflicts:
	tests/controller/common_helper_route.php
2014-09-19 18:48:24 +02:00
Marc Alexander
3418683cfc [ticket/13073] Remove _test suffix from common test class
PHPBB3-13073
2014-09-19 16:50:26 +02:00
Marc Alexander
d720428564 [ticket/13073] Switch $input with $expected and add paths with letters
PHPBB3-13073
2014-09-19 15:30:24 +02:00
Marc Alexander
543d68a7d3 [ticket/13073] Use abstract class for controller helper route tests
PHPBB3-13073
2014-09-19 15:21:04 +02:00
Marc Alexander
6fd54436ee [ticket/13073] Add path regex to get_preg_expression() and add unit tests
We're now calling get_preg_expression() instead of hardcoding the regex into
the helper route method.

PHPBB3-13073
2014-09-19 13:54:15 +02:00
Marc Alexander
4186ced479 [ticket/13073] Use just one regex in helper route()
PHPBB3-13073
2014-09-19 12:14:57 +02:00
Marc Alexander
eaef881e7d [ticket/13073] Properly place comments in helper
PHPBB3-13073
2014-09-19 12:03:04 +02:00
Marc Alexander
de7ed7c286 [ticket/13073] Use correct class names in test files
PHPBB3-13073
2014-09-19 12:01:31 +02:00
Tristan Darricau
c767712c64 [ticket/12657] Fix the order of the parameters for the constructor
PHPBB3-12657
2014-09-19 11:09:37 +02:00
Tristan Darricau
689eaab3e2 [ticket/12657] The test does not need to depend on the database
PHPBB3-12657
2014-09-19 11:09:35 +02:00
LEZY Thomas
fb08d1b27e [ticket/12657] Remove unused global variables
PHPBB3-12657
2014-09-19 11:09:32 +02:00
LEZY Thomas
6e4348b0ea [ticket/12657] Fix name temporary directory used by test file
PHPBB3-12657
2014-09-19 11:09:30 +02:00
LEZY Thomas
4a76763a8a [ticket/12657] Add a test file for base case
PHPBB3-12657
2014-09-19 11:09:29 +02:00
brunoais
55664c1c10 [ticket/12930] Fixing event comment block and variable
According to comments on pull request

PHPBB3-12930
2014-09-19 08:44:12 +01:00
brunoais
d4938e34b0 [ticket/12929] Fixing event comment block and variable
PHPBB3-12929
2014-09-19 08:36:00 +01:00
rxu
c20b658f70 [ticket/13055] Add UTF-8 string tests for profile fields validation options
PHPBB3-13055
2014-09-19 09:31:28 +08:00
Tristan Darricau
5091600a16 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13062] Fix name of "ORDER_BY" key in SQL array
2014-09-19 01:20:01 +02:00
Tristan Darricau
98f02ece97 Merge pull request #2970 from nickvergessen/ticket/13062
[ticket/13062] Fix name of "ORDER_BY" key in SQL array

* nickvergessen/ticket/13062:
  [ticket/13062] Fix name of "ORDER_BY" key in SQL array
2014-09-19 01:18:32 +02:00
Joas Schilling
6bc23ee282 [ticket/13062] Fix name of "ORDER_BY" key in SQL array
PHPBB3-13062
2014-09-19 00:56:16 +02:00
Marc Alexander
a6d9b42e5f [ticket/13073] Rework route tests and add tests for more directory types
PHPBB3-13073
2014-09-19 00:35:17 +02:00
Joas Schilling
471c6fa860 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13066] Add search results core event to modify search title
2014-09-19 00:23:31 +02:00
Joas Schilling
e9285d43af Merge pull request #2952 from rxu/ticket/13066
[ticket/13066] Add search results core event to modify search title

* rxu/ticket/13066:
  [ticket/13066] Add search results core event to modify search title
2014-09-19 00:22:53 +02:00
Marc Alexander
d74f45aee0 [ticket/13073] Test that routes from subfolders like /adm work
PHPBB3-13073
2014-09-19 00:11:36 +02:00
Cesar G
c3778dde64 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12598] Fix sir typo
  [ticket/12598] Fix rtl positon in header
  [ticket/12598] Remove right border
  [ticket/12598] Remove border from .search-header
  [ticket/12598] Replace #search-box with class
  [ticket/12598] Remove hover border-color and use hover icon
  [ticket/12598] Add some responsive margin to give breathing room
  [ticket/12598] Clean up unused link colors
  [ticket/12598] Remove unused link colors
  [ticket/12598] Add lt IE9 fixes
  [ticket/12598] Improve search box styling
2014-09-18 15:07:51 -07:00
Marc Alexander
a70addbf14 [ticket/13073] Add tests for routes from adm pages
PHPBB3-13073
2014-09-19 00:07:31 +02:00
Cesar G
ae14b0f272 Merge remote-tracking branch 'hanakin/ticket/12598' into develop-ascraeus
* hanakin/ticket/12598:
  [ticket/12598] Fix sir typo
  [ticket/12598] Fix rtl positon in header
  [ticket/12598] Remove right border
  [ticket/12598] Remove border from .search-header
  [ticket/12598] Replace #search-box with class
  [ticket/12598] Remove hover border-color and use hover icon
  [ticket/12598] Add some responsive margin to give breathing room
  [ticket/12598] Clean up unused link colors
  [ticket/12598] Remove unused link colors
  [ticket/12598] Add lt IE9 fixes
  [ticket/12598] Improve search box styling
2014-09-18 15:07:27 -07:00
Marc Alexander
d892dfe084 [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
PHPBB3-13073
2014-09-18 23:44:51 +02:00
hanakin
1914a08088 [ticket/12598] Fix sir typo
PHPBB3-12598
2014-09-18 23:13:42 +02:00
hanakin
88f645eeda [ticket/12598] Fix rtl positon in header
PHPBB3-12598
2014-09-18 22:45:24 +02:00
hanakin
2ca001edcf [ticket/12598] Remove right border
PHPBB3-12598
2014-09-18 22:34:55 +02:00
hanakin
6eb2b876f1 [ticket/12598] Remove border from .search-header
PHPBB3-12598
2014-09-18 21:47:24 +02:00
hanakin
0dc181a529 [ticket/12598] Replace #search-box with class
PHPBB3-12598
2014-09-18 21:47:23 +02:00
PayBas
d27e9c7c76 [ticket/12598] Remove hover border-color and use hover icon
PHPBB3-12598
2014-09-18 21:47:23 +02:00
PayBas
93d50db2d6 [ticket/12598] Add some responsive margin to give breathing room
PHPBB3-12598
2014-09-18 21:47:22 +02:00
PayBas
b5800d1124 [ticket/12598] Clean up unused link colors
PHPBB3-12598
2014-09-18 21:47:22 +02:00
PayBas
3f71d7dba1 [ticket/12598] Remove unused link colors
PHPBB3-12598
2014-09-18 21:47:21 +02:00
PayBas
514bf6e39a [ticket/12598] Add lt IE9 fixes
In case this one gets merged before hanakin's gradient PR.

PHPBB3-12598
2014-09-18 21:47:21 +02:00
PayBas
470e6d5edf [ticket/12598] Improve search box styling
PHPBB3-12598
2014-09-18 21:47:20 +02:00
Joas Schilling
2217ab7abe Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12961] Shorten ext-db link text
  [ticket/12961] Fix missing phpBB.com
  [ticket/12961] Remove target="_blank" and switch to <strong>
  [ticket/12961] Add additional link to the KB
  [ticket/12961] Move link to language file
  [ticket/12961] Refactor lang entry
  [ticket/12961] Change url to anti-spam-ext
  [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/
  [ticket/12961] Add link in anti-spam ACP page to titania
2014-09-18 14:24:00 +02:00
Joas Schilling
3066cd700a Merge pull request #2875 from PayBas/ticket/12961
[ticket/12961] Add link in anti-spam ACP page which links directly to captchas in titania

* PayBas/ticket/12961:
  [ticket/12961] Shorten ext-db link text
  [ticket/12961] Fix missing phpBB.com
  [ticket/12961] Remove target="_blank" and switch to <strong>
  [ticket/12961] Add additional link to the KB
  [ticket/12961] Move link to language file
  [ticket/12961] Refactor lang entry
  [ticket/12961] Change url to anti-spam-ext
  [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/
  [ticket/12961] Add link in anti-spam ACP page to titania
2014-09-18 14:23:41 +02:00
Tristan Darricau
7548bc89ea Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12963] Always use core_path and core_directory()
  [ticket/12963] Remove old migration/ folder from tests
  [ticket/12963] Revert back to "migrations" folder name for extensions
2014-09-18 14:04:22 +02:00
Tristan Darricau
bad07b355c Merge pull request #2967 from nickvergessen/ticket/12963
[ticket/12963] Revert back to "migrations" folder name for extensions

* nickvergessen/ticket/12963:
  [ticket/12963] Always use core_path and core_directory()
  [ticket/12963] Remove old migration/ folder from tests
  [ticket/12963] Revert back to "migrations" folder name for extensions
2014-09-18 14:04:06 +02:00
Joas Schilling
374aa94be9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13022] Language adjustments
  [ticket/13022] Remove ternary condition
  [ticket/13022] Condition Return to advanced search link
2014-09-18 12:44:21 +02:00
Joas Schilling
b82a3cddd8 Merge pull request #2927 from Senky/ticket/13022
[ticket/13022] "Return to advanced search" wrong assumption

* Senky/ticket/13022:
  [ticket/13022] Language adjustments
  [ticket/13022] Remove ternary condition
  [ticket/13022] Condition Return to advanced search link
2014-09-18 12:44:12 +02:00
Jakub Senko
31e43ce124 [ticket/12489] Add notice about %s wildcard in FIELD_IS_CONTACT_EXPLAIN
PHPBB3-12489
2014-09-18 12:13:17 +02:00
Joas Schilling
1da5c41ab3 [ticket/12963] Always use core_path and core_directory()
PHPBB3-12963
2014-09-18 11:21:53 +02:00
Joas Schilling
5ce61e8c3a [ticket/12963] Remove old migration/ folder from tests
PHPBB3-12963
2014-09-18 11:21:51 +02:00
Joas Schilling
c220fa89a1 [ticket/12963] Revert back to "migrations" folder name for extensions
The issues that can be created with the name change are just too much

PHPBB3-12963
2014-09-18 10:45:08 +02:00
Cesar G
df220e5c0a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
2014-09-17 18:18:11 -07:00
Cesar G
53e028ff14 Merge remote-tracking branch 'GiampaoloFalqui/develop-ascraeus' into develop-ascraeus
* GiampaoloFalqui/develop-ascraeus:
  [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
2014-09-17 18:17:56 -07:00
Cesar G
5a46ed398b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12963] Fix the migration's finder for the tests (path, new instance)
2014-09-17 17:49:12 -07:00
Cesar G
53f62f1129 Merge remote-tracking branch 'Nicofuma/ticket/12963' into develop-ascraeus
* Nicofuma/ticket/12963:
  [ticket/12963] Fix the migration's finder for the tests (path, new instance)
2014-09-17 17:49:01 -07:00
Giampaolo Falqui
a2b5ec7e1b [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
PHPBB3-13068
2014-09-18 02:25:39 +02:00
rxu
dc65058c20 [ticket/13055] Add string profile fields validation options to support unicode
PHPBB3-13055
2014-09-18 08:19:08 +08:00
Tristan Darricau
0d1f0c07fe [ticket/12963] Fix the migration's finder for the tests (path, new instance)
PHPBB3-12963
2014-09-18 02:04:47 +02:00
Tristan Darricau
92d69255e4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
2014-09-18 01:32:55 +02:00
Tristan Darricau
6c043c4a86 Merge pull request #2964 from nickvergessen/ticket/12963
[ticket/12963] Correctly load migration files from migration/ in tests as well

* nickvergessen/ticket/12963:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
2014-09-18 01:32:08 +02:00
Joas Schilling
180f9bf4fa [ticket/12963] Correctly load migration files from migration/ in tests as well
PHPBB3-12963
2014-09-17 23:33:26 +02:00
Joas Schilling
45a4cf7ac5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
2014-09-17 21:25:20 +02:00
Joas Schilling
7729ae4ad0 [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
This reverts commit 46a9fe93d7.

PHPBB3-13064
2014-09-17 21:24:33 +02:00
Joas Schilling
dd89af7151 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
2014-09-17 20:11:23 +02:00
Jakub Senko
e59222496a [ticket/13045] Remove Pragma headers
PHPBB3-13045
2014-09-17 20:10:01 +02:00
Joas Schilling
910cd5edbe Merge pull request #2948 from Nicofuma/ticket/13061
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

* Nicofuma/ticket/13061:
  [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
2014-09-17 20:09:49 +02:00
Joas Schilling
d2e1c5c866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13062] Add viewforum.php core event to modify topic ids sql query
2014-09-17 20:02:19 +02:00
Joas Schilling
676f453cbd Merge pull request #2949 from rxu/ticket/13062
[ticket/13062] Add viewforum.php core event to modify topic ids sql query

* rxu/ticket/13062:
  [ticket/13062] Add viewforum.php core event to modify topic ids sql query
2014-09-17 20:02:13 +02:00
Joas Schilling
bf6ecccd25 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:47 +02:00
Joas Schilling
86ea314598 Merge pull request #2951 from Nicofuma/ticket/13064
[ticket/13064] Validate the migrations provided to migrator::set_migrations()

* Nicofuma/ticket/13064:
  [ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:39 +02:00
Joas Schilling
428e492542 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13044] Move GMT out of gmdate in functions_acp
  [ticket/13044] Move GMT out of gmdate()
  [ticket/13044] \G\M\T to GMT in whole project
  [ticket/13044] move GMT string out of gmdate()
  [ticket/13044] Correct Expires headers
2014-09-17 19:51:57 +02:00
Joas Schilling
7201238104 Merge pull request #2962 from Senky/ticket/13044
[ticket/13044] Expires header violates RFC 2616

* Senky/ticket/13044:
  [ticket/13044] Move GMT out of gmdate in functions_acp
  [ticket/13044] Move GMT out of gmdate()
  [ticket/13044] \G\M\T to GMT in whole project
  [ticket/13044] move GMT string out of gmdate()
  [ticket/13044] Correct Expires headers
2014-09-17 19:44:42 +02:00
Marc Alexander
f4761b5e08 [ticket/12858] Directly return and use timezone selects
PHPBB3-12858
2014-09-17 19:07:24 +02:00
Jakub Senko
3885ac90f1 [ticket/13044] Move GMT out of gmdate in functions_acp
PHPBB3-13044
2014-09-17 18:38:21 +02:00
Jakub Senko
3d637fea98 [ticket/13044] Move GMT out of gmdate()
PHPBB3-13044
2014-09-17 18:35:38 +02:00
Marc Alexander
9c310f789f [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
ad596f4390 [ticket/12858] Fix timezone select display in subsilver2
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
6323180344 [ticket/12858] Fix timezone display on acp users page
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
9a3aeb8a99 [ticket/12858] Remove hardcoded language entries from timezone selects
PHPBB3-12858
2014-09-17 17:56:04 +02:00
Marc Alexander
3dbac0f88b [ticket/12858] Use UTC for time info in footer and hide offset if it's 0
PHPBB3-12858
2014-09-17 14:23:34 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop
PHPBB3-12858
2014-09-17 14:22:08 +02:00
Jakub Senko
ea5e46f6dd [ticket/13044] \G\M\T to GMT in whole project
Note that there are more uses of "\G\M\T" in vendor files.

PHPBB3-13044
2014-09-17 11:56:37 +02:00
Jakub Senko
7cbd9e9524 [ticket/13044] move GMT string out of gmdate()
PHPBB3-13044
2014-09-17 11:15:24 +02:00
Jakub Senko
33b2063680 [ticket/13044] Correct Expires headers
PHPBB3-13044
2014-09-17 10:52:19 +02:00
Marc Alexander
f6ccb30781 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:57:34 +02:00
Marc Alexander
20903c0a9b Merge pull request #2922 from Nicofuma/ticket/13036
[ticket/13036] Make the reference type configurable when generating a route
2014-09-17 00:57:04 +02:00
Marc Alexander
5fa2d19756 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:37:07 +02:00
Marc Alexander
4a06511d85 Merge pull request #2932 from Nicofuma/ticket/12963
[ticket/12963] Load extensions migrations from /migration
2014-09-17 00:36:38 +02:00
Marc Alexander
b82a39fea9 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:25:25 +02:00
Marc Alexander
2e1aebbc12 Merge pull request #2959 from prototech/ticket/13069
[ticket/13069] Fix timezone location filtering.
2014-09-17 00:24:36 +02:00
Cesar G
4df031187f [ticket/13069] Fix timezone location filtering.
$timezone contains the original jQuery object, therefore the subsequent
removal of the optgroup children while filtering has no effect on the
$replacement object - the one that's now visible to the user. We'll simplify
and fix this by injecting the content of the copy instead of going through the
trouble of cloning it.

PHPBB3-13069
2014-09-16 14:47:42 -07:00
Tristan Darricau
a48b740b94 [ticket/13036] Complete tests
PHPBB3-13036
2014-09-16 21:56:45 +02:00
Tristan Darricau
8b16d31413 [ticket/12963] Edit deprecation message
PHPBB3-12963
2014-09-16 20:18:10 +02:00
Tristan Darricau
bb5d6a2551 [ticket/13036] Add unit tests
PHPBB3-13036
2014-09-16 19:44:58 +02:00
Tristan Darricau
dab6b99bcd [ticket/13036] Make the reference type configurable when generating a route
PHPBB3-13036
2014-09-16 19:28:06 +02:00
Marc Alexander
cf71bfbdf2 Merge branch 'develop-ascraeus' into develop 2014-09-16 19:24:45 +02:00
Marc Alexander
b3576d77da Merge pull request #2921 from Nicofuma/ticket/13034
[ticket/13034] Fix the route generated for the frontend not in the phpbb root path
2014-09-16 19:24:07 +02:00
Tristan Darricau
f4260e261f [ticket/13034] Fix tests
PHPBB3-13034
2014-09-16 01:25:36 +02:00
Tristan Darricau
68ad7685bc [ticket/13034] Update the base url to move to the root dir
PHPBB3-13034
2014-09-15 23:47:05 +02:00
Andreas Fischer
d9b1b61a52 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13018] Clean up and fix some logic.
  [ticket/13018] Do not handle events in close function.
  [ticket/13018] Reduce the delta further.
  [ticket/13018] Remove duplicate logic in confirm box and alert box handling.
2014-09-15 22:50:58 +02:00
Andreas Fischer
0b4f714bc4 Merge pull request #2958 from prototech/ticket/13018
[ticket/13018] Remove duplicate logic in confirm box and alert box handling.

* prototech/ticket/13018:
  [ticket/13018] Clean up and fix some logic.
  [ticket/13018] Do not handle events in close function.
  [ticket/13018] Reduce the delta further.
  [ticket/13018] Remove duplicate logic in confirm box and alert box handling.
2014-09-15 22:50:58 +02:00
Andreas Fischer
76aa737265 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13056] Move the arguments of the request class to the DI
2014-09-15 22:42:38 +02:00
Andreas Fischer
720561de6e Merge pull request #2943 from Nicofuma/ticket/13056
[ticket/13056] Move the arguments of the request class to the DI

* Nicofuma/ticket/13056:
  [ticket/13056] Move the arguments of the request class to the DI
2014-09-15 22:42:38 +02:00
Tristan Darricau
06f42f433b [ticket/13034] Add comment
PHPBB3-13034
2014-09-15 20:25:20 +02:00
Cesar G
4ae447b205 [ticket/13018] Clean up and fix some logic.
PHPBB3-13018
2014-09-15 07:44:02 -07:00
Cesar G
2b4807b116 [ticket/13018] Do not handle events in close function.
PHPBB3-13018
2014-09-15 07:43:18 -07:00
Cesar G
674ea44bc6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10472] Remove dd selector and use -moz-padding-end
  [ticket/10472] Fix weird padding on input type=number
  [ticket/10472] More clearing and white-space fixes
  [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens
2014-09-15 06:58:52 -07:00
Cesar G
f807b82162 Merge remote-tracking branch 'PayBas/ticket/10472' into develop-ascraeus
* PayBas/ticket/10472:
  [ticket/10472] Remove dd selector and use -moz-padding-end
  [ticket/10472] Fix weird padding on input type=number
  [ticket/10472] More clearing and white-space fixes
  [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens
2014-09-15 06:58:21 -07:00
PayBas
0061a305d8 [ticket/12408] Fix white-space sniffer
PHPBB3-12408
2014-09-15 15:25:43 +02:00
PayBas
6488d236ec [ticket/10472] Remove dd selector and use -moz-padding-end
PHPBB3-10472
2014-09-15 14:58:57 +02:00
PayBas
38830f9cbb [ticket/10472] Fix weird padding on input type=number
PHPBB3-10472
2014-09-15 14:53:04 +02:00
PayBas
726573f100 [ticket/10472] More clearing and white-space fixes
PHPBB3-10472
2014-09-15 14:53:04 +02:00
PayBas
da716058fa [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens
PHPBB3-10472
2014-09-15 14:53:03 +02:00
PayBas
5a780dfab1 [ticket/12408] Clarify the behavior of "override style"
PHPBB3-12408
2014-09-15 14:49:56 +02:00
PayBas
aaddf41e5b [ticket/12408] Changed lang vars, added fieldset and removed "default"
PHPBB3-12408
2014-09-15 14:43:40 +02:00
PayBas
0b4944f125 [ticket/12408] Public functions and updated doc block
PHPBB3-12408
2014-09-15 14:43:40 +02:00
PayBas
60c9955f51 [ticket/12408] Code cleanup
Rebased to see if travis will finally play along

PHPBB3-12408
2014-09-15 14:43:39 +02:00
PayBas
ae63843647 [ticket/12408] Simplified queries
PHPBB3-12408
2014-09-15 14:43:38 +02:00
PayBas
265c621c9e [ticket/12408] Add quick setting for "default guest style" to ACP
PHPBB3-12408
2014-09-15 14:43:38 +02:00
Cesar G
5034b3ad7d [ticket/13018] Reduce the delta further.
The callback does not actually do anything when cancelling the confirmation
box so we can avoid calling it altogether when cancel is clicked.

PHPBB3-13018
2014-09-14 15:49:18 -07:00
Cesar G
6d80770ba4 [ticket/13018] Remove duplicate logic in confirm box and alert box handling.
This ensures a more consistent handling of the various closing/opening actions
and fixes some bugs where certain event handlers are not turned off in certain
instances.

PHPBB3-13018
2014-09-14 14:54:08 -07:00
Tristan Darricau
b9e7ed004c [ticket/13034] Use utf8_basename
PHPBB3-13034
2014-09-14 23:41:15 +02:00
Tristan Darricau
1507c5af64 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
2014-09-14 22:07:52 +02:00
Tristan Darricau
9ef01e7f82 Merge pull request #2956 from prototech/ticket/13019
[ticket/13019] Always accept a reason for deleting a post/topic.

* prototech/ticket/13019:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
2014-09-14 22:00:16 +02:00
Marc Alexander
2634db6031 Merge branch 'develop-ascraeus' into develop 2014-09-14 20:45:11 +02:00
Marc Alexander
1487e6f857 Merge pull request #2955 from prototech/ticket/13065
[ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor.
2014-09-14 20:44:49 +02:00
Cesar G
ffe24d5b8f [ticket/13019] Do not hide reason field when deleting permanently.
PHPBB3-13019
2014-09-14 10:41:57 -07:00
Cesar G
8c11927b55 [ticket/13019] Rename deletion reason label.
PHPBB3-13019
2014-09-14 10:39:25 -07:00
Cesar G
bf7041eeb9 [ticket/13019] Always accept a reason for deleting a post/topic.
PHPBB3-13019
2014-09-14 10:38:56 -07:00
Cesar G
b71571b793 [ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor.
PHPBB3-13065
2014-09-14 10:04:18 -07:00
Cesar G
4250c75de1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
2014-09-14 07:40:52 -07:00
Cesar G
a45df1d840 Merge remote-tracking branch 'prototech/ticket/13040' into develop-ascraeus
* prototech/ticket/13040:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
2014-09-14 07:40:30 -07:00
John
e4401b2534 [ticket/13040] Fix W3C validator warning in overall_footer.html
Added a non-breaking space to remove the following warning:
**Empty heading.**

```html
<h3 class="alert_title"></h3><p class="alert_text"></p>
```

PHPBB3-13040
2014-09-14 06:30:03 -07:00
Cesar G
2566cf1499 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13058] Add min value to jump to page input
  [ticket/13009] Remove legacy browser hacks
2014-09-14 06:26:32 -07:00
Cesar G
ca7168ee4a Merge remote-tracking branch 'hanakin/ticket/13009' into develop-ascraeus
* hanakin/ticket/13009:
  [ticket/13009] Remove legacy browser hacks
2014-09-14 06:23:00 -07:00
Cesar G
7f86b6e71e Merge remote-tracking branch 'Nicofuma/ticket/13058' into develop-ascraeus
* Nicofuma/ticket/13058:
  [ticket/13058] Add min value to jump to page input
2014-09-14 06:21:25 -07:00
rxu
bf6bc330af [ticket/13066] Add search results core event to modify search title
PHPBB3-13066
2014-09-14 15:00:47 +08:00
Tristan Darricau
46a9fe93d7 [ticket/13064] Validate the migrations provided to migrator::set_migrations()
PHPBB3-13064
2014-09-14 00:56:41 +02:00
Louis7777
2cf5b848db [ticket/13058] Add min value to jump to page input
PHPBB3-13058
2014-09-13 22:44:37 +02:00
rxu
e731dcfe6e [ticket/13062] Add viewforum.php core event to modify topic ids sql query
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45383

PHPBB3-13062
2014-09-14 01:04:34 +08:00
Tristan Darricau
c988b98ac6 [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
PHPBB3-13061
2014-09-13 14:34:18 +02:00
Tristan Darricau
3dc73485ee [ticket/13056] Move the arguments of the request class to the DI
PHPBB3-13056
2014-09-13 14:22:55 +02:00
Marc Alexander
08d16cf7c9 Merge branch 'develop-ascraeus' into develop 2014-09-12 19:54:34 +02:00
Marc Alexander
48dbef391b Merge pull request #2879 from callumacrae/ticket/12982
[ticket/12982] JS refactoring
2014-09-12 19:54:03 +02:00
Andreas Fischer
93fbc468fb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12734] Remove unnecessary error supressing
2014-09-12 00:54:51 +02:00
Andreas Fischer
f26b6b6251 Merge pull request #2941 from Senky/ticket/12734
[ticket/12734] Custom profile manager should not suppress errors when inserting user rows

* Senky/ticket/12734:
  [ticket/12734] Remove unnecessary error supressing
2014-09-12 00:54:51 +02:00
Andreas Fischer
f73e60935d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
2014-09-12 00:52:24 +02:00
Andreas Fischer
f892646a84 Merge pull request #2944 from Nicofuma/ticket/13057
[ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php

* Nicofuma/ticket/13057:
  [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
2014-09-12 00:52:22 +02:00
Tristan Darricau
7b4c5bdd34 [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
PHPBB3-13057
2014-09-11 22:01:09 +02:00
hanakin
7618e0387c [ticket/13009] Remove legacy browser hacks
PHPBB3-13009
2014-09-11 17:33:30 +02:00
Tristan Darricau
dd2a643e65 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13005] Add event to display_forums() to modify category template data
2014-09-11 16:59:38 +02:00
Tristan Darricau
7d6ceb81c1 Merge pull request #2901 from rxu/ticket/13005
[ticket/13005] Add event to display_forums() to modify category template data

* rxu/ticket/13005:
  [ticket/13005] Add event to display_forums() to modify category template data
2014-09-11 16:58:34 +02:00
Tristan Darricau
d1c4e0d63c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
2014-09-11 16:44:57 +02:00
Tristan Darricau
5804e43589 Merge pull request #2903 from rxu/ticket/13006
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event

* rxu/ticket/13006:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
2014-09-11 16:44:16 +02:00
Andreas Fischer
2c7fbb9e61 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13042] Remove unused variables
2014-09-10 22:17:18 +02:00
Andreas Fischer
d42401056c Merge pull request #2940 from Senky/ticket/13042
[ticket/13042] Unused var in login_box()

* Senky/ticket/13042:
  [ticket/13042] Remove unused variables
2014-09-10 22:17:17 +02:00
Tristan Darricau
d465e7e438 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html
2014-09-10 20:02:20 +02:00
Tristan Darricau
c842583bbf Merge pull request #2936 from nickvergessen/ticket/12976
[ticket/12976] Correctly use plurals for attachment count in UCP navigation

* nickvergessen/ticket/12976:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation
2014-09-10 20:00:52 +02:00
Tristan Darricau
04e0d305d0 [ticket/12963] Add unit tests
PHPBB3-12963
2014-09-10 19:22:00 +02:00
Tristan Darricau
72ee4b3a7c [ticket/12963] Load extensions migrations from /migration
PHPBB3-12963
2014-09-10 19:21:57 +02:00
Tristan Darricau
ff872a7970 [ticket/12963] Don't use static var in \extension\base\get_migration_file_list
The static var was global to all instance of \phpbb\base and so if two
different instances (for two different extensions) were created by the
same script they shared the same migrations list.

PHPBB3-12963
2014-09-10 19:21:55 +02:00
Jakub Senko
fcd2a2f186 [ticket/12734] Remove unnecessary error supressing
PHPBB3-12734
2014-09-10 18:37:16 +02:00
Jakub Senko
51f5c2d094 [ticket/13042] Remove unused variables
PHPBB3-13042
2014-09-10 17:38:05 +02:00
Tristan Darricau
a093c28d1a [ticket/12963] Fix the list of migrations in database_update.php
Without this patch the finder grab all the class available in the ext
folder and not only the migrations. This change is backported for the one
done before to the cli tool db:migrate. (see the commit
3420f8f320)

PHPBB3-12963
2014-09-10 12:01:01 +02:00
Tristan Darricau
d320897180 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13052] Restore timespan parameter for check_form_key()
2014-09-10 11:50:28 +02:00
Tristan Darricau
b2a28962bc Merge pull request #2939 from nickvergessen/ticket/13052
[ticket/13052] Restore timespan parameter for check_form_key()

* nickvergessen/ticket/13052:
  [ticket/13052] Restore timespan parameter for check_form_key()
2014-09-10 11:50:13 +02:00
Callum Macrae
cb7e1540c6 [ticket/12982] Refactoring: Killed undescriptive variables
PHPBB3-12982
2014-09-10 09:58:46 +01:00
Joas Schilling
d87547da66 [ticket/13052] Restore timespan parameter for check_form_key()
PHPBB3-13052
2014-09-10 08:07:21 +02:00
Marc Alexander
d1b7408bf0 Merge branch 'develop-ascraeus' into develop 2014-09-09 23:37:54 +02:00
Marc Alexander
6c0a3bb247 Merge pull request #2934 from VSEphpbb/ticket/13051
[ticket/13051] Fix viewonline event (recently broken) and add a new core event
2014-09-09 23:37:30 +02:00
Matt Friedman
0fc5a27889 [ticket/13051] Fix core event name
PHPBB3-13051
2014-09-09 13:12:29 -07:00
Matt Friedman
0861404121 [ticket/13051] Rename new event core.viewonline_modify_user_row
PHPBB3-13051
2014-09-09 12:52:53 -07:00
Jakub Senko
bfb672f326 [ticket/13027] round to floor
PHPBB3-13027
2014-09-09 21:33:19 +02:00
Joas Schilling
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation
PHPBB3-12976
2014-09-09 21:31:34 +02:00
Andreas Fischer
aa6d7a09b8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
2014-09-09 21:25:21 +02:00
Andreas Fischer
65026ed1fa Merge pull request #2935 from nickvergessen/ticket/13052
Ticket/13052 Remove additional parameter from check_form_key()

* nickvergessen/ticket/13052:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
2014-09-09 21:25:15 +02:00
Joas Schilling
ef61deb132 [ticket/13052] Use request class instead of $_POST and request_var()
PHPBB3-13052
2014-09-09 19:49:17 +02:00
Joas Schilling
ad8d53af27 [ticket/13052] Fix appearances with multiple parameters
PHPBB3-13052
2014-09-09 19:47:00 +02:00
Joas Schilling
047728e3d4 [ticket/13052] Remove additional parameter from check_form_key()
PHPBB3-13052
2014-09-09 19:46:27 +02:00
Matt Friedman
c56c0fce0d [ticket/13051] Add a new core event to handle the template array
PHPBB3-13051
2014-09-09 09:14:32 -07:00
Matt Friedman
c6fc455432 [ticket/13051] Fix viewonline event, remove template data
PHPBB3-13051
2014-09-08 15:54:16 -07:00
Jakub Senko
4b4a673d98 [ticket/13022] Language adjustments
PHPBB3-13022
2014-09-08 23:14:33 +02:00
Andreas Fischer
33762db175 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13038] Add link to number of posts of user in viewtopic
2014-09-08 22:12:44 +02:00
Andreas Fischer
e00697f3a1 Merge pull request #2926 from Senky/ticket/13038
[ticket/13038] Link user post tally to their posts

* Senky/ticket/13038:
  [ticket/13038] Add link to number of posts of user in viewtopic
2014-09-08 22:12:44 +02:00
Andreas Fischer
869cff6ace Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13050] Allow topic/forum subscription when email/jabber is off
2014-09-08 21:23:46 +02:00
Andreas Fischer
3458aa2482 Merge pull request #2931 from rxu/ticket/13050
[ticket/13050] Allow topic/forum subscription when email/jabber is off

* rxu/ticket/13050:
  [ticket/13050] Allow topic/forum subscription when email/jabber is off
2014-09-08 21:23:46 +02:00
Jakub Senko
aefd96e604 [ticket/13038] Add link to number of posts of user in viewtopic
PHPBB3-13038
2014-09-08 17:36:08 +02:00
Marc Alexander
5df5b9c2d5 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:47:43 +02:00
Marc Alexander
bcd4cebd48 Merge pull request #2915 from rxu/ticket/13026
[ticket/13026] Add template vars array to core.viewonline_overwrite_location
2014-09-08 16:46:26 +02:00
Marc Alexander
8a568a77f6 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:30:31 +02:00
Marc Alexander
cc96bcff99 Merge pull request #2911 from rxu/ticket/13020
[ticket/13020] Add variables to core.viewforum_get_topic_data event
2014-09-08 16:30:05 +02:00
Andreas Fischer
04c073e138 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13035] Remove empty meta tags

Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
2014-09-08 13:46:16 +02:00
Andreas Fischer
33e5e426d4 Merge pull request #2933 from bantu/ticket/13035
[ticket/13035] Remove empty meta tags

* bantu/ticket/13035:
  [ticket/13035] Remove empty meta tags
2014-09-08 13:45:34 +02:00
dcz
85468ce2ec [ticket/13035] Remove empty meta tags
PHPBB3-13035
2014-09-08 13:09:38 +02:00
Jakub Senko
dfbc2adc08 [ticket/13022] Remove ternary condition
PHPBB3-13022
2014-09-07 22:39:22 +02:00
rxu
de7b100b8a [ticket/13020] Add forum_data variable to core.viewforum_get_topic_data event
PHPBB3-13020
2014-09-07 19:48:06 +08:00
rxu
d470d628f5 [ticket/13026] Add template vars array to core.viewonline_overwrite_location
Add template vars array to core.viewonline_overwrite_location event
to allow modifying/adding template vars for every user row.

PHPBB3-13026
2014-09-07 19:04:32 +08:00
rxu
40ef561349 [ticket/13050] Allow topic/forum subscription when email/jabber is off
Currently, there's impossible to subscribe topic/forum if emails and/or jabber
is disabled. This seems to be a 3.0 leftover since 3.1 introduces new
notification system which handles this case and offers email/jabber-free
board notifications.

PHPBB3-13050
2014-09-07 18:54:34 +08:00
Joas Schilling
54ccea9312 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13048] Only update session_page if request is not ajax
2014-09-07 12:50:55 +02:00
Joas Schilling
12398d65fd Merge pull request #2930 from Senky/ticket/13048
[ticket/13048] AJAX requests are being stored to session_page

* Senky/ticket/13048:
  [ticket/13048] Only update session_page if request is not ajax
2014-09-07 12:50:03 +02:00
Joas Schilling
8ed0f94e31 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
2014-09-07 12:47:36 +02:00
Joas Schilling
c1d0528d80 Merge pull request #2929 from rxu/ticket/13047
[ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event

* rxu/ticket/13047:
  [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
2014-09-07 12:47:13 +02:00
Joas Schilling
043a66faaa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
2014-09-07 12:43:23 +02:00
Joas Schilling
b3a8e92810 Merge pull request #2928 from Nicofuma/ticket/13046
[ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php

* Nicofuma/ticket/13046:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
2014-09-07 12:42:52 +02:00
Marc Alexander
c00e0c55c5 Merge branch 'develop-ascraeus' into develop 2014-09-07 11:58:57 +02:00
Marc Alexander
a0ee6ccdf3 Merge pull request #2925 from nickvergessen/ticket/12983
Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
2014-09-07 11:41:44 +02:00
Joas Schilling
d5801333f7 [ticket/12983] Do not test invalid values until Symfony 2.4
PHPBB3-12983
2014-09-07 10:40:18 +02:00
Jakub Senko
b218f3ad43 [ticket/13048] Only update session_page if request is not ajax
PHPBB3-13048
2014-09-07 10:15:51 +02:00
rxu
a6f1b22eb3 [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
PHPBB3-13047
2014-09-07 13:36:23 +08:00
Tristan Darricau
088e34dc47 [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
PHPBB3-13046
2014-09-07 01:41:21 +02:00
Tristan Darricau
af10ca630d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
2014-09-06 15:47:47 +02:00
Tristan Darricau
297ab5c526 Merge pull request #2919 from Senky/ticket/12852
[ticket/12852] Make get_url_parts handle get variable with no value

* Senky/ticket/12852:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
2014-09-06 15:47:30 +02:00
Joas Schilling
647a75249c [ticket/12983] Add functional test for ucp pref module
PHPBB3-12983
2014-09-06 15:16:51 +02:00
Jakub Senko
1094de49c2 [ticket/13022] Condition Return to advanced search link
PHPBB3-13022
2014-09-06 14:53:14 +02:00
Tristan Darricau
e0711b417f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
2014-09-06 13:54:16 +02:00
Tristan Darricau
6387bf8d13 Merge pull request #2918 from marc1706/ticket/13031
[ticket/13031] Only use mimetype guesser guess if it helps us

* marc1706/ticket/13031:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
2014-09-06 13:53:43 +02:00
Marc Alexander
21029e9fd2 [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
The mime type 'application/octet-stream' will still always be overwritten by
proper guesses. However, guesses with guessers that have a higher priority
will now overwrite previous guesses even if the mime types of these guesses
had a slash in them.

PHPBB3-13031
2014-09-05 21:55:49 +02:00
Marc Alexander
bc38730ab5 Merge branch 'develop-ascraeus' into develop 2014-09-05 21:36:02 +02:00
Marc Alexander
6eaeae60f6 Merge pull request #2748 from carlo94it/ticket/12765
[ticket/12765] Use db_tools instead of generating queries at moment
2014-09-05 21:23:04 +02:00
Marc Alexander
f7d41c8465 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/ucp_header.html
2014-09-05 21:07:02 +02:00
Marc Alexander
b854882470 Merge pull request #2868 from rxu/ticket/12969
[ticket/12969] Add template events around username link on composing pm
2014-09-05 21:05:33 +02:00
Joas Schilling
b9cb3b9e3e [ticket/12983] Correctly validate sorting options in the UCP
PHPBB3-12983
2014-09-05 13:24:31 +02:00
Marc Alexander
d31ff51785 [ticket/13031] Guess with all mimetype guessers and pick best guess
PHPBB3-13031
2014-09-05 10:56:06 +02:00
Tristan Darricau
4f44e73b21 [ticket/13034] Fix unit tests
PHPBB3-13034
2014-09-04 23:21:56 +02:00
Tristan Darricau
cb3eb84665 [ticket/13034] Fix the route generated for the frontend not in the phpbb root
PHPBB3-13034
2014-09-04 23:21:55 +02:00
Jakub Senko
7b796532df [ticket/12852] Add unit tests
PHPBB3-12852
2014-09-04 17:56:48 +02:00
Jakub Senko
1d4cae9ecb [ticket/12852] Add space after if
PHPBB3-12852
2014-09-04 17:44:41 +02:00
Jakub Senko
28587d0afc [ticket/12852] Remove whitespace
PHPBB3-12852
2014-09-04 16:15:45 +02:00
Jakub Senko
17e4e5f8c4 [ticket/12852] Make get_url_parts handle get variable with no value
PHPBB3-12852
2014-09-04 13:33:04 +02:00
Marc Alexander
c46747aa9f Merge branch 'develop-ascraeus' into develop 2014-09-04 13:06:46 +02:00
Marc Alexander
10c99b3c2b Merge pull request #2917 from bantu/ticket/13032
[ticket/13032] Update Symfony Components to 2.3.19
2014-09-04 13:06:13 +02:00
Marc Alexander
7de15bc54c [ticket/13031] Only use mimetype guesser guess if it helps us
If we already have a mimetype and the guesser's guess is the default fallback,
we should keep the already existing mimetype the browser supplied. Otherwise,
platforms that might not support mimetype guessers will cause us to always
have the mimetype set to application/octet-stream on images. This will prevent
users from uploading images.

PHPBB3-13031
2014-09-03 23:09:17 +02:00
Andreas Fischer
a3c63f6c03 [ticket/13032] Also update symfony/css-selector and pin it down.
PHPBB3-13032
2014-09-03 21:47:41 +02:00
Andreas Fischer
65577ed422 [ticket/13032] Update Symfony Components to 2.3.19
PHPBB3-13032
2014-09-03 21:40:38 +02:00
Marc Alexander
c5576710ec Merge pull request #2916 from Nicofuma/ticket/12661
[ticket/12661] Fix unit tests
2014-09-02 22:37:34 +02:00
Tristan Darricau
55a3c96fb0 [ticket/12661] Fix unit tests
PHPBB3-12661
2014-09-02 22:12:11 +02:00
Marc Alexander
cf5ae5abbc Merge branch 'develop-ascraeus' into develop 2014-09-02 20:55:25 +02:00
Marc Alexander
6777d462ff Merge pull request #2908 from Pico/t/12661
[ticket/12661] Load extensions templates from "all" folder by render()
2014-09-02 20:54:51 +02:00
Marc Alexander
da9888d04f Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/mcp_warn_post.html
	phpBB/styles/subsilver2/template/mcp_warn_user.html
2014-09-01 22:46:08 +02:00
Marc Alexander
d86817ef07 Merge pull request #2887 from Pico/ticket/12991
[ticket/12991] Have events after/before "add warning" field - user and post
2014-09-01 22:43:54 +02:00
rxu
1d4c040d4f [ticket/12969] Add template events around username link on composing pm
Add template event before/after find username link on composing pm
to allow extensions perform additional actions on user finding.

PHPBB3-12969
2014-09-02 01:02:17 +08:00
Marc Alexander
d5003877e3 Merge pull request #2914 from Nicofuma/ticket/13024
[ticket/13024] Fix event file (remove subsilver references)
2014-09-01 00:44:33 +02:00
Tristan Darricau
61dc381be6 [ticket/13024] Fix event file (remove subsilver references)
PHPBB3-13024
2014-09-01 00:33:54 +02:00
Marc Alexander
34d8caf773 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2014-08-31 19:31:13 +02:00
Marc Alexander
97c798a375 Merge pull request #2913 from Nicofuma/ticket/13024
[ticket/13024] Add template event viewtopic_body_postrow_post_content_footer
2014-08-31 19:30:01 +02:00
Tristan Darricau
76053b3cd4 [ticket/13024] Add template event viewtopic_body_postrow_post_content_footer
PHPBB3-13024
2014-08-30 23:52:14 +02:00
Marc Alexander
05a7a57815 Merge branch 'develop-ascraeus' into develop 2014-08-30 22:56:26 +02:00
Marc Alexander
01f821bbc3 Merge pull request #2826 from brunoais/ticket/12928
[ticket/12928] core.mcp_reports_gather_query_before
2014-08-30 22:55:56 +02:00
Pico
7fc550aedc [ticket/12991] Correct language mistakes
PHPBB3-12991
2014-08-30 06:31:55 +02:00
Dhruv
df3bc78af8 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12966] Sort by post_time and post_id where applicable
  [ticket/12966] Sort posts by post_id in addition to sorting by post_time
2014-08-29 20:44:41 +05:30
Dhruv Goel
6d9c0a76df Merge pull request #2865 from marc1706/ticket/12966
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
2014-08-29 20:44:01 +05:30
Marc Alexander
80a1314ebb Merge branch 'develop-ascraeus' into develop 2014-08-28 21:18:41 +02:00
Marc Alexander
cbbef46c6c Merge pull request #2909 from n-aleha/ticket/11909
[ticket/11909] Remove unused function load_migrations
2014-08-28 21:18:17 +02:00
PayBas
ab9cdcadfb [ticket/12961] Shorten ext-db link text
PHPBB3-12961
2014-08-26 12:45:54 +02:00
n-aleha
bcc1b7aec9 [ticket/11909] Remove unused function load_migrations
Remove unused function load_migrations from \phpbb\db\migrator

PHPBB3-11909
2014-08-26 02:56:47 +03:00
Pico
9d44c5d940 [ticket/12661] Add new line at the end of files
PHPBB3-12661
2014-08-25 22:35:55 +02:00
Cesar G
7048387620 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12506] Fix search result h3 margin
  [ticket/12506] Fix responsive profile min-height (no avatar)
  [ticket/12506] Reposition buttons to make room for "online" banner
  [ticket/12506] Reposition post-buttons for compact layout
2014-08-25 13:13:46 -07:00
Cesar G
7cd6dbe898 Merge remote-tracking branch 'PayBas/ticket/12506' into develop-ascraeus
* PayBas/ticket/12506:
  [ticket/12506] Fix search result h3 margin
  [ticket/12506] Fix responsive profile min-height (no avatar)
  [ticket/12506] Reposition buttons to make room for "online" banner
  [ticket/12506] Reposition post-buttons for compact layout
2014-08-25 13:13:25 -07:00
Andreas Fischer
dde16e4b2a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
2014-08-24 22:32:55 +02:00
Andreas Fischer
9fc5073540 Merge pull request #2905 from Nicofuma/ticket/13008
[ticket/13008] Use an absolute path with the FileLocator for the routing files

* Nicofuma/ticket/13008:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
2014-08-24 22:32:54 +02:00
Tristan Darricau
0386b1788a [ticket/13008] Add functionnal test
PHPBB3-13008
2014-08-24 15:17:50 +02:00
Pico88
273fc5b5b6 [ticket/12661] Add template test
PHPBB3-12661
2014-08-24 10:16:39 +02:00
Pico88
ae3b015f65 [ticket/12661] Load extensions templates from "all" folder by render()
PHPBB3-12661
2014-08-24 08:10:37 +02:00
Tristan Darricau
8144de3792 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
2014-08-24 00:26:57 +02:00
Tristan Darricau
154710aa50 Merge pull request #2907 from marc1706/ticket/13010
[ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock

* marc1706/ticket/13010:
  [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
2014-08-24 00:26:27 +02:00
Marc Alexander
c2f19239a1 Merge branch 'develop-ascraeus' into develop 2014-08-24 00:20:51 +02:00
Marc Alexander
e2c56609ab Merge pull request #2904 from Nicofuma/ticket/12990
[ticket/12990] Disable all the notifications types which are not in the core
2014-08-24 00:20:24 +02:00
Marc Alexander
6e274740df [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
PHPBB3-13010
2014-08-24 00:11:43 +02:00
Tristan Darricau
1a41632af8 [ticket/12990] Disable all the notifications types which are not in the core
PHPBB3-12990
2014-08-23 23:39:46 +02:00
Marc Alexander
e5e45f860b [ticket/12966] Sort by post_time and post_id where applicable
This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966
2014-08-23 16:36:39 +02:00
Andreas Fischer
05616b6ceb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12658] Rebased and fixed unit tests
  [ticket/12658] Fix wrong eol character
  [ticket/12658] Refactoring code
  [ticket/12658] Fix typo and coding style mistakes
  [ticket/12658] Add test for command config:delete
  [ticket/12658] Add test for command config:increment
  [ticket/12658] Add test for command config:get
  [ticket/12658] Add test for command config:set-atomic
  [ticket/12658] Add test for base case of command config:set
2014-08-23 13:21:51 +02:00
Andreas Fischer
1e09fd0cee Merge pull request #2551 from ptitlazy/ticket/12658
[ticket/12658] Add test for base case of commands config:

* ptitlazy/ticket/12658:
  [ticket/12658] Rebased and fixed unit tests
  [ticket/12658] Fix wrong eol character
  [ticket/12658] Refactoring code
  [ticket/12658] Fix typo and coding style mistakes
  [ticket/12658] Add test for command config:delete
  [ticket/12658] Add test for command config:increment
  [ticket/12658] Add test for command config:get
  [ticket/12658] Add test for command config:set-atomic
  [ticket/12658] Add test for base case of command config:set
2014-08-23 13:21:50 +02:00
Tristan Darricau
91804b53fb [ticket/12658] Rebased and fixed unit tests
PHPBB3-12658
2014-08-23 12:45:25 +02:00
LEZY Thomas
5a4de4aa1f [ticket/12658] Fix wrong eol character
PHPBB3-12658
2014-08-23 12:41:44 +02:00
LEZY Thomas
059f21a3ac [ticket/12658] Refactoring code
PHPBB3-12658
2014-08-23 12:41:42 +02:00
LEZY Thomas
ab6c9775d3 [ticket/12658] Fix typo and coding style mistakes
PHPBB3-12658
2014-08-23 12:41:41 +02:00
LEZY Thomas
f9803b7360 [ticket/12658] Add test for command config:delete
PHPBB3-12658
2014-08-23 12:41:39 +02:00
LEZY Thomas
3fbab9504b [ticket/12658] Add test for command config:increment
PHPBB3-12658
2014-08-23 12:41:37 +02:00
LEZY Thomas
9affb8c171 [ticket/12658] Add test for command config:get
PHPBB3-12658
2014-08-23 12:41:36 +02:00
LEZY Thomas
ede73b207b [ticket/12658] Add test for command config:set-atomic
PHPBB3-12658
2014-08-23 12:41:35 +02:00
LEZY Thomas
1662ee64e0 [ticket/12658] Add test for base case of command config:set
PHPBB3-12658
2014-08-23 12:41:32 +02:00
Tristan Darricau
03b9eb5dcb [ticket/13008] Use an absolute path with the FileLocator for the routing files
PHPBB3-13008
2014-08-23 12:34:23 +02:00
PayBas
5eea1ca44e [ticket/12961] Fix missing phpBB.com
Don't know how that happened. Weird

PHPBB3-12961
2014-08-23 12:32:43 +02:00
Andreas Fischer
10b525fd9f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12862] Remove remaining simple-wrap id
  [ticket/12862] Resize popups consistently
  [ticket/12862] Add Border
2014-08-23 11:40:38 +02:00
Andreas Fischer
a79da361ee Merge pull request #2783 from hanakin/ticket/12862
[ticket/12862] Fix pop-up box wraps

* hanakin/ticket/12862:
  [ticket/12862] Remove remaining simple-wrap id
  [ticket/12862] Resize popups consistently
  [ticket/12862] Add Border
2014-08-23 11:40:37 +02:00
rxu
30b6080529 [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
Add $quickmod and $action variables
for the 'core.modify_quickmod_actions' event trigerring
to avoid of using global operator in corresponding extensions.

PHPBB3-13006
2014-08-22 21:55:26 +08:00
PayBas
f22ee4f73a [ticket/12961] Remove target="_blank" and switch to <strong>
PHPBB3-12961
2014-08-22 15:23:35 +02:00
rxu
0aa7d3ef75 [ticket/13005] Add event to display_forums() to modify category template data
While there're events to modify/add FORUM_POST/FORUM_LINK template data,
such an event is missing for FORUM_CAT forum type.

PHPBB3-13005
2014-08-22 18:53:20 +08:00
Andreas Fischer
d2ed2c4e1e Merge pull request #2899 from Skouat/ticket/13003
[ticket/13003] Add missing language keys

* Skouat/ticket/13003:
  [ticket/13003] Add missing language keys
2014-08-22 11:59:26 +02:00
Andreas Fischer
5f4726e607 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13003] Add missing language keys
2014-08-22 11:59:26 +02:00
Andreas Fischer
3dd5712504 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
2014-08-21 22:48:16 +02:00
Andreas Fischer
39bfbc3a26 Merge pull request #2900 from prototech/ticket/13004
[ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.

* prototech/ticket/13004:
  [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
2014-08-21 22:48:15 +02:00
Marc Alexander
2544d8f9d9 Merge branch 'develop-ascraeus' into develop 2014-08-21 20:50:05 +02:00
Marc Alexander
7483d01942 Merge pull request #2898 from Nicofuma/ticket/12990
[ticket/12990] Use {$var} instead of ${var}
2014-08-21 20:49:41 +02:00
PayBas
ca55f22c73 [ticket/12961] Add additional link to the KB
PHPBB3-12961
2014-08-21 20:05:55 +02:00
Cesar G
be0ebbe644 [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
PHPBB3-13004
2014-08-21 10:47:40 -07:00
Mario Skouat
923a818e37 [ticket/13003] Add missing language keys
PHPBB3-13003
2014-08-21 19:37:03 +02:00
Tristan Darricau
afb9d0a3d7 [ticket/12990] Use {$var} instead of ${var}
PHPBB3-12990
2014-08-21 16:04:46 +02:00
Andreas Fischer
f08ef371c5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12999] Remove @author tags
2014-08-21 13:44:10 +02:00
Andreas Fischer
a7a05ca75c Merge pull request #2894 from Nicofuma/ticket/12999
[ticket/12999] Remove @author tags

* Nicofuma/ticket/12999:
  [ticket/12999] Remove @author tags
2014-08-21 13:44:10 +02:00
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
Marc Alexander
31aac66f5a Merge pull request #2885 from Nicofuma/ticket/12990
[ticket/12990] Use the full services name for the notification's types
2014-08-21 00:44:05 +02:00
Marc Alexander
19aecaf7c7 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:22:41 +02:00
Marc Alexander
421005b282 Merge pull request #2889 from rxu/ticket/12994
[ticket/12994] Add core event to viewtopic.php before sending vars to template
2014-08-21 00:22:18 +02:00
rxu
60b38847d2 [ticket/12994] Add core event to viewtopic.php before sending vars to template
Add core event to viewtopic.php before sending vars to template
to allow extensions performing additional actions/modifying data first.

PHPBB3-12994
2014-08-21 04:54:26 +08:00
Marc Alexander
aa8403ff02 Merge branch 'develop-ascraeus' into develop 2014-08-20 22:04:14 +02:00
Marc Alexander
43d7d47e9b Merge pull request #2895 from Nicofuma/ticket/12998
[ticket/12998] Fix use of $lang in mcp_warn.php
2014-08-20 22:03:50 +02:00
Tristan Darricau
9486c693b6 [ticket/12998] Fix use of $lang in mcp_warn.php
PHPBB3-12998
2014-08-19 23:02:54 +02:00
Tristan Darricau
c013e727d4 [ticket/12999] Remove @author tags
PHPBB3-12999
2014-08-19 22:54:45 +02:00
Tristan Darricau
fe1ab6d2ef [ticket/12993] Return an array instead of reference passing
PHPBB3-12993
2014-08-19 22:25:01 +02:00
Andreas Fischer
6fb9fcd8ec Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12989] Remove unused "created_by.jpg"
2014-08-19 21:29:18 +02:00
Andreas Fischer
0f3defbb26 Merge pull request #2893 from bantu/ticket/12989
[ticket/12989] Remove unused "created_by.jpg"

* bantu/ticket/12989:
  [ticket/12989] Remove unused "created_by.jpg"
2014-08-19 21:29:17 +02:00
Louis7777
8a5dd101a3 [ticket/12989] Remove unused "created_by.jpg"
This image is not used anywhere in prosilver.

PHPBB3-12989
2014-08-19 20:58:47 +02:00
Tristan Darricau
5e7d9d2fcf [ticket/12993] Fix includes of functions_display
PHPBB3-12993
2014-08-19 13:51:21 +02:00
Andreas Fischer
e9347ec839 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12996] Fix reliability issue in flock test.
2014-08-19 12:20:07 +02:00
Andreas Fischer
da3ddaf676 Merge pull request #2892 from bantu/ticket/12996
[ticket/12996] Fix reliability issue in flock test.

* bantu/ticket/12996:
  [ticket/12996] Fix reliability issue in flock test.
2014-08-19 12:20:06 +02:00
Fred Emmott
0ef7a9d455 [ticket/12996] Fix reliability issue in flock test.
$delta was always an int - so, this test would sometimes fail if you
happened to call time() /very/ close to a 1s boundary.

Found by HHVM's continuous testing.

PHPBB3-12996
2014-08-19 11:53:34 +02:00
Tristan Darricau
496cc64bc6 [ticket/12993] Rename to phpbb_get_user_rank
PHPBB3-12993
2014-08-18 16:32:05 +02:00
Tristan Darricau
685bdc87e6 [ticket/12993] Fix user_loader and memberlist
PHPBB3-12993
2014-08-18 14:07:47 +02:00
Forumhulp.com
8671e40217 [ticket/12993] Improve get_user_ranks
Explanation in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=46051

PHPBB3-12993
2014-08-18 13:59:33 +02:00
Tristan Darricau
71f78fb8c6 [ticket/12990] Use protected instead of private
PHPBB3-12990
2014-08-17 23:03:44 +02:00
Andreas Fischer
a82a88b555 Merge pull request #2886 from Oyabun1/ticket/12984
[ticket/12984] Remove blank line when no forum description shown

* Oyabun1/ticket/12984:
  [ticket/12984] Remove blank line when no forum description shown
2014-08-17 22:31:46 +02:00
Andreas Fischer
dc87e581c1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12984] Remove blank line when no forum description shown
2014-08-17 22:31:46 +02:00
Pico88
9d7deba67a [ticket/12991] Have events after/before "add warning" field - user and post
PHPBB3-12991
2014-08-17 19:04:35 +02:00
Tristan Darricau
b18fe1203a [ticket/12990] Fix unit tests
PHPBB3-12990
2014-08-17 16:19:23 +02:00
Oyabun1
621f8c922f [ticket/12984] Remove blank line when no forum description shown
Add a conditional for forum description and move the <br /> within it.
Currently if there is no forum description but there is
1. a displayed forum moderator and/or
2. a displayed sub-forum
a blank line is added in place of the description

PHPBB3-12984
2014-08-17 20:39:22 +10:00
Andreas Fischer
f1e9c24c66 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12986] Fix detection of common words in search
2014-08-17 01:14:47 +02:00
Andreas Fischer
4ff5aa18ae Merge pull request #2881 from rxu/ticket/12986
[ticket/12986] Fix detection of common words in search

* rxu/ticket/12986:
  [ticket/12986] Fix detection of common words in search
2014-08-17 01:14:46 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types
PHPBB3-12990
2014-08-16 21:46:03 +02:00
rxu
354d08dfff [ticket/12986] Fix detection of common words in search
$search->get_common_words() call goes before the split_keywords() call,
but $search->common_words array is being generated
within the function $search->split_keywords(). Thus, get_common_words()
returned an empty array instead of common words array.

PHPBB3-12986
2014-08-17 00:35:12 +08:00
Andreas Fischer
f3076cf444 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
2014-08-16 09:50:51 +02:00
Andreas Fischer
e9f5b9d657 Merge pull request #2872 from Nicofuma/ticket/12975
[ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth

* Nicofuma/ticket/12975:
  [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
2014-08-16 09:50:51 +02:00
PayBas
45405a48a8 [ticket/12961] Move link to language file
PHPBB3-12961
2014-08-15 22:53:05 +02:00
PayBas
73426d2d30 [ticket/12961] Refactor lang entry
PHPBB3-12961
2014-08-14 22:22:20 +02:00
Marc Alexander
bebcd59694 Merge branch 'develop-ascraeus' into develop 2014-08-14 14:47:50 +02:00
Marc Alexander
ad625c1e6d Merge pull request #2876 from PayBas/ticket/12900
[ticket/12900] Fix potential avatar size box overflow
2014-08-14 14:47:20 +02:00
PayBas
27bb2b7289 [ticket/12961] Change url to anti-spam-ext
As per IRC suggestion

PHPBB3-12961
2014-08-14 10:03:41 +02:00
PayBas
d08a7f70e6 [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/
PHPBB3-12961
2014-08-14 10:03:35 +02:00
Callum Macrae
9c87972385 [ticket/12982] Refactoring: Cleaned up crazy insert users stuff
PHPBB3-12982
2014-08-14 00:19:34 +01:00
Callum Macrae
9e3db526d5 [ticket/12982] Refactoring: Cleaned up forum_fn.js
PHPBB3-12982
2014-08-14 00:04:16 +01:00
Callum Macrae
9578fdf7d7 [ticket/12982] Refactoring: Cleaned up phpbb.search
PHPBB3-12982
2014-08-13 23:18:50 +01:00
Cesar G
baa9f17f7c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12856] Remove images from assets/plupload/img/
  [ticket/12856] Copy plupload images to prosilver dir
2014-08-13 15:01:06 -07:00
Cesar G
26b8c6cc13 Merge remote-tracking branch 'PayBas/ticket/12856' into develop-ascraeus
* PayBas/ticket/12856:
  [ticket/12856] Remove images from assets/plupload/img/
  [ticket/12856] Copy plupload images to prosilver dir
2014-08-13 15:00:48 -07:00
Callum Macrae
d79fec1c3f [ticket/12982] Refactoring: made JS in adm nice
PHPBB3-12982
2014-08-13 22:53:28 +01:00
Callum Macrae
340f48fdeb [ticket/12982] Refactoring: made most JS nice.
PHPBB3-12982
2014-08-13 22:44:21 +01:00
PayBas
5cf9ab8a97 [ticket/12856] Remove images from assets/plupload/img/
PHPBB3-12856
2014-08-13 23:20:43 +02:00
PayBas
9db2ff7186 [ticket/12856] Copy plupload images to prosilver dir
PHPBB3-12856
2014-08-13 16:37:44 +02:00
PayBas
030d1a683b [ticket/12900] Fix potential avatar size box overflow
PHPBB3-12900
2014-08-13 16:23:20 +02:00
PayBas
55260127bd [ticket/12961] Add link in anti-spam ACP page to titania
PHPBB3-12961
2014-08-13 15:39:03 +02:00
Tristan Darricau
e31aafb393 [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
PHPBB3-12975
2014-08-12 23:12:57 +02:00
Dhruv
2302bc2473 Merge branch 'develop-ascraeus' into develop
# By Callum Macrae
# Via Callum Macrae (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12951] Made editorconfig file comments better
  [ticket/12951] Added editorconfig
2014-08-12 16:17:24 +02:00
Dhruv Goel
1dc2d0e759 Merge pull request #2853 from callumacrae/ticket/12951
[ticket/12951] Added editorconfig
2014-08-12 16:15:47 +02:00
Tristan Darricau
cf0356f71a Merge pull request #2871 from nickvergessen/ticket/12974
[ticket/12974] Update nightly build version to 3.2.0-a1-dev

* nickvergessen/ticket/12974:
  [ticket/12974] Update nightly build version to 3.2.0-a1-dev
2014-08-12 10:59:47 +02:00
Joas Schilling
7faf66c492 [ticket/12974] Update nightly build version to 3.2.0-a1-dev
PHPBB3-12974
2014-08-12 10:56:20 +02:00
Joas Schilling
483b40dfa3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3

Conflicts:
	phpBB/styles/subsilver2/style.cfg
2014-08-12 10:17:47 +02:00
Joas Schilling
e47b7540c3 Merge branch 'prep-release-3.1.0-RC3' into develop-ascraeus
* prep-release-3.1.0-RC3:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
2014-08-12 10:16:38 +02:00
Joas Schilling
3be239b864 [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development 2014-08-12 10:15:42 +02:00
Tristan Darricau
a60d4b2507 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12970] Regenerate schema.json with new dependencies
2014-08-11 19:26:37 +02:00
Nils Adermann
24dc0a66eb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12822] Correctly call \phpbb\user in avatar manager test
2014-08-11 18:13:57 +02:00
Nils Adermann
837ed8b6e1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
2014-08-11 17:38:29 +02:00
Marc Alexander
f09db1a7b4 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/config/services.yml
2014-08-11 12:23:21 +02:00
Marc Alexander
7b35bd3e7c Merge branch 'develop-ascraeus' into develop 2014-08-11 07:38:22 +02:00
Marc Alexander
6f804018d0 Merge branch 'develop-ascraeus' into develop 2014-08-11 07:32:27 +02:00
Marc Alexander
8f1b261500 Merge branch 'develop-ascraeus' into develop 2014-08-11 07:28:59 +02:00
Michael Miday
ada35dca00 [ticket/12862] Remove remaining simple-wrap id
PHPBB3-12862
2014-08-11 00:55:26 +02:00
brunoais
67de119566 [ticket/12930] Adding more variables to the event
More variables, according to comments, were added to the event.

PHPBB3-12930
2014-08-10 18:59:57 +01:00
brunoais
1e1efa294e [ticket/12929] Adding more variables to event.
More variables added that may be useful to events at this stage.

PHPBB3-12929
2014-08-10 18:51:35 +01:00
Dhruv
d86411b38a Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12964] Correct use of undefined $row variable.
2014-08-10 18:38:08 +02:00
Marc Alexander
06be2ff67d Merge branch 'develop-ascraeus' into develop 2014-08-10 18:07:11 +02:00
Marc Alexander
db9bf6da33 Merge branch 'develop-ascraeus' into develop 2014-08-10 17:00:41 +02:00
Marc Alexander
752c73193e [ticket/12966] Sort posts by post_id in addition to sorting by post_time
This should make sure that posts with the same post time are properly sorted
on database backends like postgres.

PHPBB3-12966
2014-08-10 16:49:01 +02:00
Callum Macrae
7df97601a3 [ticket/12951] Made editorconfig file comments better
PHPBB3-12951
2014-08-10 15:55:02 +02:00
Joas Schilling
d998efcf54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
2014-08-10 15:24:43 +02:00
Dhruv
58a863dbad Merge branch 'develop-ascraeus' into develop
# By omniError
# Via Dhruv Goel (1) and omniError (1)
* develop-ascraeus:
  [ticket/12831] fix CS
  [ticket/12831] simplified code, upd event block
  [ticket/12831] reimplemented headers as array
  [ticket/12831] Optn to prevent setting HTTP headers
2014-08-10 15:06:45 +02:00
Carlo
51f534c82e [ticket/12765] Execute query directly from db tools
PHPBB3-12765
2014-08-10 14:26:12 +02:00
Carlo
03040de75a [ticket/12765] Use db_tools instead of generating queries at moment
PHPBB3-12765
2014-08-10 14:26:10 +02:00
Andreas Fischer
0be6d17ae1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12956] Ensure the contact columns have been added before using them
2014-08-10 14:16:01 +02:00
Nils Adermann
f067aa92eb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12950] Force the installer to use language=en
2014-08-10 14:00:09 +02:00
Joas Schilling
bf25e31735 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12794] Properly validate google+ field against valid character set
2014-08-10 13:39:04 +02:00
Joas Schilling
489aba31c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
2014-08-10 13:35:37 +02:00
Joas Schilling
9572cc0ccc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12943] Add core.phpbb_generate_debug_output core event
2014-08-10 13:23:15 +02:00
Joas Schilling
3432257c1c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12953] Page title not updated when notifications are marked as read
2014-08-10 13:16:15 +02:00
Cesar G
4056b84f60 Merge remote-tracking branch 'nickvergessen/ticket/12958' into develop
* nickvergessen/ticket/12958:
  [ticket/12958] Remove more references of subsilver2
  [ticket/12958] Remove subsilver2 for phpBB 3.2
2014-08-10 13:08:15 +02:00
Joas Schilling
9e0c234979 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
2014-08-10 12:22:35 +02:00
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2
PHPBB3-12958
2014-08-10 12:17:03 +02:00
Joas Schilling
8c40574049 [ticket/12958] Remove subsilver2 for phpBB 3.2
PHPBB3-12958
2014-08-10 12:05:28 +02:00
Nils Adermann
43bef1b5e4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8064] Change the collation of topic_first_poster_name
2014-08-10 11:55:08 +02:00
Marc Alexander
3450b793e7 Merge pull request #2859 from Nicofuma/ticket/12957
[ticket/12957] Update the constructions of the template engine
2014-08-10 10:23:28 +02:00
Tristan Darricau
143c1ba8d1 [ticket/12957] Removed unused use
PHPBB3-12957
2014-08-10 04:01:47 +02:00
Tristan Darricau
e7e6d45789 [ticket/12957] Update the constructions of the template engine
PHPBB3-12957
2014-08-10 03:32:27 +02:00
Dhruv
ab2878b37b Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12949] Check if mime_content_type is actually callable
2014-08-10 01:30:58 +02:00
Tristan Darricau
59b5ab4866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
2014-08-10 01:02:38 +02:00
Tristan Darricau
1c98b46625 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11528] Revert Mink changes
2014-08-10 00:56:30 +02:00
Tristan Darricau
761f5a771d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12954] Correctly setup PATH_INFO on Travis CI.
2014-08-10 00:13:55 +02:00
Dhruv
e12969d2c7 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12742] Add sorting back to bookmark notification list of users
  [ticket/12742] Add sort options for notification types requiring sorting
  [ticket/12742] Remove unneeded sort of users
  [ticket/12742] Replace authenticated with authorised
  [ticket/12742] Add check for empty $users and add method to fitting methods
  [ticket/12742] Add method for getting authenticated recipients
2014-08-09 20:03:17 +02:00
brunoais
602b932a23 [ticket/12928] Update to RC4
PHPBB3-12928
2014-08-09 18:18:19 +01:00
brunoais
9f5d383d50 [ticket/12930] Update to RC4
PHPBB3-12930
2014-08-09 18:14:11 +01:00
brunoais
8880871951 [ticket/12929] Update to RC4
PHPBB3-12929
2014-08-09 18:13:10 +01:00
Marc Alexander
026a1fc3dd Merge branch 'develop-ascraeus' into develop 2014-08-09 18:47:59 +02:00
Tristan Darricau
04c084ead8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
2014-08-09 17:50:54 +02:00
Callum Macrae
07f8edcc26 [ticket/12951] Added editorconfig
PHPBB3-12951
2014-08-09 17:33:23 +02:00
Nils Adermann
f33be87d03 Merge remote-tracking branch 'github-nicofuma/ticket/11649' into develop
* github-nicofuma/ticket/11649:
  [ticket/11649] Fix coding style
  [ticket/11649] Expose Twig through the container
2014-08-09 17:17:57 +02:00
Tristan Darricau
827510a418 [ticket/11649] Fix coding style
PHPBB3-11649
2014-08-09 16:14:58 +02:00
Tristan Darricau
192b8e2568 [ticket/11649] Expose Twig through the container
PHPBB3-11649
2014-08-09 16:13:22 +02:00
Nils Adermann
73bd77809e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12693] Don't try to check the composer.phar file
2014-08-09 16:11:44 +02:00
Nils Adermann
1f7ada8e3d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
2014-08-09 15:41:01 +02:00
Nils Adermann
19746b8fc2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12693] Fix composer.phar path
  [ticket/12693] The files skipped list can not be empty
  [ticket/12693] Force the composer.phar to be executable
  [ticket/12693] All the files in bin/ must be executable
  [ticket/12693] Expand manually the wildcard
  [ticket/12693] Fix the query for bin/*
  [ticket/12693] Extract exceptions, bin/* must be executable
  [ticket/12693] Remove the executable bit on icon_print.gif
  [ticket/12693] Check the persmissions of the owner
  [ticket/12693] Check if the are executable and not if they are 644
  [ticket/12693] Fix the permissions
  [ticket/12693] Check if the files have the right 644
  [ticket/12693] Fix indentation
  [ticket/12693] Add a travis test that checks file permissions
2014-08-09 15:19:37 +02:00
Marc Alexander
4840584cd6 Merge branch 'develop-ascraeus' into develop 2014-08-09 13:06:01 +02:00
Dhruv
9d8398d41b Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12940] Remove unused use statements.
2014-08-09 13:04:32 +02:00
brunoais
468f92261a [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
Adding the core.ucp_pm_compose_compose_pm_basic_info_query_before
event to mcp backend.

PHPBB3-12929
2014-08-09 11:18:45 +01:00
Joas Schilling
d497104671 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
2014-08-09 11:44:18 +02:00
Marc Alexander
44295bae74 Merge branch 'develop-ascraeus' into develop 2014-08-09 01:47:13 +02:00
Nils Adermann
7b8b8d0417 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12937] Do not return false. Return null for get and array() for all.
2014-08-08 17:23:16 +02:00
brunoais
6fafa40d93 [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
Adding the core.ucp_pm_compose_compose_pm_quotepost_query_after
event to ucp backend.

PHPBB3-12930
2014-08-08 16:20:51 +01:00
Andreas Fischer
28d95a7d7e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12886] Remove obsolete check for f_user_lock
2014-08-08 16:11:47 +02:00
Joas Schilling
a291825685 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12738] Pass $this->config in content_visibility constructor
2014-08-08 16:06:08 +02:00
Andreas Fischer
eeb80d2ec5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
2014-08-08 16:03:25 +02:00
Andreas Fischer
3c79287c0b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12778] Rename the file to *.bak instead of deleting
  [ticket/12778] Automatically delete files on update
2014-08-08 16:01:43 +02:00
Nils Adermann
6bfadd86ed Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12789] Move duplicated functions to the base class
  [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()

Conflicts:
	phpBB/phpbb/cache/driver/file.php
	phpBB/phpbb/cache/driver/memory.php
2014-08-08 15:06:46 +02:00
Joas Schilling
55c21834ad Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:55 +02:00
Joas Schilling
4e66d7bdd9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
2014-08-08 14:36:10 +02:00
Joas Schilling
b7f4d98cf2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
2014-08-08 14:33:11 +02:00
brunoais
621f940805 [ticket/12928] core.mcp_reports_gather_query_before
Adding the core.mcp_reports_gather_query_before
event to mcp backend.

PHPBB3-12928
2014-08-08 13:10:59 +01:00
Cesar G
254b720070 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12535] Combine inner clearing CSS rules
  [ticket/12535] Update events.md to RC3
  [ticket/12535] Add events to subsilver2
  [ticket/12535] Make <a> adjust to the image width
2014-08-08 13:47:25 +02:00
Cesar G
8a96269004 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12744] Fix additional height of one line in header in rtl languages
2014-08-08 13:43:51 +02:00
Marc Alexander
3cac5b5052 Merge branch 'develop-ascraeus' into develop 2014-08-07 23:38:03 +02:00
Andreas Fischer
f073f39333 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12922] Subsilver2 fix
  [ticket/12922] Posts per page in MCP should have a min value of zero
2014-08-07 18:23:46 +02:00
Dhruv
5402834ccf Merge branch 'develop-ascraeus' into develop
# By jeroendedauw
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version
2014-08-07 18:02:20 +02:00
Marc Alexander
bfae68583a Merge branch 'develop-ascraeus' into develop 2014-08-07 17:36:52 +02:00
PayBas
802232c907 [ticket/12506] Fix search result h3 margin
There are no buttons present, so don't need to do all this stuff.

PHPBB3-12506
2014-08-07 17:13:22 +02:00
PayBas
3522808528 [ticket/12506] Fix responsive profile min-height (no avatar)
PHPBB3-12506
2014-08-07 17:13:20 +02:00
PayBas
09e45fee89 [ticket/12506] Reposition buttons to make room for "online" banner
PHPBB3-12506
2014-08-07 17:13:18 +02:00
PayBas
64dfb3fba9 [ticket/12506] Reposition post-buttons for compact layout
PHPBB3-12506
2014-08-07 17:13:17 +02:00
Joas Schilling
39a99df080 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12873] Add migration to rename the index
  [ticket/12873] Don not touch the existing migrations
  [ticket/12873] Test the good identifier in \phpbb\db\tools
2014-08-07 16:51:04 +02:00
Tristan Darricau
8f1be5e741 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
2014-08-07 16:46:31 +02:00
Nils Adermann
816042bd8d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html
2014-08-07 16:26:01 +02:00
Joas Schilling
9925733350 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
2014-08-07 16:24:48 +02:00
Cesar G
9a0451889c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12832] Remove old .quick-links icon reference
  [ticket/12832] Remove unnecessary attr and classes
  [ticket/12832] Add footer links to quick-links
  [ticket/12832] Make .small-icon styling uniform
2014-08-07 16:21:02 +02:00
Joas Schilling
05b290c6b2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html
2014-08-07 16:13:46 +02:00
Joas Schilling
6e3c1eb72a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12920] Add missing comma
  [ticket/12920] Update composer.lock file after update nothing
  [ticket/12920] Fix sh syntax error in post-update-cmd script
  [ticket/12920] Remove incorrect @ from self.version reference in composer.json
  [ticket/12920] Output warning message about vendor cleaning target
  [ticket/12920] Turn phpBB composer.json into publishable full version
  [ticket/12920] Add require for minimum php version
  [ticket/12920] Add composer.json for phpbb/phpbb-core library
2014-08-07 16:09:59 +02:00
Joas Schilling
93124cbe58 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12918] Load class fileupload in fileupload_remote_test.php.
2014-08-07 15:29:46 +02:00
Marc Alexander
d1cd81785e Merge branch 'develop-ascraeus' into develop 2014-08-07 15:09:42 +02:00
Andreas Fischer
d8338ded47 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12917] Check commit message and image ICC profile on 5.3.3
2014-08-07 14:31:04 +02:00
Joas Schilling
3722aac495 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12847] Allow the extensions to say if they can be enabled
2014-08-07 13:00:21 +02:00
Joas Schilling
28224bad70 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12557] Fix load active module description
  [ticket/12557] Fix php file description
  [ticket/12557] Fix post data description for notifications
  [ticket/12557] Fix pass by reference doc blocks
  [ticket/12557] Fix doc block in extension base class
  [ticket/12557] Fix doc block in mimetype guesser
  [ticket/12557] Fix var $preserve_cr description
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Template fixes
  [ticket/12557] Search, cron and profilefields fixes
  [ticket/12557] Notification fixes
  [ticket/12557] Fix doc block errors found by Sami pt1
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
2014-08-07 12:44:10 +02:00
Joas Schilling
f8046cc253 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12051] Optimise Composer Autoloader on Build
2014-08-07 12:30:55 +02:00
Joas Schilling
58d1dcc7f2 Merge pull request #2637 from Nicofuma/ticket/12387
[ticket/12387] Cleanup *_free_result call and remove @ on that call

* Nicofuma/ticket/12387:
  [ticket/12387] Fix a call to sql_freeresult in full_text_native
  [ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult
  [ticket/12387] Use the hash as query_id for caching
  [ticket/12387] Remove unnecessary checks
  [ticket/12387] mssql_query return true if a select query returns 0 row
  [ticket/12387] Cleanup *_free_result call and remove @ on that call
2014-08-07 12:09:01 +02:00
Nils Adermann
89a6fed91d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11148] Remove unneeded variable mimetype and use type octet-stream
  [ticket/11148] Change expected output with disallowed content in test
  [ticket/11148] Always use the output of the mimetype guesser in get_mimetype
  [ticket/11148] Get rid of extra line in mimetype guesser setter doc block
  [ticket/11148] Add missing parts to docblock of get_mimetype() method
  [ticket/11148] Default to application/octet-stream if no mimetype given
  [ticket/11148] Use mimetype guesser for uploaded avatars
  [ticket/11148] Pass mimetype guesser to upload_attachment() function
  [ticket/11148] Add mimetype guesser to filespec and fileupload class
2014-08-07 12:06:49 +02:00
Joas Schilling
57f9a96f4b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12836] Add event core.functions.redirect
2014-08-07 11:47:44 +02:00
Marc Alexander
3e52126446 Merge branch 'develop-ascraeus' into develop 2014-08-06 23:42:35 +02:00
Marc Alexander
e49de53115 Merge branch 'develop-ascraeus' into develop 2014-08-06 23:38:28 +02:00
Joas Schilling
cadf4dd56a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12912] Undefined index when adding logs from extensions
2014-08-06 23:36:11 +02:00
Joas Schilling
61bc6c4c67 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12910] Set get_name for Google+ fields
2014-08-06 23:28:10 +02:00
Joas Schilling
ae4069acbd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12913] Add more parameters to core.submit_post_end event
2014-08-06 23:15:39 +02:00
Andreas Fischer
0c4760bf6d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12906] Add rel="help" to FAQ link
2014-08-03 19:51:24 +02:00
Andreas Fischer
05e54d1ebb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12909] Use correct lang vars in cli extension enable
2014-08-03 17:52:24 +02:00
Andreas Fischer
a70f4e173c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12908] Fix operator typo in increment.php
2014-08-03 17:52:00 +02:00
Joas Schilling
dd86615c63 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12895] Rename user style setting to resolve conflict with style param
2014-08-02 13:56:30 +02:00
Joas Schilling
e0f5a37d81 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12902] Remove duplicate entry in switch statement
2014-08-02 13:46:22 +02:00
Marc Alexander
69682372bb Merge branch 'develop-ascraeus' into develop 2014-08-01 23:31:55 +02:00
Marc Alexander
fab25164a0 Merge branch 'develop-ascraeus' into develop 2014-08-01 23:28:30 +02:00
Joas Schilling
76dbe95afc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11480] Header file
  [ticket/11480] Fix unit tests
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
2014-08-01 22:24:06 +02:00
Marc Alexander
589cf73202 Merge branch 'develop-ascraeus' into develop 2014-07-31 21:40:37 +02:00
Joas Schilling
b9bb22e009 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12882] Use a new migration
  [ticket/12882] Update search_type when it's not prefixed by phpbb_search
2014-07-31 14:03:31 +02:00
hanakin
913b363126 [ticket/12862] Resize popups consistently
PHPBB3-12862
2014-07-30 17:48:23 +02:00
Joas Schilling
c068da7353 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12492] Add support of special chars
2014-07-30 15:01:27 +02:00
hanakin
d6c772f15c [ticket/12862] Add Border
PHPBB3-12862
2014-07-29 18:40:30 +02:00
Andreas Fischer
7d4b019266 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12870] Add doc block
  [ticket/12870] Create the migrations table with a method in the migrator
  [ticket/12870] Add $config['version'] in phpbb_extension_manager_test
  [ticket/12870] Create the migrations table in db:migrate
2014-07-28 18:13:44 +02:00
Marc Alexander
1095086cde Merge branch 'develop-ascraeus' into develop 2014-07-28 16:45:21 +02:00
Marc Alexander
db80091a66 Merge branch 'develop-ascraeus' into develop 2014-07-28 16:33:06 +02:00
Andreas Fischer
26ddd5a7fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12656] Fix typo for "purged extension"
  [ticket/12656] Fix syntax in language file
  [ticket/12656] Fix typo
  [ticket/12656] Use utf8 ’ instead of escaping '
  [ticket/12656] Use lang keys for all CLI strings
  [ticket/12656] Use lang keys for CLI command descriptions
2014-07-28 14:45:34 +02:00
Joas Schilling
577186db7a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12793] Tests (added and changed)
  [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw
  [ticket/12793] String '0' does not display for string profile fields
2014-07-27 20:12:13 +02:00
Joas Schilling
b9b0c14855 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12791] Changed the if check
  [ticket/12791] String profile fields do not use links ...
2014-07-27 20:08:08 +02:00
Joas Schilling
82d9803aa8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12843] Fix Mark forums read browser console error
2014-07-27 19:51:47 +02:00
Joas Schilling
09d00afcc3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12884] Add core event to the function upload_attachment()
2014-07-27 19:45:12 +02:00
Joas Schilling
fdb756e633 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12896] Add php event for admin notices
2014-07-27 19:42:10 +02:00
Andreas Fischer
2de19d1cef Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12883] Remove pointless comments
  [ticket/12883] Do not use basename() to get the search class in tidy_search
2014-07-26 22:52:08 +02:00
Andreas Fischer
d4eec54686 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12881] Checks earlier if server-side topic marking is enabled
2014-07-26 22:50:07 +02:00
Tristan Darricau
af0c9d7a68 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop
2014-07-25 18:35:12 +02:00
Dhruv
f93559d013 Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12887] Fix Typo: offest -> offset
2014-07-24 19:03:20 +05:30
Marc Alexander
8f8605cee7 Merge branch 'develop-ascraeus' into develop 2014-07-24 11:01:14 +02:00
Andreas Fischer
f1890fe8e9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12851] Fix the Font colour button title
2014-07-23 01:12:18 +02:00
Dhruv
25c646cbf9 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12560] Add methods to set upload and temp paths in plupload
2014-07-22 22:44:22 +05:30
Joas Schilling
cf88a6453c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
2014-07-21 22:40:55 +02:00
Tristan Darricau
f27102b454 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12861] Add event to modify the post, poster and attachment data
2014-07-21 20:49:02 +02:00
Dhruv
99cbfcb16d Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12656] Pass user object into all console commands.
2014-07-22 00:15:20 +05:30
Dhruv
b30bd79f72 Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12448] Fix null columns for MS SQL
  [ticket/12448] Fix null columns for postgres
  [ticket/12448] Allow null as default value for columns
2014-07-22 00:11:32 +05:30
Marc Alexander
5f1dd968ac Merge branch 'develop-ascraeus' into develop 2014-07-20 18:45:09 +02:00
Andreas Fischer
d78dc0119e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12748] Fix typo in terms of use
2014-07-18 22:58:02 +02:00
Andreas Fischer
88a8176d3a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12663] Have cli.php language file at top level; unrelated to ACP.
  [ticket/12663] Extract CLI language string into their own file
2014-07-18 00:57:53 +02:00
Andreas Fischer
faabf7787f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12814] Replace email type with text type
2014-07-18 00:54:22 +02:00
Oliver Schramm
bef207e9b7 [ticket/10729] Update *_delete_user when user being deleted
PHPBB3-10729
2014-07-18 00:19:21 +02:00
Oliver Schramm
1e0775a3da Merge branch 'ticket/10729' into ticket/10729-2
Conflicts:
	phpBB/includes/functions_user.php
2014-07-18 00:17:20 +02:00
Oliver Schramm
da6b378e64 [ticket/10729] Update message_edit_user when user being deleted
PHPBB3-10729
2014-07-18 00:11:51 +02:00
Oliver Schramm
53f597b6d0 [ticket/10729] Update post_edit_user when user being deleted
PHPBB3-10729
2014-07-17 16:28:32 +02:00
Tristan Darricau
d6d02188ad Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12685] Setup class loader for extensions only if not in safe mode
  [ticket/12685] Replace getParameterOption with hasParameterOption
  [ticket/12685] Do not dump container
  [ticket/12685] Override getDefaultInputDefinition()
  [ticket/12685] Removed unused USE statement
  [ticket/12685] Inject console.command_collection instead of the container
  [ticket/12685] Add a new line
  [ticket/12685] Container is dumped by default
  [ticket/12685] Removed spaces
  [ticket/12685] Add --safe-mode
  [ticket/12685] We need extensions enabled
  [ticket/12685] Add space after foreach
  [ticket/12685] Add console collection and fixing CLI
2014-07-17 16:07:42 +02:00
Joas Schilling
5dd8a759be Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12860] Fix typo
  [ticket/12860] Add template events mcp_ban_unban
  [ticket/12860] Add template events mcp_ban_fields
2014-07-17 15:31:26 +02:00
Joas Schilling
304e459878 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12853] Change navbar ACP from skip- to last-responsive
2014-07-16 22:08:10 +02:00
Joas Schilling
44a9876c17 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12845] Remove invalid ARIA role for breadcrumbs
2014-07-16 21:57:17 +02:00
Joas Schilling
ec4886a266 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12837] Use else if instead of elseif
  [ticket/12837] Detect "viewing contact admin page" on viewonline
2014-07-16 21:54:17 +02:00
Joas Schilling
b0c307b772 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
2014-07-16 21:51:36 +02:00
Joas Schilling
ab237e16d3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12828] Add ucp_prefs.php common core event
2014-07-16 16:18:01 +02:00
Andreas Fischer
29cd7f8aec Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12854] Don't show contact page link if board emails are disabled
2014-07-15 23:19:52 +02:00
Andreas Fischer
06386990d1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
2014-07-15 23:10:54 +02:00
Andreas Fischer
a6ce8ed7df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12846] SQLite3 bug in profilefield_base_migration.php
2014-07-14 19:45:43 +02:00
Andreas Fischer
bc6f92dc15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12849] Fixed possible ReferenceError in core.js.
2014-07-14 19:27:28 +02:00
Andreas Fischer
1331f66fa8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12844] Don't clear $dbpasswd early in connection manager
2014-07-13 01:17:56 +02:00
Joas Schilling
0bc618ddc5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12842] Skip parameters without exlicit type
2014-07-12 17:30:50 +02:00
Joas Schilling
9c1ca732db Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
  [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Prepare Changelog
  [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
2014-07-11 17:24:00 +02:00
Tristan Darricau
b8c10dcdec Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12839] Include update related templates and assets in the package
2014-07-11 15:54:02 +02:00
Andreas Fischer
62322698ae Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12768] More fixes in language files
  [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
2014-07-11 12:11:14 +02:00
Andreas Fischer
9cd327e127 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12120] Remove imkingdavid from active authors
2014-07-11 12:03:12 +02:00
Andreas Fischer
d5958875c5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12818] Use assertGreaterThanOrEqual in the tests
  [ticket/12818] Don't use the id for i=
  [ticket/12818] Add tests
  [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
2014-07-11 11:53:38 +02:00
Andreas Fischer
a616cf383e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (34 commits)
  [ticket/12775] Set dbal.conn.driver as synthetic during installation
  [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
  [ticket/12775] Inject the connection when created in the container
  [ticket/12775] Extract the vars later in install/install_update.php
  [ticket/12775] Rename config_php_handler to config_php_file container_builder
  [ticket/12775] Set defined_vars as a property of config_php_file
  [ticket/12775] Fix doc blocks in the container builder
  [ticket/12775] Remove useless includes of config.php
  [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
  [ticket/12775] Fix comments
  [ticket/12775] Update doc blocks
  [ticket/12775] Fix container_builder
  [ticket/12775] Rename config_php to config_php_file
  [ticket/12775] Renamed to \phpbb\di\container_builder
  [ticket/12775] Remove the last include of functions_container
  [ticket/12775] Fix unit tests
  [ticket/12775] Add tests for \phpbb\config_php
  [ticket/12775] Add tests for the container factory
  [ticket/12775] Use a field instead of a local var in load_config_var()
  [ticket/12775] Update container and config in install/
  ...
2014-07-11 11:49:51 +02:00
Andreas Fischer
9149b3023d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12829] Remove check for pgsql 8.3/8.2
2014-07-11 10:17:03 +02:00
Tristan Darricau
657fc069e8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
2014-07-10 15:28:07 +02:00
Joas Schilling
b0d8f0edac Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12786] Correcting some tabs
  [ticket/12786] Array_merge instead copy array parts
  [ticket/12786] Some changes of the comments.
  [ticket/12786] Dixing a typo
  [ticket/12786] Some minor fixes of comments and function naming
  [ticket/12786] Add clean_cpf_db_entries
  [ticket/12786] White spaces found
  [ticket/12786] Add create_language_entries
  [ticket/12786] Add get_custom_field_id
  [ticket/12786] Extend profilefield_base_migration.php class
2014-07-09 17:00:50 +02:00
Marc Alexander
3bd5214b5d Merge branch 'develop-ascraeus' into develop 2014-07-08 18:49:03 +02:00
Joas Schilling
167c465dd2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12787] Updates phpbb_mock_controller_helper
  [ticket/12787] Add controller_helper::get_current_url()
  [ticket/12787] Remove one app.php when it's both in $path and $web_root_path
  [ticket/12787] Fix the absolute board url
  [ticket/12787] Use a parameter (_referer) instead of the Referer header
  [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()
  [ticket/12099] Remove config again
  [ticket/12099] Correctly fix the path when performing AJAX requests
  [ticket/12099] Add request argument to path_helper service
2014-07-08 18:10:01 +02:00
Marc Alexander
b3d2898d01 Merge branch 'develop-ascraeus' into develop 2014-07-08 15:59:54 +02:00
Tristan Darricau
f8fe437f49 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12812] Remove unused global $db from tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Add a migrator tool for config_text database changes
2014-07-08 00:55:05 +02:00
Tristan Darricau
d5f693c9fd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12802] Properly handle connection failures in SQLite3
2014-07-07 22:10:04 +02:00
Joas Schilling
85d241218e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12825] Better sniff for the extensions and skip the vendor/ directory
2014-07-07 21:05:27 +02:00
Joas Schilling
5a503f0cb6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12824] Move MCP/ACP links after navigation_append event
2014-07-07 20:46:58 +02:00
Joas Schilling
c4f5b46f4a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12827] Reorder quick-links
2014-07-07 20:38:58 +02:00
Joas Schilling
212606a0bb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12830] Remove double .postlink in colours.css
2014-07-07 20:33:45 +02:00
Joas Schilling
56a89fe0a2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12782] Add doc block
  [ticket/12782] Use an interface for the phpbb event_dispatcher
2014-07-07 20:23:19 +02:00
Tristan Darricau
7118f84d29 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12197] Fix several misleading FAQ entries
2014-07-07 19:13:13 +02:00
Cesar G
1a6ccd0f1f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12813] Move inline-CSS to css file
  [ticket/12813] Use -moz-only fix instead of generic padding
  [ticket/12813] Reorder .row pagination so it aligns better
  [ticket/12813] Fix page-jump title lang and use input type=number
  [ticket/12811] Responsive adjustments to margin changes
  [ticket/12811] Fix padding/margin bug affecting bottom layout
2014-07-07 01:34:05 -07:00
Andreas Fischer
a804c2b107 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12816] Fix comment about logs in user_ban function
2014-07-07 00:20:28 +02:00
Andreas Fischer
0dbf91cf63 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12788] Force 2.3.* on symfony dependencies
  [ticket/12788] Update symfony components
2014-07-07 00:02:11 +02:00
Andreas Fischer
8bd4b090e1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12823] Remove all trailing whitespace
2014-07-06 23:46:25 +02:00
Tristan Darricau
e6f4c65573 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12515] Remove check for PostgreSQL 8.3+
2014-07-06 20:15:45 +02:00
Tristan Darricau
4202f80891 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12810] Use correct template vars for shadow pruning settings
2014-07-06 18:17:00 +02:00
Marc Alexander
0fc5ba0eb4 Merge branch 'develop-ascraeus' into develop 2014-07-06 17:59:37 +02:00
Cesar G
d35c5d1d39 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12808] Fix small gap between username and drop-down arrow
2014-07-06 06:15:15 -07:00
Cesar G
1829b13e68 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12815] Remove S_REGISTERED_USER for team link
  [ticket/12815] Show memberlist link for guests (if permitted)
2014-07-06 06:04:27 -07:00
Nils Adermann
e97fab49e2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:36 +02:00
Joas Schilling
4558262e2a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12013] Fix functional tests and sniffer issue.
  [ticket/12013] Clear the jumpbox.
  [ticket/12013] Add moderator tools icon.
  [ticket/12013] Remove obsolete jumpbox and quickmod CSS.
  [ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
  [ticket/12013] Update to use the new .button class.
  [ticket/12013] Add missing class to place the buttons on the rightside.
  [ticket/12013] Use the correct variable for the forum id.
  [ticket/12013] Use DEFINE instead of Twig's set.
  [ticket/12013] Use path helper.
  [ticket/12013] Use new dropdown for quickmod tools and jumpbox.
2014-07-04 13:32:10 +02:00
Cesar G
4b49b3dcf3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (36 commits)
  [ticket/12662] Hide quick-links when empty
  [ticket/12662] Fix white-space issue to make dropdowns uniform
  [ticket/12735] Remove unnecessary span
  [ticket/12735] Fix line breaks
  [ticket/12732] Undo search-box change
  [ticket/12735] Fix some color incosistencies
  [ticket/12735] Remove underlines by default
  [ticket/12735] Undo selector rename
  [ticket/12735] Remove all :link, :visited, :active states
  [ticket/12662] Remove last remaining linklist outside navbars
  [ticket/12662] Use data-last-responsive attr instead of hardcoded list
  [ticket/12662] Remove <li> container from logged_out_content event
  [ticket/12662] Username <span> fix for list columns
  [ticket/12662] Fix notifications dropdown positioning for RTL
  [ticket/12662] Update tests that utilize get_username_string
  [ticket/12662] Update subsilver2 index template event names
  [ticket/12662] Update events docs from b5 to rc1/rc2
  [ticket/12662] Move dropdown container from <li> to new inner div
  [ticket/12662] Remove linklist container and update template events
  [ticket/12662] Add span containers to all usernames for consistency
  ...
2014-07-03 23:04:08 -07:00
Nils Adermann
9d9fdb0c11 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12562] Use border for all sizes except responsive
  [ticket/12562] Use Hanakin's version
  [ticket/12562] Increase mq trigger screen size to hide border
  [ticket/12562] Add max-width to proSilver
2014-07-03 15:58:33 +02:00
Tristan Darricau
05bd866cb3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12783] Move phpbb requirement to extra->soft-require
  [ticket/12783] Correctly use dataProviders and mark tests as incomplete
  [ticket/12783] Move phpbb/phpbb require version to extra
2014-07-03 14:24:47 +02:00
Joas Schilling
df38b2829a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12781] Add tests
  [ticket/12781] Template regex for IF catch too many things
2014-07-03 12:47:30 +02:00
Joas Schilling
492c0d890e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/9801] Use empty instead of sizeof
  [ticket/9801] Remove spaces before * in docblock
  [ticket/9801] Add viewonline_helper service to allow proper testing
  [ticket/9801] Allow display of page outside board directory on viewonline
2014-07-03 12:02:55 +02:00
Joas Schilling
9cf90d1a84 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12784] Shearch the "vendor" folders and then the autoload.php files
  [ticket/12784] Allow the extensions to add a custom auto loader
2014-07-03 11:58:10 +02:00
Joas Schilling
db31866cbb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12334] Remove profile fields test group
  [ticket/12334] Add additional test for type_string
  [ticket/12334] Add string test for type_int
  [ticket/12334] Improve type_dropdown's test description
  [ticket/12334] Group profile fields test
  [ticket/12334] Change get_profile_value_raw_data to profile_value_raw_data
  [ticket/12334] Add get_profile_value_raw unit test for type_bool
  [ticket/12334] Add get_profile_value_raw unit test for type_date
  [ticket/12334] Add get_profile_value_raw unit tests for type_dropdown
  [ticket/12334] Add get_profile_value_raw unit test for type_string
  [ticket/12334] Add get_profile_value_raw unit test for type_url
  [ticket/12334] Add get_profile_value_raw unit tests for type_int
  [ticket/12334] Removed tests
  [ticket/12334] Dropdowns cannot be tested this way
  [ticket/12334] Added test get_profile_value_raw
  [ticket/12334] Changed from valueid to value_raw
  [ticket/12334] Implemented get_profile_valueid method
  [ticket/12334] Added field_novalue fall-back as requested
  [ticket/12334] Add PROFILE_FIELD_VALUEID template var
2014-07-03 11:22:29 +02:00
Cesar G
fb75856eaa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 links
2014-07-02 16:46:58 -07:00
Tristan Darricau
1b0aceee48 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12120] Add nicofuma to the developers
2014-07-02 22:56:03 +02:00
Joas Schilling
4487b6f4c8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics
2014-07-01 20:48:06 +02:00
Dhruv
a99725d27c Merge branch 'develop-ascraeus' into develop
# By Oliver Schramm
# Via Dhruv (1) and Oliver Schramm (1)
* develop-ascraeus:
  [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
2014-07-01 00:36:45 +05:30
Dhruv
edc07c9f9d Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12779] Change order of file lists on automatic update
2014-07-01 00:28:49 +05:30
Joas Schilling
7ad88ba32b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
2014-06-29 23:41:28 +02:00
Joas Schilling
fb3baba3e0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12716] Use a string as session_id
  [ticket/12716] Add regression test
  [ticket/12716] Add the missing parameters in the call of clearToken
2014-06-27 16:00:42 +02:00
Joas Schilling
b228b0e1f9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12764] Properly handle errors upon connecting to MySQLi database
2014-06-27 15:39:24 +02:00
Joas Schilling
2a4930304b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12771] Shanging substr to strpos
  [ticket/12771] Change var name
  [ticket/12771] Bug in profilefield_base_migration when used in ext
2014-06-27 15:30:59 +02:00
Joas Schilling
79e909dcda Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12759] Fix type_bool and type_dropdown's UCP fields
  [ticket/12759] Remove lang_helper from profilefields_manager
  [ticket/12759] Cache all lang_options in lang_helper instead
  [ticket/12759] Extra line in profilefields_manager
  [ticket/12759] Cache lang_options for pm_viewmessage
  [ticket/12759] Cache lang_options on memberlist
  [ticket/12759] Add phpDoc comments to explain get_option_lang
  [ticket/12759] Little code cleanup
  [ticket/12759] Make sure $field_id has unique elements
  [ticket/12759] Cache the lang options earlier
  [ticket/12759] Cache lang options for all fields while displaying
  [ticket/12759] Allow multiple fields to be loaded via get_option_lang
2014-06-27 15:20:55 +02:00
Marc Alexander
46ca16e2fc Merge branch 'develop-ascraeus' into develop 2014-06-27 15:18:41 +02:00
Joas Schilling
0f538b10cb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12325] Fix the language var name
  [ticket/12325] Update coding style in template
  [ticket/12325] Fix: add a missing colon
  [ticket/12325] Don't use L_COLON
  [ticket/12325] Fix: it's not stuck in an inifinite loop anymore
  [ticket/12325] Automatic update should notify about outdated files
2014-06-27 14:01:49 +02:00
Andreas Fischer
eef50ae41b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Andreas Fischer
50135b0c6a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12773] Fix language variable name in cli extension enable command
2014-06-26 23:44:41 +02:00
Andreas Fischer
dd835790c6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
Dhruv
cb6c0db51b Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv (2) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:33 +05:30
Marc Alexander
41d3cb0a18 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12099] Fix correction in path_helper test
  [ticket/12099] Prepend ./ to path to fix assets
  [ticket/12099] Deduplicate path generation
  [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
  [ticket/12099] Break clean_path tests with a simple test
  [ticket/12099] Clean paths in tests
  [ticket/12099] Correctly fix go back to root before prepending the root path
  [ticket/12099] Clean some paths before using them
  [ticket/12099] Fix several issues in path_helper test
2014-06-26 15:07:44 +02:00
Marc Alexander
0cd1876239 Merge branch 'develop-ascraeus' into develop 2014-06-25 23:24:25 +02:00
Joas Schilling
c0f041b69f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12680] Adds variable for guest user
  [ticket/12680] Brings back get_username_string()
  [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
  [ticket/12680] Still some problems with displaying the nickname in ucp
  [ticket/12680] Little changes, but some issues are still there
  [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
  [ticket/12680] Adds alternativ text with new variable to contact:
  [ticket/12680] Adds second alternativ text and font-size: 0 to remove text
  [ticket/12680] Adds alternative text to contact icon in viewtopic.php
2014-06-25 19:38:58 +02:00
Joas Schilling
22a834e9e0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12760] Fix wording for unapproved posts icon...
2014-06-25 14:16:58 +02:00
Joas Schilling
68b5edceab Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12766] Event exporter does not like RCx as version
2014-06-25 14:07:01 +02:00
Joas Schilling
49af2177a9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development
  [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1
  [prep-release-3.1.0-RC1] Prepare Changelog
  [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1
  [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1
2014-06-25 00:07:27 +02:00
Andreas Fischer
7172c1a78b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12562] Revert "Add max-width to proSilver"
2014-06-24 21:10:44 +02:00
Andreas Fischer
f4c5e8f12d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
2014-06-24 20:59:11 +02:00
Andreas Fischer
77d53ee927 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12750] Center installation page copyright text.
2014-06-24 13:01:02 +02:00
Nils Adermann
10d963a94e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12612] Prefix check_ids() with phpbb_
  [ticket/12612] Prefix mcp_sorting() with phpbb_
  [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
  [ticket/12612] Prefix module url functions with phpbb_
  [ticket/12612] Prefix upload_popup() with phpbb_
  [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
  [ticket/12612] Prefix custom UCP module function with phpbb_
  [ticket/12612] Prefix _sort_last_active() with phpbb_
  [ticket/12612] Prefix show_profile() with phpbb and delete unused global
2014-06-24 01:24:45 -04:00
Cesar G
5bf8ac475b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12562] Add max-width to proSilver
2014-06-23 20:57:54 -07:00
Cesar G
a6e8dea019 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12648] RTL fix & ACP border fix
  [ticket/12648] Slightly clear ACP active tab border
  [ticket/12648] Fix poll tab and revert unrelated color change
  [ticket/12648] Fix poll tab display error
  [ticket/12648] Added ARIA functionality
  [ticket/12648] Fix and modernize ACP header tabs
  [ticket/12648] More style fixes and also cleaned up CP left navigation
  [ticket/12648] IE8 & IE9 color fix
  [ticket/12648] Improve UCP/MCP/Posting tabs
2014-06-23 20:45:40 -07:00
Andreas Fischer
5fe56a8707 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12762] Make ext.php optional for extensions
2014-06-24 00:39:40 +02:00
Andreas Fischer
c01ae175a6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql
  [ticket/12763] Remove empty schema files
  [ticket/12763] Do not regenerate the *_schema.sql files
2014-06-24 00:19:30 +02:00
Andreas Fischer
c0699c88f8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11528] Change click_submit() to accept id as param
  [ticket/11528] Handle case when config file cant be written by installer
  [ticket/11528] Change NULL to null
  [ticket/11528] Fix spaces and slashes as per guidelines
  [ticket/11528] Add asserts in installation steps
  [ticket/11528] Use 'use' keyword to import classes to current scope
  [ticket/11528] Move parent::tearDown() to end of tearDown()
  [ticket/11528] Call parent::tearDown in overrided tearDown method
  [ticket/11528] Instantiate $client, $driver from functional test case
  [ticket/11528] Refactor install_board() code into a new class
  [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
2014-06-23 20:38:12 +02:00
Joas Schilling
22fc5cedbe Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12532] Move logged_out event into its own <li>
  [ticket/12532] Fix tab -> space indentation in events.md
  [ticket/12532] Add navbar_header_logged_out_content event
  [ticket/12532] Add navbar_header_username_append/prepend
2014-06-23 20:06:43 +02:00
Joas Schilling
c60d444607 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12696] Typo
  [ticket/12696] Change some parts
  [ticket/12696] Naming convention changes
  [ticket/12696] A small error with events.md perms
  [ticket/12696] Add events to evets.md
  [ticket/12696] Add prosilver ucp_register
  [ticket/12696] Add events to ucp_register.html
2014-06-23 19:50:12 +02:00
Joas Schilling
48bd10902b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12690] Find a space
  [ticket/12690] Remove $msg_id and chmod
  [ticket/12690] Add other info to core.submit_pm_after
  [ticket/12690] Add core.submit_pm_after event
2014-06-23 19:46:59 +02:00
Joas Schilling
3a502143c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12728] Adjust .postimage sizing to 100%
  [ticket/12728] Enforce box model sizing on image attachment thumbnails
2014-06-23 19:42:58 +02:00
Dhruv
6be8c98296 Merge branch 'develop-ascraeus' into develop
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12563] Adds &laquo; and &raquo; to the links in acp_styles.php
  [ticket/12563] Removes ending . from <a>
  [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
  [ticket/12563] Changes 2 language variables to better understandable names
2014-06-23 22:07:15 +05:30
Nils Adermann
9f91e8e9bd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12612] Move functions from mcp.php to functions_mcp.php
  [ticket/12612] Move function from ucp.php to functions_user.php
  [ticket/12612] Move functions from memberlist.php to functions_display.php
  [ticket/12612] Move functions from posting.php to functions_posting.php
2014-06-23 11:19:39 -04:00
Andreas Fischer
b79aa2bf78 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12761] Remove the execute bit from functions_user.php
2014-06-23 16:17:14 +02:00
Andreas Fischer
52f731f582 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12726] Fix coding style
  [ticket/12726] Update error message
  [ticket/12726] Fix coding style
  [ticket/12726] Ensure PHP files do not contain any unused use statements
  [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
2014-06-23 00:53:55 +02:00
Cesar G
804ba0145a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
2014-06-22 15:44:29 -07:00
Tristan Darricau
cc32ee8a28 [ticket/12387] Fix a call to sql_freeresult in full_text_native
PHPBB3-12387
2014-06-23 00:31:56 +02:00
Andreas Fischer
80e0851189 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird
2014-06-22 23:41:26 +02:00
Tristan Darricau
bc3659a186 [ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult
PHPBB3-12387
2014-06-22 23:36:57 +02:00
Joas Schilling
d18d3b30c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12704] Improve the load time information in the footer when enabled
2014-06-22 23:13:14 +02:00
Joas Schilling
4f6255687e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12714] Move "allow all forums" in its own dd-element
2014-06-22 23:02:09 +02:00
Joas Schilling
d37eb036aa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12691] Comment change
  [ticket/12691] Change event to core.delete_pm_before
  [ticket/12691] Add core.delete_pm to funtion delete_pm
2014-06-22 22:59:42 +02:00
Joas Schilling
a73fda8b42 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12701] Add change
  [ticket/12701] Rmove before event and expand modify_data
  [ticket/12701] Add events to user_add function
2014-06-22 22:57:47 +02:00
Tristan Darricau
d039f56af0 [ticket/12387] Use the hash as query_id for caching
PHPBB3-12387
2014-06-22 22:49:33 +02:00
Joas Schilling
0d57cb37fb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12646] Changed to navlinks.MICRODATA
  [ticket/12646] Add check for navlinks.FORUM_ID
  [ticket/12646] Changed index/home data attr & updated subsilver
  [ticket/12646] Add data-f attribute to breadcrumb links
2014-06-22 20:50:48 +02:00
Joas Schilling
8a4c50d4b1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12758] Add @changed to doc block
  [ticket/12758] Add show_results var to core.search_modify_rowset
2014-06-22 20:42:19 +02:00
Joas Schilling
a474d849fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12332] Fix plupload attachments with long names overflow
2014-06-22 20:38:53 +02:00
Joas Schilling
27eb27efc0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12740] Use class for logo in css
2014-06-22 20:11:10 +02:00
Joas Schilling
ddbe8fa725 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATION
2014-06-22 20:00:26 +02:00
Joas Schilling
25fd6a0d15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12730] Update Google+ button class to use proper identification
  [ticket/12730] Update maxlen for type_googleplus to 255
  [ticket/12730] Fix type_googleplus_test to use same validation rule as the field
  [ticket/12730] Update field_length to be 20 by default for Google+
  [ticket/12730] Google+ field_order should be 13
  [ticket/12730] Switch service name to googleplus for type_googleplus
  [ticket/12730] Restore field_length to 10 for type_googleplus
  [ticket/12730] Add functional test for Google+ field
  [ticket/12730] Value shouldn't be escaped for schema_data.sql
  [ticket/12730] Missing newline at type_googleplus_test.php
  [ticket/12730] Set field_active to 1 for Google+ field
  [ticket/12730] Add unit test for type_googleplus
  [ticket/12730] Add missing brackets to type_googleplus.php
  [ticket/12730] Update field_order for Google+ CPF
  [ticket/12730] Use string template for Google+ CPF instead of a new one
  [ticket/12730] Minor formatting fixes
  [ticket/12730] Incorrect indentation for type_googleplus
  [ticket/12730] Spaces in block header
  [ticket/12730] Add a Google+ field by default
  [ticket/12730] Add Google+ profile field type
2014-06-22 19:56:49 +02:00
Tristan Darricau
50f4bea610 [ticket/12387] Remove unnecessary checks
PHPBB3-12387
2014-06-22 19:35:07 +02:00
Tristan Darricau
adba7d4715 [ticket/12387] mssql_query return true if a select query returns 0 row
PHPBB3-12387
2014-06-22 19:34:02 +02:00
Tristan Darricau
2276c1c0f2 [ticket/12387] Cleanup *_free_result call and remove @ on that call
PHPBB3-12387
2014-06-22 18:16:21 +02:00
Andreas Fischer
0b52d60e28 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12723] Do not mention too many details on documentation.
  [ticket/12723] Do not reference the coding guidelines section.
  [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions
  [ticket/12723] Properly describe new Code Sniffer rulsets.
  [ticket/12723] Use core suffix in filename instead of phpbb in the middle.
  [ticket/12723] Add Sniff ensuring PHP files use the correct file header
2014-06-22 11:35:13 +02:00
Andreas Fischer
4033f222fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12756] Fix mysqli_fetch_assoc on hhvm
2014-06-22 00:38:36 +02:00
Joas Schilling
e21b012bd1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12752] Cron list tests fail on windows with ansi support
2014-06-21 00:41:40 +02:00
Joas Schilling
9ac237a899 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (30 commits)
  [ticket/12732] Update schema.json for Skype
  [ticket/12729] Add functional test for Facebook field
  [ticket/12731] Add functional test for youtube field
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12730] Values needn't be escaped for schema_data.sql
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12729] Set field_active as 1 for Facebook profile field
  [ticket/12729] Add unit test for ALPHA_DOTS validation
  [ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS
  [ticket/12729] Convert spaces to tabs
  ...
2014-06-20 23:43:31 +02:00
Joas Schilling
06bb40d2ca Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12746] Init phpbb_dispatcher being used by delete_post()
2014-06-20 16:02:24 +02:00
Joas Schilling
94bdc1210e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (28 commits)
  [ticket/12514] Fix array formatting for tests
  [ticket/12514] Fix indention for type_url_test.php
  [ticket/12514] Missed a few spaces in comments
  [ticket/12514] Convert spaces to tabs
  [ticket/12514] Add a few additional tests for type_dropdown
  [ticket/12514] Add a few additional tests for type_int
  [ticket/12514] Fix some formatting for tests
  [ticket/12514] Add a few more tests for type_date
  [ticket/12514] Remove spaces in header blocks
  [ticket/12514] Use generic domain name for URL test
  [ticket/12514] Update file headers to represent the current format
  [ticket/12514] Remove get_ prefix from data providers
  [ticket/12514] Add a few more validation cases for type_string_test
  [ticket/12514] Minor fault in type_bool_test.php
  [ticket/12514] Remove tests/profiles as they're no longer required
  [ticket/12514] Fix type_int_test to correctly respect boundaries
  [ticket/12514] Multi value GET parameters are invalid for phpBB
  [ticket/12514] Add unit test for type_url custom profile field
  [ticket/12514] Add unit test for type_date custom profile field
  [ticket/12514] Add unit test for type_bool custom profile field
  ...
2014-06-20 12:15:40 +02:00
Joas Schilling
7bc2d1f2df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11711] Improve coding and comments of character check
  [ticket/11711] Reduce size of tests and also test topic titles
  [ticket/11711] Improve checks for unsupported characters and check subject
  [ticket/11711] Inform user of unsupported characters while posting
2014-06-20 10:53:31 +02:00
Joas Schilling
f013783c10 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12553] Fix responsive user profile.
  [ticket/12553] Fix responsive post profile.
  [ticket/12553] Remove dropdown-trigger class from member search input.
  [ticket/12553] Fix the merge topic list.
  [ticket/12553] Fix dropdown position of live search
  [ticket/12553] Fix the responsive topic/forum lists.
  [ticket/12553] Align the text in responsive tables to the right.
  [ticket/12553] Center the responsive CP menus instead of floating right.
  [ticket/12553] Open the notification dropdown to the left.
  [ticket/12553] Fix alignment of contact icon.
  [ticket/12553] Fix incorrect alignment in ACP responsive tables.
  [ticket/12553] Align alert text to the right.
  [ticket/12553] Remove incorrect size for site logo.
  [ticket/12553] Fix links in the last post column that are not clickable.
  [ticket/12553] Align contact icons to the right.
  [ticket/12553] Move Place inline and Delete buttons left of the file name.
2014-06-20 10:39:33 +02:00
Andreas Fischer
08b8cdeb4d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12741] Change the mode of the socket file
2014-06-19 19:32:23 +02:00
Andreas Fischer
e908cb85c1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12638] Use require if phpbb_require_updated isn't available
2014-06-17 21:04:47 +02:00
Andreas Fischer
d89e384ec7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12699] Replace magic numbers for the TAB and for ENTER keydown
  [ticket/12699] Add tab key to keymap
2014-06-17 18:13:12 +02:00
Dhruv
05d63e35ef Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12705] Store the regular expression matches based on server_url
  [ticket/12705] Break calling make_clickable with a different server_url
2014-06-17 14:58:17 +05:30
Andreas Fischer
c9da435d3c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12721] Update rules descriptions
  [ticket/12721] Add Generic.NamingConventions.ConstructorName in strict
  [ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration
  [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
  [ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman
  [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
  [ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
2014-06-17 00:42:40 +02:00
Andreas Fischer
7f5aeeef01 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
2014-06-16 22:24:59 +02:00
Andreas Fischer
58fd91dde1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12720] Allow commit heading to begin with lowercase letters
2014-06-16 15:28:26 +02:00
Andreas Fischer
cebe7c8028 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12643] Properly handle changing columns on tables with constraints
  [ticket/12643] Tests dropping similarly named columns
  [ticket/12643] Ensure that similarly named columns are not removed
2014-06-16 15:14:10 +02:00
Andreas Fischer
6299dcd578 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12724] Add Squiz.PHP.Eval in the legacy ruleset
2014-06-16 01:37:21 +02:00
Andreas Fischer
fbbd835b2c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (30 commits)
  [ticket/12715] Add missing new line in the notification manager
  [ticket/12715] Cleanup comments in \phpbb\symfony_request
  [ticket/12715] Cleanup comments in \phpbb\permissions
  [ticket/12715] Cleanup comments in \phpbb\path_helper
  [ticket/12715] Cleanup comments in \phpbb\pagination
  [ticket/12715] Cleanup comments in \phpbb\datetime
  [ticket/12715] Cleanup comments in \phpbb\content_visibility
  [ticket/12715] Cleanup comments in \phpbb\tree\*
  [ticket/12715] Cleanup comments in \phpbb\template\*
  [ticket/12715] Cleanup comments in \phpbb\plupload\*
  [ticket/12715] Cleanup comments in \phpbb\profilefields\*
  [ticket/12715] Cleanup comments in \phpbb\passwords\*
  [ticket/12715] Cleanup comments in \phpbb\notification\*
  [ticket/12715] Cleanup comments in \phpbb\mimetype\*
  [ticket/12715] Cleanup comments in \phpbb\message\*
  [ticket/12715] Cleanup comments in \phpbb\log\*
  [ticket/12715] Cleanup comments in \phpbb\lock\*
  [ticket/12715] Cleanup comments in \phpbb\groupposition\*
  [ticket/12715] Cleanup comments in \phpbb\feed\*
  [ticket/12715] Cleanup comments in \phpbb\extension\*
  ...
2014-06-16 01:12:04 +02:00
Andreas Fischer
a0d2c6ab14 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12712] Remove unneeded GROUP BY clause to fix query for mssql
2014-06-15 17:44:19 +02:00
Dhruv
bf8b8de862 Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12575] Just forward service_collection::offsetGet() to container.
  [ticket/12575] Do not duplicate logic in service_collection_iterator.
  [ticket/12575] Workaround for offsetExists seems not required for the Iterator.
  [ticket/12575] Pass service_collection instead of ContainerInterface.
2014-06-15 13:14:03 +05:30
Dhruv
aaa9a4b0e6 Merge branch 'develop-ascraeus' into develop
# By Tristan Darricau
# Via Dhruv Goel (1) and Tristan Darricau (1)
* develop-ascraeus:
  [ticket/12109] Fix coding style
  [ticket/12109] Bug when setting permissions with "Select all users"
2014-06-15 13:05:53 +05:30
Cesar G
13fedd4764 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12711] Cast values to string such that they are quoted in SQL queries.
2014-06-14 17:41:54 -07:00
Cesar G
b0ab83886e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (25 commits)
  [ticket/12613] Add distinction between top/bottom action-bar
  [ticket/12613] Replaced topic-actions with action-bar
  [ticket/12613] Remove responsive linklist from memberlist
  [ticket/12613] Remove unnecessary checks and clean up CSS
  [ticket/12613] role="navigation" not allowed on <ul>
  [ticket/12613] Improved screen reader functionality
  [ticket/12613] Removed unnecessary checks
  [ticket/12613] Set fixed font-size
  [ticket/12613] Slightly better icons
  [ticket/12613] Typo and L_COLON
  [ticket/12613] Small inconsistency fixes
  [ticket/12613] Don't display page-jump if all pages are visible (6)
  [ticket/12613] Fixes from comments (single quotes and typos)
  [ticket/12613] Minor $bull; and <hr> fix
  [ticket/12613] Pagination should never be in responsive linklist
  [ticket/12613] Minor CSS fixes
  [ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
  [ticket/12613] Renamed jump-to to page-jump to prevent confusion
  [ticket/12613] Removed form in order to prevent nested forms
  [ticket/12613] Fix functional test and post sorting bug
  ...
2014-06-14 16:31:20 -07:00
Cesar G
7371817567 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12709] Update plupload.full.min.js
2014-06-14 11:42:35 -07:00
Dhruv
9ec4136609 Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer (1) and Huynh Buu Tam (1)
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12708] Make the path absolute by using __DIR__.
  [ticket/12708] Correct the path to the LICENSE file in install_main.
2014-06-14 22:07:10 +05:30
Dhruv
86c3fd34dd Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12209] Notify the admin that OAuth still allows DB authentification
2014-06-14 21:11:15 +05:30
Joas Schilling
b64837a29b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.
2014-06-14 13:33:11 +02:00
Andreas Fischer
00b0172962 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12575] Use strict comparison
  [ticket/12575] Add missing property
  [ticket/12575] Usethe new header
  [ticket/12575] Fix 2 typos in comments
  [ticket/12575] Fix typos in comments
  [ticket/12575] Skip sniffer issue triggered by the solution of a php bug
  [ticket/12575] Remove  inline assignments
  [ticket/12575] Fix the tests
  [ticket/12575] Move service_collection_iterator to its own file
  [ticket/12575] Speed up load_class()
2014-06-14 12:45:47 +02:00
Andreas Fischer
8df53d7932 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12706] Ignore additional rank images
  [ticket/12706] Ignore additional languages
  [ticket/12706] Ignore additional styles
2014-06-14 12:44:37 +02:00
Andreas Fischer
72e64fec6e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11445] Move get user's notification code into its own method
  [ticket/11445] Remove unused foreach key $group_name
  [ticket/11445] Improve unit tests for get_global_subscriptions
  [ticket/11445] Optimize no of queries in get_global_subscriptions
2014-06-14 00:16:53 +02:00
Joas Schilling
5937bcacc4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12682] Make Code Sniffer run properly on Travis CI again.
2014-06-13 22:31:01 +02:00
Andreas Fischer
18c9733024 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12687] Remove french spaces
  [ticket/12687] Display the number of cached queries
  [ticket/12687] Don't check if memory_get_peak_usage() exists
  [ticket/12687] Wrap $GLOBALS['starttime'] in a if
  [ticket/12687] Fix the namespace of $request
  [ticket/12687] Update doc block
  [ticket/12687] Use microtime(true)
  [ticket/12687] Remove globals
  [ticket/12687] Return a string and move the displaying of the sql report
  [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME
  [ticket/12687] Display the explain link only when DEBUG is set
  [ticket/12687] Add a constant to display the load time without DEBUG
2014-06-13 16:28:19 +02:00
Joas Schilling
e8ab145396 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12697] Delete cached extension schema.json files after testing
2014-06-13 12:49:17 +02:00
Dhruv
464a1190ea Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12694] Remove whitespace at end of line from acp_groups
2014-06-11 22:44:35 +05:30
Nils Adermann
86b5a815ab Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
2014-06-11 14:28:06 +02:00
Marc Alexander
ee39a45664 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12483] Fix selectors for installing extensions in functional tests
  [ticket/12483] Remove unused globals
  [ticket/12483] Fix finder usage when generating the schema.json file
  [ticket/12483] Fix copyright in prepare_extension.sh
  [ticket/12483] Use file_put_contents()
  [ticket/12483] Close database connection when tearDown() is called
  [ticket/12483] Require the extension manager class
  [ticket/12483] Move schema files into tmp/ and only copy them when needed
  [ticket/12483] Add a .sh that moves an extension in place
  [ticket/12483] Allow to setup extensions before database and functional tests
2014-06-11 09:28:03 +02:00
Marc Alexander
2da12a8869 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12688] Correctly use web root path instead of phpbb root path
2014-06-10 22:22:18 +02:00
Nils Adermann
618b73a3d3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12508] Ignore extensions in migration_tips dev tool
  [ticket/12508] Fix doc block
  [ticket/12508] Add new line to separate the if and foreach better
  [ticket/12508] Add a unit test for set_extensions()
  [ticket/12508] Only take a list of names for set_extensions()
  [ticket/12508] Fix class doc block
  [ticket/12508] Move \phpbb\extension\finder to \phpbb\finder
  [ticket/12508] Fix usages of the finder
  [ticket/12508] Remove extension manager from finder
2014-06-10 18:40:18 +02:00
Joas Schilling
3c68da275b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12664] Refactor develop/migration_tips.php into a console command.
2014-06-10 11:43:45 +02:00
Joas Schilling
01a79fe1dc Merge pull request #2557 from Elsensee/ticket/12516
[ticket/12516] Always preview signature in UCP/ACP module

* Elsensee/ticket/12516:
  [ticket/12516] Always preview signature in UCP/ACP module
2014-06-10 00:27:18 +02:00
Joas Schilling
4916c8c24c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12606] Add ACP group core events
2014-06-10 00:13:20 +02:00
Joas Schilling
f0a0de1721 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
2014-06-10 00:01:39 +02:00
Joas Schilling
592624379f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
2014-06-09 22:57:33 +02:00
Nils Adermann
7a55594e93 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:59 +02:00
Joas Schilling
0440d09dc0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
2014-06-09 17:20:36 +02:00
Joas Schilling
7245c54bb8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12669] Add core event to the function display_forums()
2014-06-09 16:09:33 +02:00
Joas Schilling
ca259c1760 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
2014-06-09 15:47:42 +02:00
Dhruv
d1055bdd9e Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and others
* develop-ascraeus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:25:24 +05:30
Andreas Fischer
bb590b6216 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12672] Make tab intercept; CB for keypress only react without key mods
2014-06-09 03:04:45 +02:00
Andreas Fischer
31abf1ab02 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12675] Fix code sniffer complaints introduced by recent commits
2014-06-09 02:38:35 +02:00
Dhruv
74815d5951 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/11331] Inform user that double dots will be stripped from avatar paths
2014-06-09 04:39:28 +05:30
Marc Alexander
be638e2a18 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
2014-06-08 22:18:34 +02:00
Oliver Schramm
084875f343 [ticket/12516] Always preview signature in UCP/ACP module
PHPBB3-12516
2014-06-07 18:24:13 +02:00
Andreas Fischer
9e00aef34a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12655] Set register_container_commands as public
  [ticket/12655] Don't try to restore the definition in the help
  [ticket/12655] Fix coding style
  [ticket/12655] Make the --shell option available only for phpbbcli.php
  [ticket/12655] Fix coding style in \phpbb\console\application
  [ticket/12655] Set the arguments of \phpbb\console\application as required
  [ticket/12655] Don't require acp/common again in the commands
  [ticket/12655] Run the shell when --shell is used
2014-06-06 19:49:30 +02:00
Andreas Fischer
e509f8664b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12602] Fix language key removal.
  [ticket/12602] Rectify language keys.
  [ticket/12602] Fix test mistake.
  [ticket/12602] Fix language var mistakes.
  [ticket/12602] Add types, change description of cron:list.
  [ticket/12602] Fix internationalisation of cron_list.php
  [ticket/12602] Fix spaces issues.
  [ticket/12602] Coding style correction.
  [ticket/12602] Fix coding style mistakes.
  [ticket/12602] Headers updated.
  [ticket/12602] Changes to respect coding style and to factorize code.
  [ticket/12602] Cleanup tests
  [ticket/12602] Add function get_tasks.
  [ticket/12602] Correction of the output message for the cron list
  [ticket/12602] Add files to print the cron list and test files.
2014-06-06 19:43:09 +02:00
Andreas Fischer
32afa50290 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12666] Use "None" for images in root of gallery avatar path
2014-06-06 16:03:11 +02:00
Cesar G
7d18b605a5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12521] Fix MCP merge topics row overflow
  [ticket/12565] Empty anchors introduce white-space in IE11
  [ticket/12541] Activate attachments tab when files are dropped into textarea
  [ticket/12615] Fixed inproper clearing of .topic-actions
2014-06-04 23:09:02 -07:00
Andreas Fischer
0326c96e50 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12457] Default to first category if none is selected in gallery avatar
2014-06-05 02:26:48 +02:00
Andreas Fischer
f1314741fb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12639] Add a space in the code generated by generate_sql_keyword()
  [ticket/12639] Handle $conditions['keywords'] outside of the loop
  [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
  [ticket/12639] Send a correct IN entry when deleting marked logs
  [ticket/12639] Use assertSame
  [ticket/12639] Remove old commented tests
  [ticket/12639] Order the results correctly in the test
  [ticket/12639] Fix tests on postgres
  [ticket/12639] Update tests to use a dataProvider
  [ticket/12639] Add a test case with an empty keywords list
  [ticket/12639] Delete entry in admin-log leads to mysql-error
2014-06-04 23:59:21 +02:00
Marc Alexander
b46e68c65d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12640] Preserve the active tab when previewing in posting page.
2014-06-04 23:26:22 +02:00
Cesar G
a090260a73 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12566] Also changed for ucp_pm_viewmessage.php
  [ticket/12566] "Private messages" should be "Send pivate message"
2014-06-02 13:48:01 -07:00
Andreas Fischer
c000520add Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
2014-05-31 23:00:07 +02:00
Joas Schilling
93c310f66b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12589] Add test searching in a non absolute directory
  [ticket/12589] Fix tests
  [ticket/12589] Search directly in $directory if it's an absolute sub-path
2014-05-31 01:35:23 +02:00
Andreas Fischer
dafa254f1e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [develop-ascraeus] Correct capitalisation of NeoThermic.
2014-05-31 00:27:37 +02:00
Joas Schilling
e309fce6aa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12637] Fixup all incorrect uses of file header.
  [ticket/12637] Correctly escape the file header in coding-guidelines.html.
2014-05-30 23:22:55 +02:00
Joas Schilling
51b9ea3e86 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10899] Update doc block
  [ticket/10899] Use isset($field_value['IN'])
  [ticket/10899] Add event core.delete_log
  [ticket/10899] Remove trailing ;
  [ticket/10899] Fix typo in the class name
  [ticket/10899] Add unit tests
  [ticket/10899] Get $phpbb_log from the container
  [ticket/10899] Remove extra ';'
  [ticket/10899] Typo
  [ticket/10899] Refactoring in \phpbb\log\log_interface
  [ticket/10899] Using Delete All in log viewer with keyword search
2014-05-30 23:13:09 +02:00
Joas Schilling
dc5878352c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11942] Don't change the reason to '' when hard deleting
  [ticket/11942] Don't show the checkbox if the post is already soft-deleted
  [ticket/11942] Remove useless IF in templates
  [ticket/11942] Apply the modifications to subsilver
  [ticket/11942] Always display delete reason
  [ticket/11942] Edits messages
  [ticket/11942] Change the formulation
  [ticket/11942] Adding the reason to hard deleted topic/post
  [ticket/11942] Delete post/topic reason should be added to logs
2014-05-30 23:04:10 +02:00
Joas Schilling
e8af120037 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
2014-05-30 23:01:57 +02:00
Joas Schilling
be8770532c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11266] Better message for when composer dependencies are missing.
2014-05-30 22:58:17 +02:00
Joas Schilling
ee8e5bcf37 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
  [ticket/12597] Improve language for cron:run command.
  [ticket/12597] Do not output anything besides the gif image.
2014-05-30 22:52:14 +02:00
Andreas Fischer
64f8163652 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (27 commits)
  [ticket/12597] Reformating an acp message
  [ticket/12597] Modifiying acp message
  [ticket/12597] Fix wrong global variable name
  [ticket/12597] Typo correction
  [ticket/12597] Typo corrections
  [ticket/12597] Changing place of lock release in execute() method
  [ticket/12597] Fix test file
  [ticket/12597] Typing corrections and improvement of code consistency
  [ticket/12597] Fix various mistakes
  [ticket/12597] Fix various mistakes
  [ticket/12597] Fix visibilty of two functions in run.php
  [ticket/12597] Refactoring and test improving
  [ticket/12597] Fix language key name
  [ticket/12597] Fix coding style and typing mistakes
  [ticket/12597] Changes name of command  cron:run-all to cron:run.
  [ticket/12597] Fix various problems
  [ticket/12597] Fix constructor bug and servral doc blocs
  [ticket/12597] Modification of return statuses and of test files
  [ticket/12597] Fix misplaced release of db lock
  [ticket/12597] Change EXECUTE to RUN in language
  ...
2014-05-30 20:12:15 +02:00
Joas Schilling
a84bb5f6a1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-b4] Update phpBB Version for b5 development
  [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4
  [prep-release-3.1.0-b4] Prepare Changelog
  [prep-release-3.1.0-b4] Add migration for 3.1.0-b4
  [prep-release-3.1.0-b4] Update version to 3.1.0-b4
2014-05-30 17:53:16 +02:00
Joas Schilling
300d68ff53 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12621] schema.json is not up to date with migration files
2014-05-30 16:11:49 +02:00
Andreas Fischer
993167fee0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12594] Update file header in non-php files
  [ticket/12594] Fix file headers of new files
2014-05-30 15:40:38 +02:00
Andreas Fischer
c00bb27219 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12614] Make the post buttons always visible.
2014-05-29 23:21:19 +02:00
Andreas Fischer
e9d33fd02e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12604] Fix wrong padding when no notifications
2014-05-29 15:42:30 +02:00
Andreas Fischer
4533b4a738 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12611] Remove phpBB Group copyright notice from .gifs
2014-05-29 00:29:44 +02:00
Joas Schilling
3ea17f1d14 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11226] Explicity set file_moved to false
  [ticket/11226] Add tests
  [ticket/11226] Use $user->lang()
  [ticket/11226] filespec::move_file() should error correctly
2014-05-29 00:15:32 +02:00
Joas Schilling
953ca27728 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (29 commits)
  [ticket/11366] Fix headings css in list page
  [ticket/11366] Add config value in schema_data.sql
  [ticket/11366] Fix HTML
  [ticket/11366] Exchange links and settings' form
  [ticket/11366] Remove the extra {S_FORM_TOKEN}
  [ticket/11366] Move the links to the top of the page
  [ticket/11366] Hide the version check settings by default
  [ticket/11366] Versions, options and actions heading should be centered
  [ticket/11366] Better language string for "recheck all"
  [ticket/11366] Move "recheck all" link
  [ticket/11366] Add $config['extension_force_unstable']
  [ticket/11366] Use force_cache on the list page
  [ticket/11366] Add recheck-all link
  [ticket/11366] Force the use of the cache on the list page
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Fix whitespaces
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Update var names
  [ticket/11366] Align language strings
  [ticket/11366] Fix detailed view
  ...
2014-05-28 23:46:15 +02:00
Joas Schilling
6df911142c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12561] Reworked tests by nickvergessen
  [ticket/12561] Added tests for "after last", "after missing" and "empty"
  [ticket/12561] Add check to see if "after" column actually exists
  [ticket/12561] Added test for "after"
  [ticket/12561] Add "after" check to schema_generator for columns_add
2014-05-28 23:33:45 +02:00
Joas Schilling
480a70ccae Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12384] Use mysqli on hhvm in ascraeus. Keep explicit matrix though.
  [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
2014-05-28 23:31:23 +02:00
Joas Schilling
95ebe2dcbf Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12582] Use the correct script name.
  [ticket/12582] Fix coding style.
  [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.
2014-05-28 21:50:50 +02:00
Joas Schilling
b2742243c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12174] Add tests
  [ticket/12174] Coding style
  [ticket/12174] Remove $update_topic_attachments_flag
  [ticket/12174] Don't update the flag for a post without attachment
  [ticket/12174] Update the conditions
  [ticket/12174] Remove inline assignment
  [ticket/12174] Update sql query
  [ticket/12174] Revert the changes on $topic_update_array
  [ticket/12174] Corrections
  [ticket/12174] Update topic_attachment flag when a post is soft-deleted
2014-05-28 21:45:50 +02:00
Andreas Fischer
3ab06314f1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12594] Replace phpBB Group with phpBB Limited
  [ticket/12594] Update footer credit lines
  [ticket/12594] Remove @package tags and update file headers
2014-05-28 18:19:20 +02:00
Joas Schilling
cf12e17944 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12509] Add example in doc block
  [ticket/12509] Add missing ',' in arrays
  [ticket/12509] Update calls to set_custom_style in forgotten places
  [ticket/12509] Fix path in adm/index.php
  [ticket/12509] Fix typo in adm/index.php
  [ticket/12509] Fix doc block
  [ticket/12509] Fix the call to set_custom_file in adm/index and messenger
  [ticket/12509] Update acp custom_style setter
  [ticket/12509] Add an option to set the path of custom file for extensions
2014-05-28 00:23:52 +02:00
Joas Schilling
317ce7b0c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12536] Restore missing @throws
  [ticket/12536] Add test cases with empty versions list
  [ticket/12536] Use stable values when unstable are unavailable
  [ticket/12536] Update doc block
  [ticket/12536] Return empty array if stability unavailable
  [ticket/12536] Get Versions Should Not Require Both Stable and Unstable
2014-05-28 00:07:45 +02:00
Dhruv
9d41bca27d Merge branch 'develop-ascraeus' into develop
# By Tabitha Backoff
# Via Dhruv Goel (1) and Tabitha Backoff (1)
* develop-ascraeus:
  [ticket/12596] Add template event acp_group_options_before/after
2014-05-28 01:30:18 +05:30
Andreas Fischer
2aef05106c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (21 commits)
  [ticket/12155] Remove use of !important and move reddish color back to .button
  [ticket/12155] Reposition the button icons to the left side while we're at it.
  [ticket/12155] Get rid of line-height value causing alignment issues in FF.
  [ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.
  [ticket/12155] Fix misplaced semicolon and ensure that value comparison works.
  [ticket/12155] Combine the post and topic/PM button icons into a single sprite
  [ticket/12155] Move icon class directly to <a> and use <span> consistently.
  [ticket/12155] Remove star hack from padding-right property of .button.
  [ticket/12155] Fix tabbing and put one selector per line if string is too long
  [ticket/12155] Make opacity transition faster and fix background image paths.
  [ticket/12155] Keep the selection method consistent with the one below it.
  [ticket/12155] Fade out the buttons when leaving the post.
  [ticket/12155] Display the buttons only when hovering the post.
  [ticket/12155] Make the buttons bigger on touch devices.
  [ticket/12155] Clean up icons.
  [ticket/12155] Remove unused font.
  [ticket/12155] Remove obsolete images.
  [ticket/12155] Use the new .button class as the basis for the post buttons.
  [ticket/12155] Move existing button style to a more generic class.
  [ticket/12155] Remove obsolete language images.
  ...
2014-05-27 18:41:31 +02:00
Andreas Fischer
29b957eea4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12603] Remove hook system documentation.
2014-05-27 18:33:56 +02:00
Andreas Fischer
e74628ee8d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12527] Fix "board’s language" vs "boards language"
  [ticket/12527] Use a proper language string on confirm screen
  [ticket/12527] Remove unnecessary language strings
  [ticket/12527] Check whether the language exists
  [ticket/12527] Restore missing files and variables check
  [ticket/12527] Remove editor from template
  [ticket/12527] Remove language file editor form ACP
2014-05-27 17:34:50 +02:00
Andreas Fischer
b3fd9211ed Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12600] Add @log to the dependencies of extension:show
2014-05-27 16:59:09 +02:00
Cesar G
dd2c1164d2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12580] Remove :link pseudo from a tag
2014-05-27 07:14:08 -07:00
Andreas Fischer
311dda277c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12592] Make hhvm run MySQL again.
2014-05-27 13:43:41 +02:00
Andreas Fischer
ef96f8aa2c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12570] Keep MySQLi procedural
  [ticket/12570] Remove test for affected rows after SELECT
  [ticket/12570] Add a test for set_array() and updating with the same value
  [ticket/12570] Fix MySQL affectedrows
  [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS
  [ticket/12570] Add a unit test to show broken sql_affectedrows()
  [ticket/12570] Add test for updating a config with the same value
2014-05-26 23:09:51 +02:00
Joas Schilling
cfa9d23988 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12592] Add PHP 5.4 environment using mysql driver.
  [ticket/12592] Rename mysql environment to mysqli.
2014-05-26 21:38:07 +02:00
Joas Schilling
5e3ce27e13 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12074] Update the visibility of the constructor
  [ticket/12074] Don't log errors
  [ticket/12074] Managing extensions doesn't produce any log entry
2014-05-26 19:00:40 +02:00
Joas Schilling
e2cb2ec66b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12583] Redirect only on non-empty $message
  [ticket/12583] Add event core.mcp_warn_post_before/after
2014-05-26 18:39:51 +02:00
Joas Schilling
d29ca3d4f3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12584] Redirect only on non-empty $message
  [ticket/12584] Add event core.mcp_warn_user_before/after
2014-05-26 18:36:59 +02:00
Joas Schilling
0a01b6a4cb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
2014-05-26 18:18:37 +02:00
Joas Schilling
55aa5c8296 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
2014-05-24 14:30:28 +02:00
Joas Schilling
4ef9334dba Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12275] Change if (empty) to if (!isset)
  [ticket/12275] Fix a bug on the event "core.modify_username_string"
2014-05-24 14:20:51 +02:00
Joas Schilling
2d3f486c91 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12531] Add some line breaks to really long lines
  [ticket/12531] Restore default topic link functionality in subsilver2
2014-05-24 14:03:40 +02:00
Andreas Fischer
219d8a41dc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12585] Use a 5 minutes interval instead of 10 minutes
  [ticket/12585] Don't check the cron on each page load
2014-05-24 11:55:34 +02:00
Andreas Fischer
d01c947132 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12555] Add canonical URL for viewtopic
  [ticket/12555] Add canonical URL for viewforum
  [ticket/12555] Add canonical URl for memberlist mode=viewprofile
  [ticket/12555] Allow to set canonical URLs to avoid duplicate content
2014-05-23 03:06:42 +02:00
Andreas Fischer
fefaf2f68e Merge pull request #2478 from VSEphpbb/ticket/12564
[ticket/12564] Remove version definition from ACP/MCP/UCP module info files

* VSEphpbb/ticket/12564:
  [ticket/12564] Remove version definitions from modules in tests
  [ticket/12564] Remove version definition from ACP/MCP/UCP module info files
2014-05-23 01:14:24 +02:00
Andreas Fischer
59ca723174 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12572] Fix JS error when alert message title is undefined
2014-05-23 00:58:12 +02:00
Joas Schilling
0bc73cf9f8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12551] Float breadcrumbs to the right in RTL languages.
2014-05-23 00:46:03 +02:00
Joas Schilling
69e3b5eda6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12550] Prevent last post column from jumping to second line in RTL.
2014-05-23 00:45:21 +02:00
Joas Schilling
7f62d8ea21 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.
2014-05-23 00:44:46 +02:00
Andreas Fischer
c3639a4d5f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12576] Retrieve the cron_manager in cron.php if needed
  [ticket/12576] Remove cron from common.php
2014-05-23 00:34:28 +02:00
Andreas Fischer
9b52f17fcc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12586] Limit depth to 2, we require vendor/extension/ext.php
  [ticket/12586] Use dot filter when trying to find available extensions
2014-05-23 00:19:33 +02:00
Matt Friedman
a18c293739 [ticket/12564] Remove version definitions from modules in tests
PHPBB3-12564
2014-05-20 11:37:42 -07:00
Matt Friedman
6aeb22bfd7 [ticket/12564] Remove version definition from ACP/MCP/UCP module info files
PHPBB3-12564
2014-05-18 17:43:26 -07:00
Joas Schilling
c72e6ceb06 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [task/sami] Establish alphabetical order.
  [task/sami] Also ignore ext/ directory.
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.
2014-05-18 18:58:40 +02:00
Cesar G
35edb62bb0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12547] Rename jquery.js to jquery.min.js in assets directory
2014-05-16 22:05:15 -07:00
Cesar G
e31739212d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12525] Add string argument to contact and email user language variables
2014-05-16 20:05:04 -07:00
Cesar G
022590268b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12533] Make <a> use all the "see all" "button"
  [ticket/12533] Make <a> use all the notification item size
2014-05-16 17:01:03 -07:00
Andreas Fischer
bd81003759 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12433] Use a different message when nesting of quotes is not allowed
2014-05-15 16:48:19 +02:00
Andreas Fischer
c39eef90e7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11163] Add ext/index.htm
2014-05-15 16:33:55 +02:00
Andreas Fischer
572cd972a7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12540] Fix broken placeholders in language files
2014-05-15 13:42:06 +02:00
Tristan Darricau
d53336af06 [ticket/11224] Remove new line in acm_memory.php
PHPBB3-11224
2014-05-15 12:36:22 +02:00
Tristan Darricau
292908ca4a [ticket/11224] Use assertNotEquals(false) instead of assertNotFalse()
assertNotFalse() is unavailable with the version of phpunit used with php
5.2

PHPBB3-11224
2014-05-15 01:50:44 +02:00
Tristan Darricau
7c99e30920 [ticket/11224] Fix coding style
PHPBB3-11224
2014-05-15 01:17:02 +02:00
Tristan Darricau
b7f54e42b2 [ticket/11224] Add unit test
PHPBB3-11224
2014-05-15 00:22:27 +02:00
Andreas Fischer
d867e52a2e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12435] Update the comment
  [ticket/12435] purge_notifications() fails for unused notifications
2014-05-14 23:12:11 +02:00
Andreas Fischer
84f8f18b1c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12544] Update Plupload to 2.1.2.
2014-05-14 23:04:26 +02:00
Tristan Darricau
9dd71fa32e [ticket/11224] Fix the blank line after ?>
PHPBB3-11224
2014-05-14 20:23:27 +02:00
Tristan Darricau
0c4b53e2f1 [ticket/11224] Fix returned data
PHPBB3-11224
2014-05-14 20:22:36 +02:00
Tristan Darricau
0c109c9d37 [ticket/11224] SQL cache destroy does not destroy queries to tables joined
https://tracker.phpbb.com/browse/PHPBB3-11224

PHPBB3-11224
2014-05-14 20:00:04 +02:00
Joas Schilling
bf1f0b8062 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12519] Restore m_approve language description
2014-05-13 12:21:41 +02:00
Marc Alexander
ddced2ac4d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12534] Fix filter for functional tests
  [ticket/12534] Do not use errorbox for multi steps
  [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
2014-05-12 13:10:23 +02:00
Andreas Fischer
4f8b33cc14 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12518] Apply De Morgan to make the conditions easier to read
2014-05-12 01:10:30 +02:00
Marc Alexander
bf7a1e3e55 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12518] Add event to overwrite the cannot edit condition in posting.php
  [ticket/12518] Add event to overwrite the allow edit and delete conditions
2014-05-11 22:38:04 +02:00
Joas Schilling
e17a156365 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12451] Fix whitespace in posting.php lang file
2014-05-11 18:57:44 +02:00
Joas Schilling
b9dda0eb15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12517] Correctly call $log->add in prune shadow topics
2014-05-11 18:13:42 +02:00
Joas Schilling
90c2bf26c0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
2014-05-11 18:09:56 +02:00
Joas Schilling
8d17cf5a70 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12529] Move $phpbb_root_path to the end of the constructor
  [ticket/12529] Use root_path in controller\resolver to check the template dir
2014-05-11 15:47:23 +02:00
Joas Schilling
7ec0289b83 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12501] Only select attachments uploaded before the post was reported.
  [ticket/12501] Parse the reported post message before its attachments.
2014-05-11 11:01:31 +02:00
Joas Schilling
f861df10a1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/9388] Use "togglable" instead of "toggable"
  [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
  [ticket/9388] Reopen <fieldset> after auth templates.
  [ticket/9388] Fix unit tests.
  [ticket/9388] Use the new toggle function for the avatar type <select>.
  [ticket/9388] Display only the settings for the selected search backend.
  [ticket/9388] Display only the settings for the auth method that's selected.
  [ticket/9388] Add support for making <select> options able to toggle settings.
2014-05-11 10:51:36 +02:00
Joas Schilling
243cce0350 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12524] Add search.php core event to modify search results rowset
2014-05-11 10:43:26 +02:00
Joas Schilling
ea989a2456 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12431] Lang full sentence
  [ticket/12431] Add topic poll icon.
  [ticket/12431] Add has_poll icon to topiclists
2014-05-11 10:24:56 +02:00
Joas Schilling
b4c7978e13 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12523] Add template events search_results_topic_(before/after)
2014-05-11 10:19:55 +02:00
Joas Schilling
1f7e6730b8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12407] Remove merge marker from posting.php
  [ticket/12407] Fix incorrect @since line in event
  [ticket/12407] Merge @change in doc block of event
  [ticket/12407] Assign template variables again after merging develop-ascraeus
  [ticket/12407] Add message_parser as passed variable to event
  [ticket/12407] Allow changing of post_data, etc. at end of posting.php
2014-05-11 10:16:58 +02:00
Joas Schilling
a54fc18620 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12522] Add function parameter description in guesser interface
2014-05-11 10:10:37 +02:00
Joas Schilling
ce73ffae16 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12476] Label the constructor as public
  [ticket/12476] Increase assets also from acp_styles and phpbbcli
  [ticket/12476] Increase asset version on cache purge
2014-05-11 10:03:53 +02:00
Andreas Fischer
1b26cf0274 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10839] Remove version compare as the php minimum requirement is 5.3.3
  [ticket/10839] Fix note about running slow tests and build task
  [ticket/10839] Removing phpunit.xml.all
  [ticket/10839] Always run functional tests by default
2014-05-10 17:14:48 +02:00
Joas Schilling
db384ee3c2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12451] Remove duplicated lang var
  [ticket/12451] Use new line to concatenate strings
  [ticket/12451] Split TOO_MANY_CHARS vars for plurals
  [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
2014-05-08 15:15:44 +02:00
Joas Schilling
78b7cee763 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12025] Apply DeMorgan
  [ticket/12025] Fixing the condition....
  [ticket/12025] Don't show any error on preview if the message is empty
  [ticket/12025] Post Preview no longer shows warnings
2014-05-08 14:42:14 +02:00
Joas Schilling
fadc23344f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12325] Use \RecursiveDirectoryIterator
  [ticket/12325] Doc blocks
  [ticket/12325] Change private function to protected
  [ticket/12325] Add visibilities
  [ticket/12325] Add files located in deleted dirs
  [ticket/12325] Generate the list of the deleted files and folders
2014-05-08 14:28:09 +02:00
Joas Schilling
6c9111bd5b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12500] Set a title attribute in user.img()
2014-05-08 13:27:55 +02:00
Joas Schilling
4affb33396 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12440] Use a more generic approach for replacing the URL.
  [ticket/12440] Set browser URL to point to specific post when using view=unread
2014-05-08 13:23:36 +02:00
Joas Schilling
15c0898911 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
2014-05-08 13:17:25 +02:00
Joas Schilling
89e6694045 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
2014-05-08 13:02:11 +02:00
Joas Schilling
f28ce51afb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12428] Use the database to store the original version number
  [ticket/12428] Incorrect from version in database update log entry
2014-05-08 12:57:07 +02:00
Joas Schilling
f80e8d5fb5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12511] Add missing titles for profile fields in members group view
2014-05-08 12:41:17 +02:00
Joas Schilling
6aa3aa3a17 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12513] Add asset include support to simple header/footer in ACP
  [ticket/12513] Add simple_header head event with support for CSS assets calls
2014-05-08 12:29:01 +02:00
Joas Schilling
3a39a99ed6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12493] Add functional test
  [ticket/12493] Fix sql query for selection of users that have disabled PM
2014-05-08 12:23:10 +02:00
Joas Schilling
5ce5d107c2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
  [ticket/12488] Typo fix
  [ticket/12488] Removed <em> and removed anonymous check
  [ticket/12488] Add user warning indication to viewtopic posts
2014-05-07 21:17:18 +02:00
Joas Schilling
3a0bb88866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12357] Support routes in generate_smilies() function.
2014-05-07 21:14:31 +02:00
Cesar G
be05c6ab30 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12185] Fix and increase width
  [ticket/12185] Fixing the width of topic header for translation.
2014-05-06 13:56:30 -07:00
Joas Schilling
35cd0d8cc6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12421] Rebase and enable tests
  [ticket/12421] Don't parse [attachment] tags if user can't view them
2014-05-06 21:50:54 +02:00
Andreas Fischer
801cac50bd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12507] Move the 'require' statement
  [ticket/12507] Add console command to purge the cache
2014-05-06 18:38:26 +02:00
Dhruv
a9fe4ad1a4 Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12504] Use local variables where possible
  [ticket/12504] Use defined variables
  [ticket/12504] Remove unused request object from avatar manager test
  [ticket/12486] Make assertion on the return to remove "Risky" from phpunit
  [ticket/12486] Rename data provider to fix "Risky" from phpunit
  [ticket/12503] All tests should extend \phpbb_test_case
2014-05-06 17:51:09 +05:30
Joas Schilling
2772af18eb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12459] Change language strings
  [ticket/12459] Enable related tests
  [ticket/12459] Fix: Differentiating unapproved and deleted posts
  [ticket/12459] Fix: Soft deleted topics should appear in feeds
  [ticket/12459] Fix: the posts were always marked as unapproved
2014-05-06 14:09:04 +02:00
Joas Schilling
d5b39a45c8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11497] Rename set_ext_finder in find_routing_files
  [ticket/11497] Change the date in the package declaration
  [ticket/11497] Fix pagination tests
  [ticket/11497] Use a mock object to define the root folder for the finder
  [ticket/11497] Generate the list of the routes in controller_helper
  [ticket/11497] Fix the path for the finder in controller_provider
  [ticket/11497] Fix tests
  [ticket/11497] Update pagination test
  [ticket/11497] Remove 'ext.finder' from services' list
2014-05-06 13:56:24 +02:00
Cesar G
e5d18ac827 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
2014-05-05 16:51:50 -07:00
Cesar G
63632d0713 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12498] Adds height-property for IE8 in tweaks.css
2014-05-05 16:46:07 -07:00
Joas Schilling
019952e846 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12491] Fix clashing USERNAME_FULL template variable.
2014-05-05 12:37:04 +02:00
Cesar G
7a3e79fc11 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12415] Use private message instead of "pm" accronym
2014-05-04 13:57:16 -07:00
Andreas Fischer
fed96a9e7a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
2014-05-04 22:40:45 +02:00
Joas Schilling
8f0006ec95 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-b3] Update phpBB Version for b4 development
  [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3
  [prep-release-3.1.0-b3] Prepare Changelog
  [prep-release-3.1.0-b3] Add migration for 3.1.0-b3
  [prep-release-3.1.0-b3] Update version to 3.1.0-b3
2014-05-04 20:25:29 +02:00
Joas Schilling
c4986448c9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12494] Undefined index: user_type on viewtopic.php
2014-05-04 16:44:01 +02:00
Joas Schilling
647a424ed1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
2014-05-04 16:41:24 +02:00
Joas Schilling
73e07b497b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12411] Improved change documentation
  [ticket/12411] Missed on bool var
  [ticket/12411] Corrected event vars description
  [ticket/12411] Expand vars of event: core.search_modify_tpl_ary
2014-05-04 16:35:11 +02:00
Joas Schilling
86f9a45040 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12392] Fix avatar double assignment bug
  [ticket/12392] Include $profile_fields in core.memberlist_view_profile
2014-05-04 16:31:55 +02:00
Joas Schilling
469751d73c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12366] Fixed missing comma
  [ticket/12366] Conform to new event coding guidelines
  [ticket/12366] Expanded event vars
  [ticket/12366] Include ORDER BY into the query builder
  [ticket/12366] Changed to sql_build_query
  [ticket/12366] Add Event core.search_get_posts_data
2014-05-04 16:28:51 +02:00
Joas Schilling
d068396601 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12323] Template Event search_results_postprofile_before
2014-05-04 16:23:31 +02:00
Joas Schilling
7c23a62bc7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12438] Add Template event memberlist_view_content_prepend
2014-05-04 16:21:33 +02:00
Joas Schilling
02352c9346 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12410] Add Template events search_results_post_ b/a
2014-05-04 16:12:05 +02:00
Joas Schilling
01911cffc5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12396] Added missing viewtopic_topic_title_append
  [ticket/12396] Add Template events viewforum_forum_name
2014-05-04 16:09:27 +02:00
Joas Schilling
8e0503c7b8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12376] Changed to viewtopic_body_poll_option_before and after
  [ticket/12376] Added viewtopic_body_poll_question_append
  [ticket/12376] Add template events viewtopic_body_polls
2014-05-04 15:58:40 +02:00
Joas Schilling
90d98cb884 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12374] Fixed alphabetical sorting
  [ticket/12374] Added prepend-versions of events
  [ticket/12374] Updated code layout
  [ticket/12374] Add Template events index_body_block_(name)_append
2014-05-04 15:55:51 +02:00
Joas Schilling
877b4cfcaa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12346] Change tabs to spaces
  [ticket/12346] Add Template Event overall_header_navlink_app/pre
2014-05-04 15:52:36 +02:00
Joas Schilling
9f9998f89a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12335] Remove $ from desc
  [ticket/12335] Added generate_profile_fields _ before
  [ticket/12335] Documentation fix and added use_contact_fields
  [ticket/12335] Fix phpBB version number
  [ticket/12335] Add Events to phpbb\profilefields\manager
2014-05-04 15:50:17 +02:00
Joas Schilling
92ec7616be Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12378] Prosilver common.css duplicate entry
2014-05-04 15:44:09 +02:00
Joas Schilling
cd7be3f58b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12455] Remove unused language strings from common.php and app.php
2014-05-04 15:43:33 +02:00
Joas Schilling
19c968e5e9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
2014-05-03 16:40:35 +02:00
Andreas Fischer
a84acdb4f1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12470] Correctly set up the php extensions
  [ticket/12470] Fix setup of phpbb
  [ticket/12470] Move setup of phpBB to new .sh
  [ticket/12470] Move setup of database to new .sh
  [ticket/12470] Move phing sniff into new .sh
2014-05-03 15:53:57 +02:00
Joas Schilling
d1568e7fe5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12485] Broken tests due to absolute exclude
2014-05-03 10:28:53 +02:00
Cesar G
9b2ecf721b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10521] Fix broken tests using set_cookie
2014-05-02 17:56:23 -07:00
Nils Adermann
5b39b9f52a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10521] Update docblock of set_cookie for new HttpOnly param
2014-05-03 01:00:06 +02:00
Nils Adermann
2280a37a3e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12429] Can not insert into more columns than exist.
2014-05-03 00:51:38 +02:00
Nils Adermann
48d016134e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
2014-05-03 00:37:39 +02:00
Joas Schilling
184b8c2df7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12382] Event loop nesting inclusion applies to regular includes too
  [ticket/12382] Allow nested loops in included files.
2014-05-03 00:23:05 +02:00
Nils Adermann
93388eb431 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10521] Allow language switching by URL parameter
2014-05-03 00:15:54 +02:00
Andreas Fischer
af74bbc81c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12482] Fixed undefined variable: data.
2014-05-02 23:32:14 +02:00
Joas Schilling
3e2d08bb31 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12478] Add contact field events to viewtopic_body.html.
  [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.
2014-05-02 23:13:51 +02:00
Andreas Fischer
9eac15707e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12480] Remove unused use statements
  [ticket/12480] Add subfolder/config/routing.yml which should not be found
  [ticket/12480] Only load config/routing.yml from extensions route
2014-05-02 23:04:58 +02:00
Andreas Fischer
c33cb67ec9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12477] Tab instead of spaces.
  [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
2014-05-02 22:16:11 +02:00
Nils Adermann
64a34a1966 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
2014-05-02 21:43:43 +02:00
Nils Adermann
45215d0bda Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12254] Add subsilver2 support for cookie storage instead of SID
  [ticket/12254] Use a cookie instead of SID to store language selection
  [ticket/12254] No longer need to add change_lang to the URL params
  [ticket/12254] Use 'language' instead of 'set_lang' as the variable name
  [ticket/12254] Persist set_lang after reg only if changed from default
  [ticket/12254] Add set_lang var changes to subsilver2 files
  [ticket/12254] Use new set_lang var to avoid conflict with change_lang
  [ticket/12254] Stop using deprecated request_var in user class
  [ticket/12254] Better language switching on registration page
2014-05-02 21:24:15 +02:00
Nils Adermann
49c994f0f3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12475] Tabs, spaces, ...
2014-05-02 20:05:14 +02:00
Nils Adermann
aace88b80d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12475] Load extension migrations on cli updater too
2014-05-02 19:55:59 +02:00
Andreas Fischer
237ae5dfae Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12475] Error in db:update console command
  [ticket/12474] Error messages should be displayed with <error> tag
2014-05-02 19:50:16 +02:00
Nils Adermann
903c4d26da Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12473] Add console command for database migration.
  [ticket/12473] Add more compatibility to phpBB Console Application.
  [ticket/12473] Move compatibility globals out into its own file.
2014-05-02 19:17:17 +02:00
Nils Adermann
c4798ab31d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12472] Set fast_finish for travis
2014-05-02 18:58:40 +02:00
Marc Alexander
3994a0e784 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12120] Add Marc Alexander to AUTHORS
2014-05-02 18:52:45 +02:00
Nils Adermann
0d22f8d0af Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.
2014-05-02 18:30:29 +02:00
Nils Adermann
d4cec63d66 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [feature/sqlite3] Add sqlite3 database to .gitignore
  [feature/sqlite3] Use SQLite3 by default
  [feature/sqlite3] Remove invalid comment
  [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries
  [feature/sqlite3] Correctly recreate indexes when recreating a table
  [feature/sqlite3] Fix sql_index_drop() for sqlite3
  [feature/sqlite3] Remove trailing comma from column list
  [feature/sqlite3] Update docblocks and function visibility
  [feature/sqlite3] Add support for SQLite 3
2014-05-02 17:58:14 +02:00
Nils Adermann
f910ca14b7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12071] Add test that covers not available fileinfo
  [ticket/12071] Get rid of unneeded cast to boolean in tests
  [ticket/12071] Skip tests that depend on fileinfo and fix expected results
2014-05-02 16:54:41 +02:00
Nils Adermann
d108fe09f2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11508] Fix build_url test.
  [ticket/11508] Add functional test for jumpbox.
  [ticket/11508] Use $phpbb_path_helper.
  [ticket/11508] Allow equal sign in parameter value.
  [ticket/11508] Remove unnecessary implode.
  [ticket/11508] Remove unnecessary isset check.
  [ticket/11508] Fix build_url test.
  [ticket/11508] Curly brace should be on its own line...
  [ticket/11508] The question mark is expected even if there are no parameters.
  [ticket/11508] Add tests.
  [ticket/11508] Do not add the '?' unless there are parameters.
  [ticket/11508] Change separator parameter to a simple true|false $is_amp.
  [ticket/11508] Move helper functions to path_helper class.
  [ticket/11508] Move the stripping param code to separate function as well.
  [ticket/11508] Build the jumpbox hidden fields using the _form action_
  [ticket/11508] Split parts of build_url() into reusable functions.
2014-05-02 16:40:40 +02:00
Andreas Fischer
850feb4938 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12469] Remove user table columns from fixtures that were deleted
2014-05-02 16:34:16 +02:00
Nils Adermann
3020b044e3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8323] Cache auth request
  [ticket/8323] Combine into a single query
  [ticket/8323] Comments on phpbb_get_banned_user_ids input for test
  [ticket/8323] More readability in test case
  [ticket/8323] Comments
  [ticket/8323] dataProvider for the test; better test data
  [ticket/8323] Comments
  [ticket/8323] Unit test for phpbb_get_banned_user_ids
  [ticket/8323] Comments for inactive reasons in constants.php
  [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
  [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
  [ticket/8323] Correct PM notification settings (only notify those who can receive them)
  [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
  [ticket/8323] Allow sending PMs to temporarily banned users
  [ticket/8323] Do not allow sending PMs to Inactive users
  [ticket/8323] Hide the Send PM link if users cannot receive the PM
  [ticket/8323] Correcting the comment
  [ticket/8323] Do not allow sending of Private Messages to users who are banned
  [ticket/8323] Remove code used for testing
  [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
2014-05-02 16:13:24 +02:00
Nils Adermann
564de1b513 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
2014-05-02 15:41:01 +02:00
Joas Schilling
b988511a1c Merge remote-tracking branch 'p/develop-ascraeus' into develop 2014-05-02 15:09:51 +02:00
Nils Adermann
65e90ecd24 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11881] Move convert_timezones_test to migrator
  [ticket/11881] Fix test filename
  [ticket/11881] Limit to 500
  [ticket/11881] Make sure user_timezone isn't converted twice
  [ticket/11881] Better split the timezone conversion into chunks; add test
  [ticket/11881] Timezone migration can take a long time
2014-05-02 14:46:40 +02:00
Andreas Fischer
bfc31f55b2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 14:22:09 +02:00
Nils Adermann
b6925ca6d1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12403] Add template events to acp_users_prefs.html
2014-05-02 13:35:09 +02:00
Nils Adermann
f1a1a84bf0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8960] Allow changing avatar path if it's not writable
2014-05-02 13:26:31 +02:00
Nils Adermann
f91b27584b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8558] htmlspecialchars_decode the contact name for emails
2014-05-02 13:03:59 +02:00
Nils Adermann
9d00e95229 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board
2014-05-02 12:50:24 +02:00
Nils Adermann
367abd2297 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8558] Do string concatenation only once and do htmlspecialchars
  [ticket/8558] Add display name in emails from board
2014-05-02 12:43:20 +02:00
Nils Adermann
69a14cf238 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12409] Add acp_users.php core events to modify users preferences data
2014-05-02 12:29:37 +02:00
Nils Adermann
5f76c8be07 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
2014-05-02 12:25:04 +02:00
Nils Adermann
fa06988eed Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
2014-05-02 12:11:30 +02:00
Nathaniel Guse
391275dd07 Merge branch 'develop-ascraeus' into develop
# By Crizzo
# Via Crizzo (1) and Nathaniel Guse (1)
* develop-ascraeus:
  [ticket/12404] Splits up the line 18 in subsilver2 into more lines
  [ticket/12404] Changes append/prepend to after/before
  [ticket/12404] Adds two new events and changes some places
  [ticket/12404] Adds a new event before and after the Timezone display
2014-05-01 22:24:37 -05:00
Nathaniel Guse
bf32b31f8a Merge branch 'develop-ascraeus' into develop
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12432] Correcting the assertion
  [ticket/12432] Adding unit test
  [ticket/12432] Migrator should not revert custom functions
2014-05-01 22:16:07 -05:00
Nathaniel Guse
e31a071f2b Merge branch 'develop-ascraeus' into develop
# By PayBas
# Via Nathaniel Guse (1) and PayBas (1)
* develop-ascraeus:
  [ticket/12442] More heading classes
  [ticket/12442] Add CSS classes to important headings
2014-05-01 22:00:29 -05:00
Nathaniel Guse
8ae229febe Merge branch 'develop-ascraeus' into develop
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12444] Replacing spaces with tabs
  [ticket/12444] Replace spaces with tabs
  [ticket/12444] Adding regression test
  [ticket/12444] The logs message aren't filled correctly
2014-05-01 21:49:55 -05:00
Nathaniel Guse
a3995d123a Merge branch 'develop-ascraeus' into develop
# By Nicofuma
# Via Nathaniel Guse (1) and Nicofuma (1)
* develop-ascraeus:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
2014-05-01 21:47:06 -05:00
Nathaniel Guse
730b73dab7 Merge branch 'develop-ascraeus' into develop
# By Cesar G
# Via Cesar G (1) and Nathaniel Guse (1)
* develop-ascraeus:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
2014-05-01 21:36:25 -05:00
Joas Schilling
be2b80e82b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12186] Move PM reports below post reports while installing for ascraeus
  [ticket/12186] Move PM reports below post reports while installing
2014-04-29 21:29:43 +02:00
Joas Schilling
2fff767fd4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
2014-04-29 20:41:15 +02:00
Andreas Fischer
aa6acfb00c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12456] Add , after the last array element
  [ticket/12456] Fix duplicated empty lines in language files
  [ticket/12456] Fix missing new lines at the end of email templates
2014-04-29 17:09:04 +02:00
Joas Schilling
2bd13eb054 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12097] Bug fix and adding unit test
  [ticket/12097] Validate_data() should work with class method
2014-04-27 20:44:01 +02:00
Joas Schilling
0b32860e90 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12406] Fix variable description of core.viewtopic_modify_page_title
2014-04-26 18:18:33 +02:00
Andreas Fischer
828696a723 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12199] Move deprecated functions to functions_compatibility.php
2014-04-26 01:41:56 +02:00
Cesar G
0931d9f97d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12418] Notice displayed for feed.php
2014-04-25 13:03:45 -07:00
Cesar G
7c6bba694b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12437] Clean up redundant "clear" elements & "corners"
2014-04-25 10:10:54 -07:00
Andreas Fischer
fddf56223c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12012] Move property to the top
  [ticket/12012] Move MS SQL server comparison into a method
  [ticket/12012] Fix docs in connection manager
  [ticket/12012] Remove duplicated code (only the $sql are different)
  [ticket/12012] Handle begin and commit transactions in tests
  [ticket/12012] Drop and recreate indexes when removing columns
  [ticket/12012] Add a unit test for removing a column with indexes
  [ticket/12012] Add a unit test for changing the column type
  [ticket/12012] Return SQL statements for index drop/create
  [ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
  [ticket/12012] Drop and recreate indexes when changing a column on MSSQL
  [ticket/12012] Fix query layout
  [ticket/12012] Correctly drop default value constraints on MSSQL
2014-04-25 18:54:48 +02:00
Cesar G
001292cc0f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12389] Change "PM" to "Message"
  [ticket/12389] Moved PM tools to UCP template
  [ticket/12389] Replace email and print icons.
  [ticket/12389] Change language of email friend
  [ticket/12389] Move print topic & email topic icons to topic tools
2014-04-25 07:34:01 -07:00
Cesar G
8327c2f078 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12382] Mark broken nested loop with include as incomplete
  [ticket/12382] Add template test for subloops inside includes
  [ticket/12382] Add template test for subloops inside events
2014-04-25 07:25:39 -07:00
Andreas Fischer
26295d5b13 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11917] Replace space with tabs
2014-04-25 16:02:37 +02:00
Joas Schilling
a715719415 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
2014-04-24 14:31:26 +02:00
Nils Adermann
ffb8763220 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11917] Move OAuth Module to the bottom while installing
  [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
2014-04-24 11:33:24 +02:00
Joas Schilling
bb3039678e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12201] Decreased pagination font size.
  [ticket/12201] Update select element to follow same design as prosilver.
  [ticket/12201] Increase sort font size just slightly.
  [ticket/12201] Add link to resync file stats after error.
  [ticket/12201] Fix typos in language pack.
  [ticket/12201] Display error and sorting options when there are no attachments
  [ticket/12201] Only the top pagination should be floated to the right.
  [ticket/12201] Rearrange pagination, sorting, and submit elements.
  [ticket/12201] Center the file size and mark columns.
  [ticket/12201] Separate pagination from table.
2014-04-22 21:09:30 +02:00
Joas Schilling
dd766ce0f7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
2014-04-22 19:51:29 +02:00
Joas Schilling
33e03324d1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12422] Add tests
  [ticket/12422] Fix debug warning in log search
2014-04-22 19:48:50 +02:00
Andreas Fischer
77922dcd1e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12413] Revert e65a6dd8f4
2014-04-22 19:25:24 +02:00
Joas Schilling
cde0ebccd0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12193] Fix broken HTML if SQL error occurs during migration
2014-04-22 18:27:58 +02:00
Joas Schilling
7079fefa61 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.
  [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2.
  [ticket/12423] Increase Composer minimum-stability to stable.
2014-04-22 13:42:45 +02:00
Cesar G
a5a2e05c2b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12347] Remove unknown/unnecessary hack
  [ticket/12347] IE8 compatible CSS selector
  [ticket/12347] Changed from :after to :before
  [ticket/12347] Changed to the new navbar templates
2014-04-20 19:27:18 -07:00
Joas Schilling
c3164be288 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12405] Valid timezone and dateformat for create_user() in tests
2014-04-20 22:10:44 +02:00
Cesar G
6c297680b9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12363] Fix typo
  [ticket/12363] changed _winner_ to _most-votes_
  [ticket/12363] Mark winning (most votes) results bar
2014-04-20 10:33:05 -07:00
Andreas Fischer
95308aa20a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12390] Add comment to composer.json to update the build target
  [ticket/12390] Move cleaning of vendor into it's own target
  [ticket/12390] Remove documentation, tests and other files from vendor/
2014-04-20 16:20:59 +02:00
Cesar G
abf72b31e7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12419] Also shrink the size of "See All" in footer a little bit
  [ticket/12419] Improve font size in notifications drop-down
2014-04-18 09:23:31 -07:00
Joas Schilling
e77d7638f2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11978] Fix width of topic search text field
2014-04-17 23:32:04 +02:00
Joas Schilling
f766692ce5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
2014-04-16 23:33:11 +02:00
Joas Schilling
beab7dd685 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12345] Improve search flood interval message for ascraeus
2014-04-16 23:26:47 +02:00
Joas Schilling
67debc790d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
2014-04-16 22:48:04 +02:00
Joas Schilling
73c3192d61 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12391] Assign variables to core.posting_modify_template_vars
2014-04-16 00:58:52 +02:00
Joas Schilling
f63b2a2569 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12191] Move notification options to bottom while installing
2014-04-16 00:52:53 +02:00
Joas Schilling
ea7d897e83 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
2014-04-16 00:19:10 +02:00
Joas Schilling
cc776333a4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12400] Add viewforum event to modify topics data
2014-04-16 00:03:37 +02:00
Andreas Fischer
8451d96ef8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-16 00:00:04 +02:00
Joas Schilling
97bf3d368f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:58 +02:00
Joas Schilling
f6ae3959a0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12344] Add core.pm_submit_before to function submit_pm
2014-04-15 22:25:58 +02:00
Andreas Fischer
6f375d4615 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12388] Add tests for lang() use on log actions without data
  [ticket/12388] Fix translation of log entries without additional log data
2014-04-15 11:39:15 +02:00
Joas Schilling
3247af1677 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12004] Support empty routes to app.php/ in path_helper
2014-04-14 12:41:06 +02:00
Joas Schilling
c88b2f89e9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
2014-04-14 12:33:46 +02:00
Joas Schilling
7f0d2bfe66 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12398] Select correct post to restore during softdelete tests
2014-04-13 22:42:55 +02:00
Joas Schilling
845a052318 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12398] Use return of submit_post in softdelete and download tests
  [ticket/12398] Use submit_post return in prune_shadow_topic_test
2014-04-12 16:45:55 +02:00
Cesar G
d385e889d3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12395] Check for posts in the middle of the page
2014-04-12 03:35:15 -07:00
Joas Schilling
91a3a5910a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12211] Do not run attachment file names twice through htmlspecialchars
2014-04-12 10:16:58 +02:00
Cesar G
8dbb8fd00d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12351] Add loading indicator to links that are missing it.
2014-04-11 15:40:41 -07:00
Joas Schilling
750ccd9eb0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12336] Add functions_module.php core event
2014-04-11 16:31:38 +02:00
Joas Schilling
cce02551a9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name
  [ticket/12386] Add DEBUG_EXTRA again and use it for container creation
2014-04-11 16:23:28 +02:00
Joas Schilling
843d9554aa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12283] Remove obsolete online class from posting review page
2014-04-11 10:39:48 +02:00
Joas Schilling
2c876e26f7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12377] Forgot to change the INCLUDEs
  [ticket/12377] Renamed template files to navbar_xxx
  [ticket/12377] Moved notifications to new template
  [ticket/12377] Forgot empty line at the end
  [ticket/12377] Move navbar(s) to new template file
2014-04-11 10:35:55 +02:00
Joas Schilling
dcd35c11ce Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12380] Explicity state the order of sorting for login keys
  [ticket/12380] Sort Remember Me keys by last login time in UCP
2014-04-11 10:33:12 +02:00
Joas Schilling
72bd6f227a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
2014-04-11 09:16:21 +02:00
Cesar G
6b1f0f58c8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10687] Improve error message if unable to get image dimensions
2014-04-10 17:43:34 -07:00
Nils Adermann
7328ab30e8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12370] Add unit tests for topic notifications
  [ticket/12370] Fix functional notification test and remove unneeded requests
  [ticket/12370] Do not delete topic notifications when the topic is visible
2014-04-10 14:26:50 -07:00
Nils Adermann
dea2cf508c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
2014-04-10 14:25:08 -07:00
Nils Adermann
ca56801c35 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
2014-04-10 14:22:43 -07:00
Nils Adermann
f948482129 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
2014-04-10 14:19:21 -07:00
Nils Adermann
fa3b9c0611 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12348] Allow to run create_schema_files when phpBB is not installed
2014-04-10 14:16:49 -07:00
Nils Adermann
beb71177a8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12331] Add functional test for saving custom profile fields
  [ticket/12331] Fix SQL error when inserting a new entry to profile field data
2014-04-10 14:14:38 -07:00
Nils Adermann
35075ceca6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12286] Reword section about plurals
  [ticket/12286] Fix spelling of elephant(s) in the sample
  [ticket/12286] Correctly capitalize PHP
  [ticket/12286] Fix nesting of ul inside li element
  [ticket/12286] Add note that goto should not be used
  [ticket/12286] Add section about plurals to the coding guidelines
  [ticket/12286] Classes must use the name space
  [ticket/12286] Remove section about utf8_normalize_nfc()
  [ticket/12286] Use $request->variable() instead of request_var()
  [ticket/12286] Function names should be prefixed with phpbb_
  [ticket/12286] Add "Since" to template event docs
  [ticket/12286] style.php and imagesets dont exist anymore
  [ticket/12286] Styles have a phpbb_version and a style_version in 3.1
  [ticket/12286] Use UTF8 (c) in style.cfg samples
2014-04-10 14:06:06 -07:00
Nils Adermann
8de52bd278 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12282] Update new references
  [ticket/12282] Update container db mock
  [ticket/12282] Add new line at EOF of the interface
  [ticket/12282] Use interface for type hinting
  [ticket/12282] Use {@inheritDoc} for inherited methods
  [ticket/12282] Add Interface for DBAL drivers
2014-04-10 14:04:51 -07:00
Nils Adermann
f0f32ac1df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11352] Add functional tests for disapproving a post/topic
  [ticket/11352] Redirect the user back to view*.php after disapproving
2014-04-10 13:56:53 -07:00
Andreas Fischer
d5507df27e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
2014-04-10 15:44:56 +02:00
Joas Schilling
727880f3f6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
2014-04-10 13:38:39 +02:00
Joas Schilling
7cd0bda813 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
2014-04-10 12:17:34 +02:00
Joas Schilling
52f415cfdc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12375] Fix broken attachment deletion.
2014-04-10 12:04:28 +02:00
Joas Schilling
68ded62568 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
2014-04-10 12:01:22 +02:00
Joas Schilling
a478adf231 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
2014-04-10 11:57:05 +02:00
Cesar G
9aaa9e994d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8700] Use L_COLON instead of adding ":" manually
  [ticket/8700] Remove unused language strings
2014-04-09 17:22:31 -07:00
Cesar G
aef7143b27 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12365] Do not crop image attachments at 350px
2014-04-09 12:03:28 -07:00
Joas Schilling
1c434fd713 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12369] White-space cleanup
  [ticket/12369] Removed template vars initial state
  [ticket/12369] Added ACP vars
  [ticket/12369] Add template var {BODY_CLASS} to HTML body
2014-04-08 20:57:41 +02:00
Joas Schilling
ef5eb72e8a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12083] Fix Select All in CODE bbcode with only one char
2014-04-08 07:48:08 +02:00
Dhruv
cd51c5cc3a Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12349] Fix Sniffer for @license tag
  [ticket/12349] Update license header in several new files
2014-04-08 02:29:43 +05:30
Joas Schilling
b2834a5563 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12362] Do not use database test case as it's not needed
  [ticket/12362] Add tests for schema generator
  [ticket/12362] Throw exception in schema generator on unresolvable dependency
2014-04-07 22:42:54 +02:00
Joas Schilling
2269955034 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12364] Add template identifier var to all missing pages
2014-04-07 22:24:30 +02:00
Joas Schilling
d72922f1a9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12360] Fix duplicated creation of session when logging out the user
2014-04-07 22:17:39 +02:00
Joas Schilling
aba1268dea Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12361] Replace the Google logo.
2014-04-07 22:11:11 +02:00
Nils Adermann
7ef70b4331 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12358] Correctly check and change the redirect url for ajax requests
2014-04-07 14:20:48 -04:00
Joas Schilling
563deadb15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12150] Use correct license URL in prune shadow migrations file
  [ticket/12150] Remove 'after' for columns from migrations file
  [ticket/12150] Update schema files for prune shadow topics
  [ticket/12150] Use log service instead of add_log() function
  [ticket/12150] Use shorter column names for prune settings
  [ticket/12150] Add functional tests for pruning shadow topics
  [ticket/12150] Add missing space to query for shadow topics
  [ticket/12150] Add missing prune settings variables in acp_forums
  [ticket/12150] Add file and caller for pruning shadow topics
  [ticket/12150] Add prune columns to schema files and migration file
  [ticket/12150] Add options to acp
2014-04-06 22:28:12 +02:00
Joas Schilling
e3d46786b2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12354] Assert same instead of equal where necessary in passwords tests
2014-04-06 22:18:55 +02:00
Andreas Fischer
6d0b2943c6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12359] Remove inline width styling on UCP birthday fields
2014-04-06 11:08:29 +02:00
Joas Schilling
0e56ca42a8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10851] Request index instead of logging in and out in tests
  [ticket/10851] Add unit and functional tests for checking attachments
  [ticket/10851] Set disallowed content to empty array if checking is disabled
2014-04-05 10:06:29 +02:00
Joas Schilling
5609d3733a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/7707] Fix undefined variable: perm_from
  [ticket/7707] Add comma to last entry of arrays
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() once more
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() where possible
2014-04-05 09:54:42 +02:00
Joas Schilling
887f718022 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12338] Add Template Event overall_footer_page_body_after
2014-04-04 23:57:19 +02:00
Joas Schilling
0749d46050 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12333] Change event name
  [ticket/12333] Add Template Event overall_header_body_after
2014-04-04 23:56:00 +02:00
Joas Schilling
8fe41f3127 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12327] Ajax fix
  [ticket/12327] Coding style fixes
  [ticket/12327] Changing poll result-bars width from absolute to relative
2014-04-04 23:52:14 +02:00
Joas Schilling
95a30b41ba Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12339] removed return var
  [ticket/12339] more complete params and updated _since version
  [ticket/12339] Add Event core.page_header_after
2014-04-04 23:22:01 +02:00
Joas Schilling
f7fa42ea3d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11962] Resize posted images to fit and give them a class
2014-04-04 18:26:15 +02:00
Joas Schilling
bc8b384a20 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12342] Remove spinner and fix useage of ajax on memberlist
  [ticket/12342] Fix the Custom Dates function in UCP Prefs Global
  [ticket/12342] Fix Find a member show / hide script
  [ticket/12342] Use prop() instead of attr() for boolean properties
2014-04-04 18:02:18 +02:00
Joas Schilling
c42b431b0d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12353] Fix displayed attachments in ACP
2014-04-04 17:41:07 +02:00
Joas Schilling
38392f971b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
2014-04-03 23:08:20 +02:00
Andreas Fischer
22715db92e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12350] Instantiate Mock Dispatcher for modules_test
2014-04-03 22:20:55 +02:00
Joas Schilling
50bd761f3b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12337] Fix jQuery update migration file
  [ticket/12337] Update jQuery to version 1.11.0
2014-04-03 16:09:09 +02:00
Joas Schilling
4ba56deec1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12341] Update test with new class name and dependencies
  [ticket/12341] Add tests for get_username_string()
2014-04-03 15:21:54 +02:00
Joas Schilling
8fa6094ea2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12043] Fix order of disabled extensions in unit tests
  [ticket/12043] Correct try/catch exceptions for invalid extensions
  [ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
2014-04-03 15:06:46 +02:00
Joas Schilling
e4170e6c54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12329] changed all CSS classes to ".stat-block"
  [ticket/12329] Add <div> container to index blocks (stats, etc.)
2014-04-01 15:07:45 +02:00
Joas Schilling
7b64c6b3a6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12328] Change "since" to B3
  [ticket/12328] Add Template Event index_body_stat_blocks_after
2014-04-01 14:45:48 +02:00
Joas Schilling
88f718bc6b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12322] Added profile-custom-field class
  [ticket/12322] CSS classes for postprofile-profile <dd> items
2014-04-01 14:38:04 +02:00
Joas Schilling
7978eb06f6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
  [ticket/12318] Pin HHVM version to 3.0.0~precise.
  [ticket/12318] Always install new config file on HHVM upgrade conflict.
  [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
  [ticket/12318] Upgrade to a recent stable version of HHVM.
  [ticket/12318] Correctly setup HHVM for functional tests.
2014-03-31 21:01:12 +02:00
Joas Schilling
2c0b08a890 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/9758] Clickable avatar in header and renamed class for avatar-img
  [ticket/9758] Remove unnessary if-question for include functions_display
  [ticket/9758] Slims the line 4775 in includes/functions.php
  [ticket/9758] Adds id and changes filter to fix travis CI test
  [ticket/9758] Removed the needless space after first ENDIF
  [ticket/9758] Adding impr. for overall_header display of avatar and username
  [ticket/9758] Fixed bug in mcp_warn.php
  [ticket/9758] Optimises the html code of avatar image in header
  [ticket/9758] Error because of missing functions_display.php fixed
  [ticket/9758] Removed useless if-conditions to include functions.php
  [ticket/9758] Changes class name of new "span" in overall_header.html
  [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
2014-03-31 20:31:48 +02:00
Joas Schilling
77f41912db Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3
  [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2
  [prep-release-3.1.0-b2] Prepare Changelog
  [prep-release-3.1.0-b2] Add migration for 3.1.0-b2
  [prep-release-3.1.0-b2] Update version to 3.1.0-b2
2014-03-30 23:01:52 +02:00
David King
cbd60c38a4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12326] Correctly format update/index.php and remove php closing tag
  [ticket/12326] Do not add deleted files to the list of changed files
2014-03-30 16:04:37 -04:00
Joas Schilling
a1e2d97ae7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12330] Fix create index in db tools on mssql
2014-03-30 19:24:39 +02:00
Andreas Fischer
70e876d5d8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
2014-03-30 15:40:50 +02:00
Andreas Fischer
951a289c09 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png
2014-03-30 15:37:30 +02:00
Joas Schilling
c882c40276 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12324] Correctly create di container if config/ is missing from update/
2014-03-30 13:23:07 +02:00
Nils Adermann
99553183ab Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11459] 3.0.1-RC1 should depend on 3.0.0 migration
2014-03-29 16:53:18 -04:00
Nils Adermann
5bac5b8575 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
2014-03-29 16:29:44 -04:00
Nils Adermann
f1f162d741 Merge pull request #2172 from nickvergessen/ticket/11459
[Ticket/11459] Deduplicate database schema definiton
2014-03-29 16:28:12 -04:00
Joas Schilling
d5e4863b3d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
  [ticket/11959] Add unit tests.
  [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
  [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
  [ticket/11959] Simplify how the users are trimmed.
  [ticket/11959] Add function to create a string list.
  [ticket/11959] Add samples for the untrimmed strings.
  [ticket/11959] List the last user with "and" instead of a comma.
  [ticket/11959] Use the plurals system for the untrimmed language strings.
  [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
  [ticket/11959] Use plurals for the language strings.
2014-03-29 20:39:33 +01:00
Joas Schilling
895ea50788 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
2014-03-29 17:50:19 +01:00
Joas Schilling
6ce75f4e3b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12298] Template Event memberlist_view_contact_before/after
2014-03-29 17:43:36 +01:00
Joas Schilling
2fa64b7b7d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12301] Template Event overall_header_body_before
2014-03-29 16:42:42 +01:00
Joas Schilling
751d43a142 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12308] Template Event forumlist_body_last_row_after
2014-03-29 12:51:04 +01:00
Joas Schilling
0c4b96154b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12304] Add CSS class to rules-link container
2014-03-29 12:36:41 +01:00
Joas Schilling
6770e224fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12309] Template Event quickreply_editor_panel_before/after
2014-03-29 12:18:10 +01:00
Joas Schilling
4e60f7e0fa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12276] Expand core.memberlist_view_profile
  [ticket/12276] Expand core.memberlist_view_profile
2014-03-29 12:10:49 +01:00
Joas Schilling
3b124a8048 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12300] Make only red topic/forum row icons clickable to unread posts
  [ticket/12300] Fix broken link to last post in topic subscriptions list
  [ticket/12300] Fix alignment of clickable icons
  [ticket/12300] Make all topic row icons clickable
  [ticket/12300] Rename new class for row icon links
  [ticket/12300] Make topic icon links clickable to newest unread posts
  [ticket/12300] Revert topic title links back to default behavior
2014-03-29 11:46:47 +01:00
Joas Schilling
13d30b0b0e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/9725] Code sniffer fixes
  [ticket/9725] Do not use deprecated views to remove default constraints
  [ticket/9725] Move primary key creation to the correct location
  [ticket/9725] Remove trailing spaces from MSSQL schema
  [ticket/9725] Create MSSQL primary keys if none exist
  [ticket/9725] Remove explicit filegroup designations
  [ticket/9725] Fetch Azure db stats from proper table
  [ticket/9725] Add dummy indexes for Azure
  [ticket/9725] Create an Azure SQL compatible Schema
2014-03-29 10:51:23 +01:00
Nils Adermann
1c6b3fe073 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12317] Cast string to int to refix DBMSes not using int for integers.
  [ticket/12317] Fix notification tests for DBMSes returning integers as int.
  [ticket/12317] Do not repeat SQL query in notification_submit_post_base.
  [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslash
2014-03-28 22:28:13 -04:00
Joas Schilling
cff5c8ac38 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11336] Adds 301 info to redirect
  [ticket/11336] Adds redirect for old "leaders" mode
  [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
  [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
2014-03-28 23:32:20 +01:00
Joas Schilling
e361896d07 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
2014-03-28 19:31:46 +01:00
Joas Schilling
c2214705a6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11666] Rewording POST_DELETED and
  [ticket/11666] Removing MESSAGE_DELETED..
2014-03-28 17:43:13 +01:00
Joas Schilling
f0c9240e8f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12311] Use British-English spelling of licence in lang file
  [ticket/12311] Use valid composer schema - license - for extensions
2014-03-28 17:31:57 +01:00
Joas Schilling
a0f0ffc236 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11230] Add missing last returns to dock block
  [ticket/11230] Update cache driver dock blocks
  [ticket/11230] Use inheritdoc in docblocks in cache drivers
2014-03-28 17:27:36 +01:00
Joas Schilling
95b0ee3724 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11360] Updating default value of $display_online_list
  [ticket/11360] Avoiding online list where not required
  [ticket/11360] Change second parameter in page_header function
2014-03-28 17:07:50 +01:00
Joas Schilling
3bb843190f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
2014-03-27 14:33:20 +01:00
Nils Adermann
20422c174e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12310] Don't autocomplete SMTP user/pass on install
2014-03-26 23:36:18 -04:00
Andreas Fischer
1033a1fa12 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12302] Added `--no-dev` to composer call in build.xml
  [ticket/12302] Updated composer.phar to 1.0.0-alpha8
2014-03-25 17:34:19 +01:00
Joas Schilling
a0f8e79612 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
2014-03-24 20:58:56 +01:00
Joas Schilling
829f76c81d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12297] Delete user_from column on update
2014-03-24 20:46:33 +01:00
Cesar G
d72cd6192b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12292] Fix syntax error in admin.css
2014-03-22 20:51:06 -07:00
Dhruv
f7718f8647 Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12268] Do not use substr but just compare the character
  [ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.php
  [ticket/12268] Move class out of extension namespace and rename it
  [ticket/12268] Do not search in folders starting with a dot
  [ticket/12268] Use FilesystemIterator::SKIP_DOTS
  [ticket/12268] Extension finder should not crawl through .git/ of extensions
2014-03-23 02:40:44 +05:30
Joas Schilling
5e17e8c2dd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12289] Add viewtopic template events for posts specific custom notices
2014-03-22 21:36:19 +01:00
Joas Schilling
efb36b4e73 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page
2014-03-22 15:14:02 +01:00
Joas Schilling
28347089ce Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11904] Update explanation for what Allow CDN does
2014-03-22 15:01:31 +01:00
Joas Schilling
79604d5a43 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11357] Correcting invalid markup
2014-03-22 14:16:04 +01:00
Joas Schilling
61062969a9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12292] Improve style details page
2014-03-22 13:23:02 +01:00
Andreas Fischer
b0d8f486bb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php events.
2014-03-22 02:39:03 +01:00
1636 changed files with 78014 additions and 47049 deletions

18
.editorconfig Normal file
View File

@@ -0,0 +1,18 @@
# This file is for standardising the coding style between different editors
# http://editorconfig.org/
root = true
[*]
end_of_line = lf
indent_size = 4
indent_style = tab
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false
[*.yml]
indent_size = 4
indent_style = space

11
.gitignore vendored
View File

@@ -1,9 +1,8 @@
*~
/phpunit.xml
/phpBB/cache/twig/*
/phpBB/cache/*.html
/phpBB/cache/*.php
/phpBB/cache/*.lock
/phpBB/cache/*
!/phpBB/cache/.htaccess
!/phpBB/cache/index.html
/phpBB/composer.phar
/phpBB/config*.php
/phpBB/ext/*
@@ -11,13 +10,15 @@
/phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/*
/phpBB/images/ranks/*
/phpBB/install/schemas/schema.json
/phpBB/language/*
!/phpBB/language/en
/phpBB/store/*
/phpBB/styles/*
!/phpBB/styles/prosilver
!/phpBB/styles/subsilver2
!/phpBB/styles/all
/phpBB/vendor
/tests/phpbb_unit_tests.sqlite*
/tests/test_config*.php
/tests/tmp/*
/tests/vendor

78
.jscsrc Normal file
View File

@@ -0,0 +1,78 @@
{
"excludeFiles": ["node_modules/**", "**/build/**"],
"requireCurlyBraces": [
"if", "else", "for", "while", "do", "try", "catch"
],
"requireSpaceBeforeKeywords": [
"else", "while", "catch"
],
"requireSpaceAfterKeywords": [
"do", "for", "if", "else", "switch", "case", "try", "catch", "while", "return", "typeof"
],
"requireSpaceBeforeBlockStatements": true,
"requireParenthesesAroundIIFE": true,
"requireSpacesInConditionalExpression": {
"afterTest": true,
"beforeConsequent": true,
"afterConsequent": true,
"beforeAlternate": true
},
"requireSpacesInAnonymousFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"disallowSpacesInNamedFunctionExpression": {
"beforeOpeningRoundBrace": true
},
"requireSpacesInFunction": {
"beforeOpeningCurlyBrace": true
},
"disallowSpacesInCallExpression": true,
"requireBlocksOnNewline": true,
"requirePaddingNewlinesBeforeKeywords": ["case"],
"disallowEmptyBlocks": true,
"disallowSpacesInsideArrayBrackets": "nested",
"disallowSpacesInsideParentheses": true,
"requireSpacesInsideObjectBrackets": "all",
"disallowQuotedKeysInObjects": "allButReserved",
"disallowSpaceAfterObjectKeys": true,
"requireSpaceBeforeObjectValues": true,
"requireCommaBeforeLineBreak": true,
"requireOperatorBeforeLineBreak": [
"?", "=", "+", "-", "/", "*", "===", "!==", ">", ">=", "<", "<="
],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"requireSpaceBeforeBinaryOperators": [
"=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">="
],
"requireSpaceAfterBinaryOperators": [
"=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">="
],
"disallowKeywords": ["with"],
"disallowMultipleLineStrings": true,
"disallowMixedSpacesAndTabs": "smart",
"disallowTrailingWhitespace": true,
"disallowTrailingComma": true,
"disallowKeywordsOnNewLine": ["else"],
"requireLineFeedAtFileEnd": true,
"maximumLineLength": {
"value": 120,
"tabSize": 4,
"allowUrlComments": true,
"allowRegex": true
},
"requireCapitalizedConstructors": true,
"requireDotNotation": true,
"disallowYodaConditions": true,
"requireSpaceAfterLineComment": {
"allExcept": ["#", "="]
},
"disallowNewlineBeforeBlockStatements": true,
"validateQuoteMarks": {
"mark": "'",
"escape": true
},
"validateParameterSeparator": ", ",
"safeContextKeyword": ["that"]
}

24
.jshintrc Normal file
View File

@@ -0,0 +1,24 @@
{
"bitwise": true,
"curly": true,
"eqeqeq": true,
"es3": true,
"forin": false,
"freeze": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonbsp": true,
"undef": true,
"unused": true,
"strict": true,
"browser": true,
"devel": true,
"jquery": true,
"globals": {
"JSON": true
}
}

View File

@@ -2,12 +2,10 @@ language: php
matrix:
include:
- php: 5.3.3
env: DB=mysqli
- php: 5.3
env: DB=mysqli # MyISAM
- php: 5.4
env: DB=mysqli
env: DB=none;NOTESTS=1
- php: 5.4
env: DB=mysqli # MyISAM
- php: 5.4
env: DB=mysql
- php: 5.4
@@ -16,10 +14,14 @@ matrix:
env: DB=postgres
- php: 5.4
env: DB=sqlite3
- php: 5.4
env: DB=mysqli;SLOWTESTS=1
- php: 5.5
env: DB=mysqli
- php: 5.6
env: DB=mysqli
- php: 7.0
env: DB=mysqli
- php: hhvm
env: DB=mysqli
allow_failures:
@@ -30,16 +32,18 @@ services:
- redis-server
install:
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
before_script:
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
- phantomjs --webdriver=8910 > /dev/null &
script:
- travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
- travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION
- travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
- travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
- travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
- travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
- sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi"
- sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
- sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"

6
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,6 @@
## CONTRIBUTE
1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
4. Send us a pull request

View File

@@ -27,9 +27,9 @@ To be able to run an installation from the repo (and not from a pre-built packag
We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below:
* develop [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop)](http://travis-ci.org/phpbb/phpbb)
* develop-ascraeus [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop-ascraeus)](http://travis-ci.org/phpbb/phpbb)
* develop-olympus [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb)
* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=master)](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version
* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.0.x)](http://travis-ci.org/phpbb/phpbb) **3.0.x** - Development of version 3.0.x
## LICENSE

View File

@@ -2,9 +2,9 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
<property name="newversion" value="3.1.0-RC3" />
<property name="prevversion" value="3.1.0-RC2" />
<property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1" />
<property name="newversion" value="3.2.0-a1" />
<property name="prevversion" value="3.1.6" />
<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -75,14 +75,14 @@
<target name="sniff">
<exec command="phpBB/vendor/bin/phpcs
-s
-s -p
--extensions=php
--standard=build/code_sniffer/ruleset-php-strict-core.xml
--ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/*
phpBB/phpbb"
dir="." returnProperty="retval-php-strict" passthru="true" />
<exec command="phpBB/vendor/bin/phpcs
-s
-s -p
--extensions=php
--standard=build/code_sniffer/ruleset-php-legacy-core.xml
--ignore=${project.basedir}/phpBB/cache/*
@@ -98,7 +98,7 @@
phpBB"
dir="." returnProperty="retval-php-legacy" passthru="true" />
<exec command="phpBB/vendor/bin/phpcs
-s
-s -p
--extensions=php
--standard=build/code_sniffer/ruleset-php-extensions.xml
--ignore=${project.basedir}/phpBB/ext/*/tests/*
@@ -117,9 +117,16 @@
</if>
</target>
<!-- Builds docs for current branch into build/api/output/master -->
<target name="docs">
<exec dir="."
command="phpBB/vendor/bin/sami.php update build/sami.conf.php"
command="phpBB/vendor/bin/sami.php update build/sami-checkout.conf.php"
passthru="true" />
</target>
<!-- Builds docs for multiple branches/tags into build/api/output/$branch -->
<target name="docs-all">
<exec dir="."
command="phpBB/vendor/bin/sami.php update build/sami-all.conf.php"
passthru="true" />
</target>
@@ -142,7 +149,7 @@
<property name="dir" value="build/old_versions/release-${version}" />
</phingcall>
<exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} >
<exec dir="build/old_versions" command="LC_ALL=C diff -crNEBZbd release-${version} release-${newversion} >
../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" />
<exec dir="build/old_versions" command="LC_ALL=C diff -qr release-${version} release-${newversion} | grep 'Only in release-${version}' > ../new_version/patches/phpBB-${version}_to_${newversion}.deleted" escape="false" />
</target>
@@ -170,14 +177,11 @@
<target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs">
<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language >
command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB3/language >
save/phpbb-${prevversion}_to_${newversion}_language.patch" />
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
save/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
<exec dir="build" escape="false"
command="git shortlog --summary --numbered release-${prevversion}...HEAD >
@@ -273,9 +277,14 @@
</else>
</if>
<!-- Create schema.json -->
<exec dir="${dir}" command="php develop/create_schema_files.php" />
<delete file="${dir}/config.php" />
<delete dir="${dir}/develop" />
<delete dir="${dir}/install/data" />
<delete dir="${dir}/config/development" />
<delete dir="${dir}/config/test" />
<phingcall target="clean-vendor-dir">
<property name="dir" value="${dir}" />
@@ -301,69 +310,93 @@
<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
<delete file="${dir}/vendor/patchwork/utf8/.travis.yml" />
<delete file="${dir}/vendor/patchwork/utf8/CHANGELOG.md" />
<delete file="${dir}/vendor/patchwork/utf8/phpunit.xml.dist" />
<delete file="${dir}/vendor/patchwork/utf8/README.md" />
<delete dir="${dir}/vendor/psr/log/Psr/Log/Test" />
<delete file="${dir}/vendor/psr/log/.gitignore" />
<delete file="${dir}/vendor/psr/log/README.md" />
<delete dir="${dir}/vendor/symfony/config/Symfony/Component/Config/Tests" />
<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/.gitignore" />
<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/README.md" />
<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/phpunit.xml.dist" />
<delete dir="${dir}/vendor/s9e/text-formatter/.git" />
<delete dir="${dir}/vendor/symfony/console/Symfony/Component/Console/Tests" />
<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/.gitignore" />
<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/README.md" />
<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/config/.git" />
<delete dir="${dir}/vendor/symfony/config/Tests" />
<delete file="${dir}/vendor/symfony/config/.gitignore" />
<delete file="${dir}/vendor/symfony/config/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/config/README.md" />
<delete file="${dir}/vendor/symfony/config/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/debug/Symfony/Component/Debug/Tests" />
<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/.gitignore" />
<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/README.md" />
<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/console/.git" />
<delete dir="${dir}/vendor/symfony/console/Tests" />
<delete file="${dir}/vendor/symfony/console/.gitignore" />
<delete file="${dir}/vendor/symfony/console/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/console/README.md" />
<delete file="${dir}/vendor/symfony/console/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests" />
<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore" />
<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md" />
<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/debug/.git" />
<delete dir="${dir}/vendor/symfony/debug/Tests" />
<delete file="${dir}/vendor/symfony/debug/.gitignore" />
<delete file="${dir}/vendor/symfony/debug/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/debug/README.md" />
<delete file="${dir}/vendor/symfony/debug/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests" />
<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore" />
<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md" />
<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/dependency-injection/.git" />
<delete dir="${dir}/vendor/symfony/dependency-injection/Tests" />
<delete file="${dir}/vendor/symfony/dependency-injection/.gitignore" />
<delete file="${dir}/vendor/symfony/dependency-injection/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/dependency-injection/README.md" />
<delete file="${dir}/vendor/symfony/dependency-injection/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/Tests" />
<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore" />
<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/README.md" />
<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/event-dispatcher/.git" />
<delete dir="${dir}/vendor/symfony/event-dispatcher/Tests" />
<delete file="${dir}/vendor/symfony/event-dispatcher/.gitignore" />
<delete file="${dir}/vendor/symfony/event-dispatcher/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/event-dispatcher/README.md" />
<delete file="${dir}/vendor/symfony/event-dispatcher/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests" />
<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/.gitignore" />
<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md" />
<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/filesystem/.git" />
<delete dir="${dir}/vendor/symfony/filesystem/Tests" />
<delete file="${dir}/vendor/symfony/filesystem/.gitignore" />
<delete file="${dir}/vendor/symfony/filesystem/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/filesystem/README.md" />
<delete file="${dir}/vendor/symfony/filesystem/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests" />
<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/.gitignore" />
<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md" />
<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/finder/.git" />
<delete dir="${dir}/vendor/symfony/finder/Tests" />
<delete file="${dir}/vendor/symfony/finder/.gitignore" />
<delete file="${dir}/vendor/symfony/finder/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/finder/README.md" />
<delete file="${dir}/vendor/symfony/finder/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/routing/Symfony/Component/Routing/Tests" />
<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/.gitignore" />
<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/README.md" />
<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/http-foundation/.git" />
<delete dir="${dir}/vendor/symfony/http-foundation/Tests" />
<delete file="${dir}/vendor/symfony/http-foundation/.gitignore" />
<delete file="${dir}/vendor/symfony/http-foundation/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/http-foundation/README.md" />
<delete file="${dir}/vendor/symfony/http-foundation/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/Tests" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/README.md" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/http-kernel/.git" />
<delete dir="${dir}/vendor/symfony/http-kernel/Tests" />
<delete file="${dir}/vendor/symfony/http-kernel/.gitignore" />
<delete file="${dir}/vendor/symfony/http-kernel/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/http-kernel/README.md" />
<delete file="${dir}/vendor/symfony/http-kernel/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/routing/.git" />
<delete dir="${dir}/vendor/symfony/routing/Tests" />
<delete file="${dir}/vendor/symfony/routing/.gitignore" />
<delete file="${dir}/vendor/symfony/routing/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/routing/README.md" />
<delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/yaml/.git" />
<delete dir="${dir}/vendor/symfony/yaml/Symfony/Tests" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
<delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />
<delete dir="${dir}/vendor/twig/twig/doc" />
<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -375,6 +408,34 @@
<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
<delete file="${dir}/vendor/twig/twig/README.markdown" />
<delete dir="${dir}/vendor/symfony/security-core/.git" />
<delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
<delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
<delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
<delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/security-csrf/.git" />
<delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
<delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
<delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
<delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
<delete dir="${dir}/vendor/symfony/security/.git" />
<delete dir="${dir}/vendor/symfony/security/Tests" />
<delete file="${dir}/vendor/symfony/security/.gitignore" />
<delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
<delete file="${dir}/vendor/symfony/security/README.md" />
<delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
</target>
<target name="clean-diff-dir">

View File

@@ -20,7 +20,7 @@ if ($_SERVER['argc'] != 2)
$fixVersion = $_SERVER['argv'][1];
$query = 'project = PHPBB3
$query = 'project IN (PHPBB3, SECURITY)
AND resolution = Fixed
AND fixVersion = "' . $fixVersion . '"
AND status IN ("Unverified Fix", Closed)';

View File

@@ -22,11 +22,11 @@ class build_package
// -r - compare recursive
// -N - Treat missing files as empty
// -E - Ignore tab expansions
// not used: -b - Ignore space changes.
// -w - Ignore all whitespace
// -Z - Ignore white space at line end.
// -b - Ignore changes in the amount of white space.
// -B - Ignore blank lines
// -d - Try to find smaller set of changes
var $diff_options = '-crNEBwd';
var $diff_options = '-crNEBZbd';
var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;)
var $verbose = false;

View File

@@ -60,14 +60,14 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
return;
}
// Mark as error if this is not a doc comment
else if ($start === false || $tokens[$start]['code'] !== T_DOC_COMMENT)
else if ($start === false || $tokens[$start]['code'] !== T_DOC_COMMENT_OPEN_TAG)
{
$phpcsFile->addError('Missing required file doc comment.', $stackPtr);
return;
}
// Find comment end token
$end = $phpcsFile->findNext(T_DOC_COMMENT, $start + 1, null, true) - 1;
$end = $tokens[$start]['comment_closer'];
// If there is no end, skip processing here
if ($end === false)
@@ -75,38 +75,30 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
return;
}
// List of found comment tags
$tags = array();
// check comment lines without the first(/**) an last(*/) line
for ($i = $start + 1, $c = $end - 1; $i <= $c; ++$i)
for ($token = $start + 1, $c = $end - 2; $token <= $c; ++$token)
{
$line = $tokens[$i]['content'];
// Check that each line starts with a '*'
if (substr($line, 0, 1) !== '*')
if ($tokens[$token]['column'] === 1 && (($tokens[$token]['content'] !== '*' && $tokens[$token]['content'] !== ' ') || ($tokens[$token]['content'] === ' ' && $tokens[$token + 1]['content'] !== '*')))
{
$message = 'The file doc comment should not be idented.';
$phpcsFile->addWarning($message, $i);
}
else if (preg_match('/^\*\s+@([\w]+)\s+(.*)$/', $line, $match) !== 0)
{
if (!isset($tags[$match[1]]))
{
$tags[$match[1]] = array();
}
$tags[$match[1]][] = array($match[2], $i);
$message = 'The file doc comment should not be indented.';
$phpcsFile->addWarning($message, $token);
}
}
// Check that the first and last line is empty
if (trim($tokens[$start + 1]['content']) !== '*')
// /**T_WHITESPACE
// (T_WHITESPACE)*T_WHITESPACE
// (T_WHITESPACE)* ...
// (T_WHITESPACE)*T_WHITESPACE
// T_WHITESPACE*/
if (!(($tokens[$start + 2]['content'] !== '*' && $tokens[$start + 4]['content'] !== '*') || ($tokens[$start + 3]['content'] !== '*' && $tokens[$start + 6]['content'] !== '*')))
{
$message = 'The first file comment line should be empty.';
$phpcsFile->addWarning($message, ($start + 1));
}
if (trim($tokens[$end - 1]['content']) !== '*')
if ($tokens[$end - 3]['content'] !== '*' && $tokens[$end - 6]['content'] !== '*')
{
$message = 'The last file comment line should be empty.';
$phpcsFile->addWarning($message, $end - 1);
@@ -114,8 +106,8 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
//$this->processPackage($phpcsFile, $start, $tags);
//$this->processVersion($phpcsFile, $start, $tags);
$this->processCopyright($phpcsFile, $start, $tags);
$this->processLicense($phpcsFile, $start, $tags);
$this->processCopyright($phpcsFile, $start, $tokens[$start]['comment_tags']);
$this->processLicense($phpcsFile, $start, $tokens[$start]['comment_tags']);
}
/**
@@ -176,17 +168,24 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
{
$copyright = '(c) phpBB Limited <https://www.phpbb.com>';
$tokens = $phpcsFile->getTokens();
if (!isset($tags['copyright']))
foreach ($tags as $tag)
{
$message = 'Missing require @copyright tag in file doc comment.';
$phpcsFile->addError($message, $ptr);
}
else if ($tags['copyright'][0][0] !== $copyright)
{
$message = 'Invalid content found for the first @copyright tag, use "' . $copyright . '".';
$phpcsFile->addError($message, $tags['copyright'][0][1]);
if ($tokens[$tag]['content'] === '@copyright')
{
if ($tokens[$tag + 2]['content'] !== $copyright)
{
$message = 'Invalid content found for the first @copyright tag, use "' . $copyright . '".';
$phpcsFile->addError($message, $tags['copyright'][0][1]);
}
return;
}
}
$message = 'Missing require @copyright tag in file doc comment.';
$phpcsFile->addError($message, $ptr);
}
/**
@@ -201,22 +200,33 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
{
$license = 'GNU General Public License, version 2 (GPL-2.0)';
$tokens = $phpcsFile->getTokens();
if (!isset($tags['license']))
$found = false;
foreach ($tags as $tag)
{
if ($tokens[$tag]['content'] === '@license')
{
if ($found)
{
$message = 'It must be only one @license tag in file doc comment.';
$phpcsFile->addError($message, $ptr);
}
$found = true;
if ($tokens[$tag + 2]['content'] !== $license)
{
$message = 'Invalid content found for @license tag, use "' . $license . '".';
$phpcsFile->addError($message, $tags['license'][0][1]);
}
}
}
if (!$found)
{
$message = 'Missing require @license tag in file doc comment.';
$phpcsFile->addError($message, $ptr);
}
else if (sizeof($tags['license']) !== 1)
{
$message = 'It must be only one @license tag in file doc comment.';
$phpcsFile->addError($message, $ptr);
}
else if (trim($tags['license'][0][0]) !== $license)
{
$message = 'Invalid content found for @license tag, use '
. '"' . $license . '".';
$phpcsFile->addError($message, $tags['license'][0][1]);
}
}
}

View File

@@ -0,0 +1,143 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
/**
* Checks that the opening brace of a control structures is on the line after.
* From Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff
*/
class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements PHP_CodeSniffer_Sniff
{
/**
* Registers the tokens that this sniff wants to listen for.
*/
public function register()
{
return array(
T_IF,
T_ELSE,
T_FOREACH,
T_WHILE,
T_DO,
T_FOR,
T_SWITCH,
);
}
/**
* Processes this test, when one of its tokens is encountered.
*
* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
* @param int $stackPtr The position of the current token in the
* stack passed in $tokens.
*
* @return void
*/
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
{
$tokens = $phpcsFile->getTokens();
if (isset($tokens[$stackPtr]['scope_opener']) === false)
{
return;
}
/*
* ...
* }
* else if ()
* {
* ...
*/
if ($tokens[$stackPtr]['code'] === T_ELSE && $tokens[$stackPtr + 2]['code'] === T_IF)
{
return;
}
$openingBrace = $tokens[$stackPtr]['scope_opener'];
/*
* ...
* do
* {
* <code>
* } while();
* ...
* }
* else
* {
* ...
*/
if ($tokens[$stackPtr]['code'] === T_DO ||$tokens[$stackPtr]['code'] === T_ELSE)
{
$cs_line = $tokens[$stackPtr]['line'];
}
else
{
// The end of the function occurs at the end of the argument list. Its
// like this because some people like to break long function declarations
// over multiple lines.
$cs_line = $tokens[$tokens[$stackPtr]['parenthesis_closer']]['line'];
}
$braceLine = $tokens[$openingBrace]['line'];
$lineDifference = ($braceLine - $cs_line);
if ($lineDifference === 0)
{
$error = 'Opening brace should be on a new line';
$phpcsFile->addError($error, $openingBrace, 'BraceOnSameLine');
return;
}
if ($lineDifference > 1)
{
$error = 'Opening brace should be on the line after the declaration; found %s blank line(s)';
$data = array(($lineDifference - 1));
$phpcsFile->addError($error, $openingBrace, 'BraceSpacing', $data);
return;
}
// We need to actually find the first piece of content on this line,
// as if this is a method with tokens before it (public, static etc)
// or an if with an else before it, then we need to start the scope
// checking from there, rather than the current token.
$lineStart = $stackPtr;
while (($lineStart = $phpcsFile->findPrevious(array(T_WHITESPACE), ($lineStart - 1), null, false)) !== false)
{
if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false)
{
break;
}
}
// We found a new line, now go forward and find the first non-whitespace
// token.
$lineStart = $phpcsFile->findNext(array(T_WHITESPACE), $lineStart, null, true);
// The opening brace is on the correct line, now it needs to be
// checked to be correctly indented.
$startColumn = $tokens[$lineStart]['column'];
$braceIndent = $tokens[$openingBrace]['column'];
if ($braceIndent !== $startColumn)
{
$error = 'Opening brace indented incorrectly; expected %s spaces, found %s';
$data = array(
($startColumn - 1),
($braceIndent - 1),
);
$phpcsFile->addError($error, $openingBrace, 'BraceIndent', $data);
}
}
}

View File

@@ -0,0 +1,60 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
/**
* Checks that there is exactly one space between the keyword and the opening
* parenthesis of a control structures.
*/
class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements PHP_CodeSniffer_Sniff
{
/**
* Registers the tokens that this sniff wants to listen for.
*/
public function register()
{
return array(
T_IF,
T_FOREACH,
T_WHILE,
T_FOR,
T_SWITCH,
T_ELSEIF,
T_CATCH,
);
}
/**
* Processes this test, when one of its tokens is encountered.
*
* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
* @param int $stackPtr The position of the current token in the
* stack passed in $tokens.
*
* @return void
*/
public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
{
$tokens = $phpcsFile->getTokens();
if ($tokens[$stackPtr + 1]['content'] === '(')
{
$error = 'There should be exactly one space between the keyword and opening parenthesis';
$phpcsFile->addError($error, $stackPtr, 'NoSpaceBeforeOpeningParenthesis');
}
else if ($tokens[$stackPtr + 1]['content'] !== ' ')
{
$error = 'There should be exactly one space between the keyword and opening parenthesis';
$phpcsFile->addError($error, $stackPtr, 'IncorrectSpaceBeforeOpeningParenthesis');
}
}
}

View File

@@ -24,6 +24,23 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
return array(T_USE);
}
protected function check($phpcsFile, $found_name, $full_name, $short_name, $line)
{
if ($found_name === $full_name)
{
$error = 'Either use statement or full name must be used.';
$phpcsFile->addError($error, $line, 'FullName');
}
if ($found_name === $short_name)
{
return true;
}
return false;
}
/**
* {@inheritdoc}
*/
@@ -74,16 +91,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));
if ($simple_class_name === $class_name_full)
{
$error = 'Either use statement or full name must be used.';
$phpcsFile->addError($error, $simple_statement, 'FullName');
}
if ($simple_class_name === $class_name_short)
{
$ok = true;
}
$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) ? true : $ok;
}
}
@@ -98,16 +106,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
$paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start)));
if ($paamayim_nekudotayim_class_name === $class_name_full)
{
$error = 'Either use statement or full name must be used.';
$phpcsFile->addError($error, $paamayim_nekudotayim, 'FullName');
}
if ($paamayim_nekudotayim_class_name === $class_name_short)
{
$ok = true;
}
$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) ? true : $ok;
}
// Checks in implements
@@ -126,16 +125,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
$implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start)));
if ($implements_class_name === $class_name_full)
{
$error = 'Either use statement or full name must be used.';
$phpcsFile->addError($error, $implements, 'FullName');
}
if ($implements_class_name === $class_name_short)
{
$ok = true;
}
$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) ? true : $ok;
}
}
@@ -145,34 +135,67 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
{
$old_function_declaration = $function_declaration;
$end_function = $phpcsFile->findNext(array(T_CLOSE_PARENTHESIS), ($function_declaration + 1));
$old_argument = $function_declaration;
while (($argument = $phpcsFile->findNext(T_VARIABLE, ($old_argument + 1), $end_function)) !== false)
// Check docblocks
$find = array(
T_COMMENT,
T_DOC_COMMENT_CLOSE_TAG,
T_DOC_COMMENT,
T_CLASS,
T_FUNCTION,
T_OPEN_TAG,
);
$comment_end = $phpcsFile->findPrevious($find, ($function_declaration - 1));
if ($comment_end !== false)
{
$old_argument = $argument;
$start_argument = $phpcsFile->findPrevious(array(T_OPEN_PARENTHESIS, T_COMMA), $argument);
$argument_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($start_argument + 1), $argument);
// Skip the parameter if no type is defined.
if ($argument_class_name_start !== false)
if ($tokens[$comment_end]['code'] === T_DOC_COMMENT_CLOSE_TAG)
{
$argument_class_name_end = $phpcsFile->findNext($find, ($argument_class_name_start + 1), null, true);
$comment_start = $tokens[$comment_end]['comment_opener'];
foreach ($tokens[$comment_start]['comment_tags'] as $tag) {
if ($tokens[$tag]['content'] !== '@param' && $tokens[$tag]['content'] !== '@return' && $tokens[$tag]['content'] !== '@throws') {
continue;
}
$argument_class_name = $phpcsFile->getTokensAsString($argument_class_name_start, ($argument_class_name_end - $argument_class_name_start - 1));
$classes = $tokens[($tag + 2)]['content'];
$space = strpos($classes, ' ');
if ($space !== false) {
$classes = substr($classes, 0, $space);
}
if ($argument_class_name === $class_name_full)
{
$error = 'Either use statement or full name must be used.';
$phpcsFile->addError($error, $function_declaration, 'FullName');
}
$tab = strpos($classes, "\t");
if ($tab !== false) {
$classes = substr($classes, 0, $tab);
}
if ($argument_class_name === $class_name_short)
{
$ok = true;
$classes = explode('|', str_replace('[]', '', $classes));
foreach ($classes as $class)
{
$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok;
}
}
}
}
// Check type hint
$params = $phpcsFile->getMethodParameters($function_declaration);
foreach ($params as $param)
{
$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) ? true : $ok;
}
}
// Checks in catch blocks
$old_catch = $stackPtr;
while (($catch = $phpcsFile->findNext(T_CATCH, ($old_catch + 1))) !== false)
{
$old_catch = $catch;
$caught_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $catch + 1);
$caught_class_name_end = $phpcsFile->findNext($find, $caught_class_name_start + 1, null, true);
$caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start)));
$ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) ? true : $ok;
}
if (!$ok)

View File

@@ -12,4 +12,7 @@
<!-- Tabs MUST be used for indentation -->
<rule ref="Generic.WhiteSpace.DisallowSpaceIndent" />
<!-- ALL braces MUST be on their own lines. -->
<rule ref="./phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php" />
</ruleset>

View File

@@ -86,4 +86,7 @@
<!-- The ?> closing tag MUST be omitted from files containing only PHP. -->
<rule ref="Zend.Files.ClosingTag" />
<!-- There MUST be one space between control structure and opening parenthesis -->
<rule ref="./phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php" />
</ruleset>

View File

@@ -196,9 +196,10 @@ if (sizeof($package->old_packages))
*/
$copy_relative_directories = array(
'config/' => array(
'recursive' => true,
'copied' => false,
'copy' => array(
'config/*.yml' => 'config',
'config/*' => 'config',
),
),
);
@@ -256,7 +257,15 @@ if (sizeof($package->old_packages))
}
$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_dir_files;
$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
if (isset($data['recursive']) && $data['recursive'])
{
$package->run_command('cp -Rp ' . $source_dir_files . ' ' . $destination_dir);
}
else
{
$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
}
}
$copy_relative_directories[$reference]['copied'] = true;
}
@@ -272,7 +281,7 @@ if (sizeof($package->old_packages))
'adm/style/admin.css' => 'adm/style',
'adm/style/admin.js' => 'adm/style',
'adm/style/ajax.js' => 'adm/style',
'adm/style/install_*' => 'adm/style',
'adm/style/installer_*' => 'adm/style',
'assets/javascript/*' => 'assets/javascript',
);
@@ -394,6 +403,7 @@ if (sizeof($package->old_packages))
$package->run_command('mkdir ' . $package->get('files_directory') . '/release');
$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('files_directory') . '/release');
$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('files_directory') . '/release');
$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/vendor ' . $package->get('files_directory') . '/release');
$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_install.php');
$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_update.php');
@@ -469,22 +479,14 @@ chdir($package->get('dest_dir') . '/install');
// $package->run_command('rm -v database_update.php');
$package->run_command('rm -v install_update.php');
chdir($package->get('dest_dir'));
$package->run_command('mv -v styles/subsilver2 ../subsilver2');
$package->run_command('cp -p docs/COPYING ../subsilver2/license.txt');
chdir($package->locations['package_dir']);
foreach ($compress_programs as $extension => $compress_command)
{
$package->begin_status('Packaging phpBB for ' . $extension);
$package->run_command('rm -v ./release_files/' . $package->get('release_filename') . ".{$extension}");
$package->run_command('rm -v ./release_files/subsilver2_' . $package->get('new_version_number') . ".{$extension}");
// Build Package
$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));
// Build subSilver2 Package
$package->run_command("$compress_command ./release_files/subsilver2_" . $package->get('new_version_number') . '.' . $extension . ' subsilver2');
}
// Microsoft Web PI packaging

31
build/sami-all.conf.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require __DIR__ . '/sami-checkout.conf.php';
$config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
/*
This would be nice, but currently causes various problems that need
debugging.
->addFromTags('release-3.0.*')
->add('3.0.x', '3.0-next (olympus)')
->addFromTags('release-3.1.*')
->add('3.1.x', '3.1-next (ascraeus)')
->add('master')
*/
->add('3.0.x')
->add('3.1.x')
->add('master')
;
return new Sami\Sami($iterator, $config);

View File

@@ -31,23 +31,8 @@ $iterator = Symfony\Component\Finder\Finder::create()
->notPath('data')
;
$versions = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
/*
This would be nice, but currently causes various problems that need
debugging.
->addFromTags('release-3.0.*')
->add('develop-olympus', '3.0-next (olympus)')
->addFromTags('release-3.1.*')
->add('develop-ascraeus', '3.1-next (ascraeus)')
->add('develop')
*/
->add('develop-olympus')
->add('develop-ascraeus')
;
$config = array(
'theme' => 'enhanced',
'versions' => $versions,
'title' => 'phpBB API Documentation',
'build_dir' => __DIR__.'/api/output/%version%',
'cache_dir' => __DIR__.'/api/cache/%version%',

Binary file not shown.

View File

@@ -50,8 +50,8 @@ define('IN_ADMIN', true);
// Some oft used variables
$safe_mode = (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
$file_uploads = (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
$module_id = request_var('i', '');
$mode = request_var('mode', '');
$module_id = $request->variable('i', '');
$mode = $request->variable('mode', '');
// Set custom style for admin area
$template->set_custom_style(array(

View File

@@ -284,8 +284,6 @@
</fieldset>
</form>
<br />
<form id="change_ext" method="post" action="{U_ACTION}">
<fieldset class="tabulated">

View File

@@ -12,7 +12,7 @@
<!-- BEGIN avatar_local_col -->
<li>
<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}"<!-- IF avatar_local_row.avatar_local_col.CHECKED -->checked="checked"<!-- ENDIF --> /></label>
</li>
<!-- END avatar_local_col -->
<!-- END avatar_local_row -->

View File

@@ -6,6 +6,14 @@
<p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
<p>{L_ACP_VC_EXT_GET_MORE}</p>
<!-- IF ERROR_MSG -->
<div class="errorbox">
<h3>{L_WARNING}</h3>
<p>{ERROR_MSG}</p>
</div>
<!-- ENDIF -->
<form id="acp_captcha" method="post" action="{U_ACTION}">

View File

@@ -47,6 +47,8 @@
<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
</dl>
<!-- EVENT acp_email_options_after -->
<p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />

View File

@@ -7,7 +7,7 @@
<p>{L_EXTENSIONS_EXPLAIN}</p>
<fieldset class="quick">
<span class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
</fieldset>
<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
@@ -47,8 +47,8 @@
<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
</tr>
<!-- BEGIN enabled -->
<tr class="ext_enabled">
<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
<tr class="ext_enabled row-highlight">
<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong></td>
<td style="text-align: center;">
<!-- IF enabled.S_VERSIONCHECK -->
<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
@@ -72,8 +72,8 @@
<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
</tr>
<!-- BEGIN disabled -->
<tr class="ext_disabled">
<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
<tr class="ext_disabled row-highlight">
<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong></td>
<td style="text-align: center;">
<!-- IF disabled.S_VERSIONCHECK -->
<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
@@ -97,6 +97,12 @@
</table>
<table class="table1">
<tr>
<th>{L_EXTENSION_INSTALL_HEADLINE}</th>
</tr>
<tr>
<td class="row3">{L_EXTENSION_INSTALL_EXPLAIN}</td>
</tr>
<tr>
<th>{L_EXTENSION_UPDATE_HEADLINE}</th>
</tr>

View File

@@ -111,6 +111,7 @@
<fieldset>
<legend>{L_FORUM_SETTINGS}</legend>
<!-- EVENT acp_forums_main_settings_prepend -->
<dl>
<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>
<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
@@ -182,6 +183,7 @@
<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>
<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
</dl>
<!-- EVENT acp_forums_main_settings_append -->
</fieldset>
<div id="forum_cat_options">
@@ -198,6 +200,7 @@
<div id="forum_post_options">
<fieldset>
<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
<!-- EVENT acp_forums_normal_settings_prepend -->
<dl>
<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>
<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
@@ -246,6 +249,7 @@
<fieldset>
<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
<!-- EVENT acp_forums_prune_settings_prepend -->
<dl>
<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -291,6 +295,7 @@
<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
</dl>
<!-- EVENT acp_forums_prune_settings_append -->
</fieldset>
</div>
@@ -317,6 +322,7 @@
<div id="forum_rules_options">
<fieldset>
<legend>{L_FORUM_RULES}</legend>
<!-- EVENT acp_forums_rules_settings_prepend -->
<dl>
<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
@@ -334,8 +340,11 @@
<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
</dl>
<!-- EVENT acp_forums_rules_settings_append -->
</fieldset>
</div>
<!-- EVENT acp_forums_custom_settings -->
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>

View File

@@ -7,7 +7,7 @@
<script type="text/javascript" defer="defer">
// <![CDATA[
<!-- IF S_ADD_CODE -->
var smiley = Array();
<!-- BEGIN smile -->
smiley['{smile.SMILEY_URL}'] = Array();
@@ -37,10 +37,10 @@
}
}
}
<!-- ENDIF -->
function toggle_select(icon, display, select)
{
var disp = document.getElementById('order_disp_' + select);
@@ -89,6 +89,9 @@
<!-- ENDIF -->
<td>{L_WIDTH}</td>
<td>{L_HEIGHT}</td>
<!-- IF not S_SMILIES -->
<td>{L_ALT_TEXT}</td>
<!-- ENDIF -->
<td>{L_DISPLAY_ON_POSTING}</td>
<!-- IF ID or S_ADD -->
<td>{L_ORDER}</td>
@@ -101,8 +104,8 @@
<tbody>
<!-- BEGIN items -->
<tr>
<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="{items.TEXT_ALT}" title="{items.TEXT_ALT}" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
<td style="vertical-align: top;">[{items.IMG}]</td>
<!-- IF S_SMILIES -->
<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
@@ -110,6 +113,9 @@
<!-- ENDIF -->
<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
<!-- IF not S_SMILIES -->
<td><input class="text post" type="text" name="alt[{items.IMG}]" value="{items.ALT}" size="10" maxlength="50" /></td>
<!-- ENDIF -->
<td>
<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
<!-- IF items.S_ID -->
@@ -121,7 +127,7 @@
<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
</select></td>
<!-- ENDIF -->
<!-- ENDIF -->
<!-- IF S_ADD -->
<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
<!-- ENDIF -->
@@ -147,6 +153,8 @@
</tr>
<!-- ENDIF -->
<!-- ELSE -->
</thead>
<tbody>
<tr class="row3">
<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
</tr>
@@ -174,7 +182,7 @@
<fieldset>
<legend>{L_IMPORT}</legend>
<!-- IF not S_PAK_OPTIONS -->
<p>{L_NO_PAK_OPTIONS}</p>
@@ -259,7 +267,7 @@
</table>
<div class="pagination">
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- INCLUDE pagination.html -->
<!-- ENDIF -->
</div>
<p class="quick">

View File

@@ -2,14 +2,12 @@
<a id="maincontent"></a>
<h2>{L_INACTIVE_USERS}</h2>
<h1>{L_INACTIVE_USERS}</h1>
<p>{L_INACTIVE_USERS_EXPLAIN}</p>
<form id="inactive" method="post" action="{U_ACTION}">
<div class="clearfix"></div>
<!-- IF .pagination -->
<div class="pagination">
<!-- INCLUDE pagination.html -->
@@ -20,6 +18,7 @@
<thead>
<tr>
<th>{L_USERNAME}</th>
<th>{L_EMAIL}</th>
<th>{L_JOINED}</th>
<th>{L_INACTIVE_DATE}</th>
<th>{L_LAST_VISIT}</th>
@@ -34,6 +33,7 @@
{inactive.USERNAME_FULL}
<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
</td>
<td style="vertical-align: top;">{inactive.USER_EMAIL}</td>
<td style="vertical-align: top;">{inactive.JOINED}</td>
<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>

View File

@@ -39,7 +39,7 @@
</dl>
<dl>
<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" autocomplete="off" /></dd>
</dl>
<!-- IF S_CAN_USE_SSL -->
<dl>

View File

@@ -68,6 +68,10 @@
<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
<fieldset class="quick">
<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.1" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
</fieldset>
<table class="table1 zebra-table">
<thead>
<tr>

View File

@@ -8,7 +8,7 @@
<form id="list" method="post" action="{U_ACTION}">
<fieldset class="display-options" style="float: left">
<fieldset class="display-options search-box">
{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</fieldset>
@@ -18,9 +18,6 @@
</div>
<!-- ENDIF -->
<div class="clearfix">&nbsp;</div>
<div><br style="clear: both;" /></div>
<!-- IF .log -->
<table class="table1 zebra-table fixed-width-table">
<thead>

View File

@@ -141,19 +141,24 @@
<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
<td><strong>{GZIP_COMPRESSION}</strong></td>
</tr>
<!-- IF S_TOTAL_ORPHAN or S_VERSIONCHECK -->
<tr>
<!-- IF S_VERSIONCHECK -->
<td>{L_BOARD_VERSION}{L_COLON} </td>
<td>
<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
</td>
<!-- ENDIF -->
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
<td><strong>{TOTAL_ORPHAN}</strong></td>
<!-- ELSE -->
<!-- ENDIF -->
<!-- IF not S_TOTAL_ORPHAN or not S_VERSIONCHECK -->
<td>&nbsp;</td>
<td>&nbsp;</td>
<!-- ENDIF -->
</tr>
<!-- ENDIF -->
</tbody>
</table>
@@ -243,9 +248,6 @@
<!-- END log -->
</tbody>
</table>
<br />
<!-- ENDIF -->
<!-- IF S_INACTIVE_USERS -->
@@ -287,7 +289,6 @@
<!-- END inactive -->
</tbody>
</table>
<!-- ENDIF -->
<!-- ENDIF -->

View File

@@ -327,14 +327,9 @@
<br class="responsive-hide" /><br class="responsive-hide" />
<!-- include tooltip file -->
<script type="text/javascript" src="style/tooltip.js"></script>
<script type="text/javascript">
// <![CDATA[
window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
// ]]>
</script>
<!-- INCLUDEJS tooltip.js -->
<form id="set-permissions" method="post" action="{U_ACTION}">
<form id="set-permissions" method="post" action="{U_ACTION}" data-role-description="{L_ROLE_DESCRIPTION}">
{S_HIDDEN_FIELDS}

View File

@@ -17,7 +17,7 @@
</div>
<!-- ENDIF -->
<form id="add_profile_field" method="post" action="{U_ACTION}">
<form id="add_profile_field" method="post" action="{U_ACTION}"{S_FORM_ENCTYPE}>
<!-- IF S_STEP_ONE -->
@@ -79,6 +79,7 @@
<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
</dl>
<!-- EVENT acp_profile_contact_before -->
<dl>
<dt><label for="field_is_contact">{L_FIELD_IS_CONTACT}{L_COLON}</label><br /><span>{L_FIELD_IS_CONTACT_EXPLAIN}</span></dt>
<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>

View File

@@ -19,7 +19,7 @@
{S_HIDDEN_FIELDS}
<div style="text-align: center;">
<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp;
<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp;
<input type="submit" name="cancel" value="{L_NO}" class="button2" />
</div>
@@ -32,6 +32,10 @@
<!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
<fieldset class="quick">
<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.1" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
</fieldset>
<form id="acp_styles" method="post" action="{U_ACTION}">
{S_HIDDEN_FIELDS}
{S_FORM_TOKEN}
@@ -83,6 +87,7 @@
<!-- ENDIF -->
<!-- IF .styles_list -->
<!-- EVENT acp_styles_list_before -->
<table class="table1 styles">
<thead>
<tr>
@@ -95,7 +100,7 @@
</thead>
<!-- BEGIN styles_list -->
<tbody id="styles-list-{styles_list.S_ROW_COUNT}">
<tr<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> class="row-inactive"<!-- ENDIF -->>
<tr class="row-highlight<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> row-inactive<!-- ENDIF -->">
<!-- IF styles_list.LEVEL is odd -->
<!-- IF $ROW_CLASS == 'row1a' --><!-- DEFINE $ROW_CLASS = 'row1b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row1a' --><!-- ENDIF -->
<!-- ELSE -->

View File

@@ -1,7 +1,8 @@
<form id="user_profile" method="post" action="{U_ACTION}">
<form id="user_profile" method="post" action="{U_ACTION}"{S_FORM_ENCTYPE}>
<fieldset>
<legend>{L_USER_PROFILE}</legend>
<!-- EVENT acp_users_profile_before -->
<dl>
<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
@@ -10,6 +11,7 @@
<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
</dl>
<!-- EVENT acp_users_profile_after -->
</fieldset>
<!-- IF .profile_fields -->
@@ -26,7 +28,7 @@
<!-- END profile_fields -->
</fieldset>
<!-- ENDIF -->
<!-- EVENT acp_users_profile_custom_after -->
<fieldset class="quick">
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
{S_FORM_TOKEN}

View File

@@ -17,6 +17,10 @@
font-size: 100%;
}
abbr {
text-decoration: none;
}
body, div, p, th, td, li, dd {
font-size: x-small;
voice-family: "\"}\"";
@@ -109,6 +113,14 @@ hr {
text-align: center;
}
.search-box {
float: left;
}
.rtl .search-box {
float: right;
}
.small {
font-size: 0.85em;
}
@@ -154,6 +166,10 @@ a:active {
font-weight: bold;
}
a#maincontent, a#acl, a#assigned_to {
display: block;
}
/* List items */
ul, ol {
list-style-position: inside;
@@ -174,7 +190,6 @@ li {
}
#page-header {
clear: both;
text-align: right;
background: url("../images/phpbb_logo.png") top left no-repeat;
height: 54px;
@@ -203,14 +218,9 @@ li {
}
#page-body {
clear: both;
min-width: 650px;
}
#page-footer {
clear: both;
}
.copyright {
font-size: 0.75em;
text-align: center;
@@ -335,12 +345,6 @@ li {
padding: 0;
}
#tabs > ul:after {
content: '';
display: block;
clear: both;
}
#tabs .tab {
display: inline-block;
float: left;
@@ -475,7 +479,6 @@ li {
/* Main Panel
---------------------------------------- */
#acp {
clear: both;
position: relative;
top: -2px;
margin: 0 0 2px;
@@ -723,6 +726,7 @@ td {
.table1 {
border-collapse: separate;
border-spacing: 1px;
clear: both;
}
dt#color_palette_placeholder table {
@@ -855,6 +859,8 @@ table.zebra-table tbody tr:nth-child(even) {
.row2a { background-color: #E7EEF4; }
.row2b { background-color: #E3EBF2; }
tr.row-highlight:hover td { background-color: #DBDFE2; }
.spacer {
background-color: #DBDFE2;
height: 1px;
@@ -862,10 +868,10 @@ table.zebra-table tbody tr:nth-child(even) {
}
/* Deactivated row */
.row-inactive {
color: #999;
.row-inactive {
color: #999;
}
.row-inactive a, .row-inactive strong {
.row-inactive a, .row-inactive strong {
color: #888;
}
.row-inactive a:hover {
@@ -1132,6 +1138,11 @@ input.langvalue, textarea.langvalue {
width: 90%;
}
input[type="number"] {
width: 60px;
-moz-padding-end: 0;
}
optgroup, select {
background-color: #FAFAFA;
border: 1px solid #666666;
@@ -1226,8 +1237,8 @@ fieldset.quick legend {
fieldset.tabulated {
background: none;
margin: 0;
margin-top: 5px;
padding: 0;
padding-top: 5px;
border: 0;
}
@@ -1464,7 +1475,7 @@ input:focus, textarea:focus {
{
select, dd select, dd input {
max-width: 240px;
}
}
}
/* Submit button fieldset or paragraph
@@ -1676,12 +1687,12 @@ input.button1:focus, input.button2:focus {
height: 1%; /* IE tweak (holly hack) */
width: auto;
text-align: right;
margin-top: 5px;
margin: 5px 0;
}
.top-pagination {
float: right;
margin: 15px 0 2px 0;
margin: 15px 0 5px 0;
}
.rtl .pagination {
@@ -1771,11 +1782,12 @@ li.pagination ul {
/* Action Highlighting
---------------------------------------- */
.successbox, .errorbox {
.successbox, .errorbox, .warningbox {
padding: 8px;
margin: 10px 0;
color: #FFFFFF;
text-align: center;
clear: both;
}
.success {
@@ -1794,6 +1806,10 @@ li.pagination ul {
background-color: #BC2A4D;
}
.warningbox {
background-color: #fca600;
}
.successbox h3, .errorbox h3 {
color: #FFFFFF;
margin: 0 0 0.5em;
@@ -1820,10 +1836,33 @@ li.pagination ul {
font-weight: bold;
}
#log-container {
display: none;
max-height: 300px;
padding: 8px;
margin: 10px 0;
clear: both;
overflow-y: auto;
background-color: #FFFFFF;
}
#log-container.show_log_container {
display: block;
border: 1px solid #DBD7D1;
}
.log {
font-size: 0.8em;
}
.notice {
background-color: #62A5CC;
}
.download-box {
margin: 10px 0 10px 0;
}
/* Special cases for the error page */
#errorpage #page-header a {
font-weight: bold;
@@ -1852,6 +1891,7 @@ li.pagination ul {
color: #000;
text-align: center;
border: 1px solid #AAA;
opacity: .95;
}
.tooltip span.top {
@@ -1877,17 +1917,7 @@ li.pagination ul {
vertical-align: middle;
}
/* Nice method for clearing floated blocks without having to insert any extra markup
From http://www.positioniseverything.net/easyclearing.html
.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}*/
.clearfix, .row, #content, fieldset dl, #page-body {
.row, fieldset dl {
overflow: hidden;
}
@@ -2439,6 +2469,39 @@ fieldset.permissions .padding {
display: none !important;
}
.roles-options > .dropdown {
left: auto;
top: 3em;
width: 250px;
}
.roles-options {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
width: 250px;
}
.roles-options > span {
border: 1px solid #DEDEDE;
border-radius: 3px;
padding: 4px;
width: 250px;
display: block;
background: url('../images/arrow_down.gif') no-repeat 245px .7em;
}
.roles-options li {
list-style: none;
}
.roles-highlight {
background-color: #1e90ff;
color: #fff;
}
/* Classes for additional tasks
---------------------------------------- */
@@ -2470,3 +2533,47 @@ fieldset.permissions .padding {
.responsive-show-inline { display: inline !important; }
.responsive-show-inline-block { display: inline-block !important; }
}
.clearfix {
overflow: hidden;
}
.pagination:after,
#page-header:after,
#page-body:after,
#tabs:after,
#tabs > ul:after,
#tabs li:after,
#acp:after,
#content:after {
content: '';
clear: both;
display: block;
}
#progress-bar {
position: relative;
width: 90%;
height: 25px;
margin: 20px auto;
border: 1px solid #cecece;
}
#progress-bar #progress-bar-text {
position: absolute;
top: 0;
width: 100%;
text-align: center;
line-height: 25px;
font-weight: bold;
}
#progress-bar #progress-bar-filler {
display: block;
position: relative;
top: 0;
left: 0;
background-color: #3c84ad;
width: 0;
height: 25px;
}

View File

@@ -1,6 +1,8 @@
/* global phpbb */
(function($) { // Avoid conflicts with other libraries
"use strict";
'use strict';
/**
* The following callbacks are for reording items. row_down
@@ -13,11 +15,10 @@ phpbb.addAjaxCallback('row_down', function(res) {
return;
}
var el = $(this),
tr = el.parents('tr'),
trSwap = tr.next();
var $firstTr = $(this).parents('tr'),
$secondTr = $firstTr.next();
tr.insertAfter(trSwap);
$firstTr.insertAfter($secondTr);
});
phpbb.addAjaxCallback('row_up', function(res) {
@@ -25,11 +26,10 @@ phpbb.addAjaxCallback('row_up', function(res) {
return;
}
var el = $(this),
tr = el.parents('tr'),
trSwap = tr.prev();
var $secondTr = $(this).parents('tr'),
$firstTr = $secondTr.prev();
tr.insertBefore(trSwap);
$secondTr.insertBefore($firstTr);
});
/**
@@ -38,10 +38,10 @@ phpbb.addAjaxCallback('row_up', function(res) {
* in the href with "deactivate", and vice versa.
*/
phpbb.addAjaxCallback('activate_deactivate', function(res) {
var el = $(this),
newHref = el.attr('href');
var $this = $(this),
newHref = $this.attr('href');
el.text(res.text);
$this.text(res.text);
if (newHref.indexOf('deactivate') !== -1) {
newHref = newHref.replace('deactivate', 'activate');
@@ -49,7 +49,7 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) {
newHref = newHref.replace('activate', 'deactivate');
}
el.attr('href', newHref);
$this.attr('href', newHref);
});
/**
@@ -66,11 +66,10 @@ phpbb.addAjaxCallback('row_delete', function(res) {
$('[data-ajax]').each(function() {
var $this = $(this),
ajax = $this.attr('data-ajax'),
fn;
ajax = $this.attr('data-ajax');
if (ajax !== 'false') {
fn = (ajax !== 'true') ? ajax : null;
var fn = (ajax !== 'true') ? ajax : null;
phpbb.ajaxify({
selector: this,
refresh: $this.attr('data-refresh') !== undefined,
@@ -82,7 +81,7 @@ $('[data-ajax]').each(function() {
/**
* Automatically resize textarea
*/
$(document).ready(function() {
$(function() {
phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
});

View File

@@ -1,32 +1,12 @@
<!-- IF S_RECAPTCHA_AVAILABLE -->
<dl>
<dd>
<script type="text/javascript">
// <![CDATA[
var RecaptchaOptions = {
lang : '{LA_RECAPTCHA_LANG}',
theme : 'clean'
};
// ]]>
</script>
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
<script type="text/javascript">
// <![CDATA[
<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
document.getElementById('recaptcha_table').style.direction = 'ltr';
<!-- ENDIF -->
// ]]>
</script>
<noscript>
<div>
<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
</div>
<div>{L_RECAPTCHA_NOSCRIPT}</div>
</noscript>
<script src="{RECAPTCHA_SERVER}.js?hl={LA_RECAPTCHA_LANG}" async defer></script>
<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}"></div>
</dd>
</dl>
<!-- ELSE -->

View File

@@ -1,134 +0,0 @@
<!-- INCLUDE install_header.html -->
<!-- IF S_NOT_INSTALLED -->
<h1>{TITLE}</h1>
<p>{BODY}</p>
<!-- ELSE -->
<form id="install_convert" method="post" action="{U_ACTION}">
<h1>{TITLE}</h1>
<p>{BODY}</p>
<!-- IF S_ERROR_BOX -->
<div class="errorbox">
<h3>{ERROR_TITLE}</h3>
<p>{ERROR_MSG}</p>
</div>
<!-- ENDIF -->
<!-- IF S_LIST -->
<table class="table1">
<caption>{L_AVAILABLE_CONVERTORS}</caption>
<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
<thead>
<tr>
<th>{L_SOFTWARE}</th>
<th>{L_VERSION}</th>
<th>{L_AUTHOR}</th>
<th>{L_OPTIONS}</th>
</tr>
</thead>
<tbody>
<!-- IF .convertors -->
<!-- BEGIN convertors -->
<tr>
<td>{convertors.SOFTWARE}</td>
<td>{convertors.VERSION}</td>
<td>{convertors.AUTHOR}</td>
<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
</tr>
<!-- END convertors -->
<!-- ELSE -->
<tr>
<td>{L_NO_CONVERTORS}</td>
<td>-</td>
<td>-</td>
<td>-</td>
</tr>
<!-- ENDIF -->
</tbody>
</table>
<!-- ENDIF -->
<!-- IF S_CONTINUE -->
</form>
<fieldset class="submit-buttons">
<form method="post" action="{U_NEW_ACTION}">
<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
</form>
<br />
<form method="post" action="{U_CONTINUE_ACTION}">
<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
</form>
</fieldset>
<form method="post" action="{U_ACTION}">
<!-- ENDIF -->
<!-- IF .checks -->
<fieldset>
<!-- BEGIN checks -->
<!-- IF checks.S_LEGEND -->
<!-- IF not checks.S_FIRST_ROW -->
</fieldset>
<fieldset>
<!-- ENDIF -->
<legend>{checks.LEGEND}</legend>
<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
<!-- ELSE -->
<dl>
<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>{checks.RESULT}</dd>
</dl>
<!-- ENDIF -->
<!-- END checks -->
</fieldset>
<!-- ENDIF -->
<!-- IF .options -->
<fieldset>
<!-- BEGIN options -->
<!-- IF options.S_LEGEND -->
<!-- IF not options.S_FIRST_ROW -->
</fieldset>
<fieldset>
<!-- ENDIF -->
<legend>{options.LEGEND}</legend>
<!-- ELSE -->
<dl>
<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>{options.CONTENT}</dd>
</dl>
<!-- ENDIF -->
<!-- END options -->
</fieldset>
<!-- ENDIF -->
<!-- IF L_SUBMIT -->
<!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF -->
<fieldset class="submit-buttons">
{S_HIDDEN}
<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
</fieldset>
<!-- ENDIF -->
</form>
<!-- ENDIF -->
<!-- INCLUDE install_footer.html -->

View File

@@ -1,8 +0,0 @@
<!-- INCLUDE install_header.html -->
<div class="errorbox">
<h3>{MESSAGE_TITLE}</h3>
<p>{MESSAGE_TEXT}</p>
</div>
<!-- INCLUDE install_footer.html -->

View File

@@ -1,77 +0,0 @@
<!-- INCLUDE install_header.html -->
<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';">
<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
<!-- IF .checks -->
<fieldset>
<!-- BEGIN checks -->
<!-- IF checks.S_LEGEND -->
<!-- IF not checks.S_FIRST_ROW -->
</fieldset>
<fieldset>
<!-- ENDIF -->
<legend>{checks.LEGEND}</legend>
<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
<!-- ELSE -->
<dl>
<dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>{checks.RESULT}</dd>
</dl>
<!-- ENDIF -->
<!-- END checks -->
</fieldset>
<!-- ENDIF -->
<!-- IF .options -->
<fieldset>
<!-- BEGIN options -->
<!-- IF options.S_LEGEND -->
<!-- IF not options.S_FIRST_ROW -->
</fieldset>
<fieldset>
<!-- ENDIF -->
<legend>{options.LEGEND}</legend>
<!-- ELSE -->
<dl>
<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>{options.CONTENT}</dd>
</dl>
<!-- ENDIF -->
<!-- END options -->
</fieldset>
<!-- ENDIF -->
<!-- IF S_SHOW_DOWNLOAD -->
<h1>{L_DL_CONFIG}</h1>
<p>{L_DL_CONFIG_EXPLAIN}</p>
<fieldset class="submit-buttons">
<legend>{L_DL_CONFIG}</legend>
{S_HIDDEN}
<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" />
</fieldset>
<!-- ENDIF -->
<!-- IF L_SUBMIT -->
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>
{S_HIDDEN}
<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
</fieldset>
<!-- ENDIF -->
</form>
<!-- INCLUDE install_footer.html -->

View File

@@ -1,6 +0,0 @@
<!-- INCLUDE install_header.html -->
<h1>{TITLE}</h1>
<p>{BODY}</p>
<!-- INCLUDE install_footer.html -->

View File

@@ -1,491 +0,0 @@
<!-- INCLUDE install_header.html -->
<script type="text/javascript">
// <![CDATA[
function popup(url, width, height, name)
{
if (!name)
{
name = '_popup';
}
window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
return false;
}
function diff_popup(url)
{
popup(url, 950, 600, '_diff');
return false;
}
// ]]>
</script>
<!-- IF S_ERROR -->
<div class="errorbox" style="margin-top: 0;">
<h3>{L_NOTICE}</h3>
<p>{ERROR_MSG}</p>
</div>
<!-- ENDIF -->
<!-- IF S_IN_PROGRESS -->
<div class="successbox" style="margin-top: 0;">
<h3>{L_IN_PROGRESS}</h3>
<p>{L_IN_PROGRESS_EXPLAIN}</p>
</div>
<!-- ELSEIF S_INTRO -->
<!-- IF S_WARNING -->
<div class="successbox" style="margin-top: 0;">
<h3>{L_NOTICE}</h3>
<p>{WARNING_MSG}</p>
</div>
<!-- ENDIF -->
<div class="errorbox" style="margin-top: 0;">
<h3>{L_NOTICE}</h3>
<p>{L_BACKUP_NOTICE}</p>
</div>
<form id="install_update" method="post" action="{U_ACTION}">
<h1>{L_UPDATE_INSTALLATION}</h1>
<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
<fieldset class="submit-buttons">
<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
</fieldset>
</form>
<!-- ELSEIF S_UPLOAD_SUCCESS -->
<form id="install_update" method="post" action="{U_ACTION}">
<h1>{L_UPDATE_SUCCESS}</h1>
<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
<fieldset class="submit-buttons">
<input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}" />
</fieldset>
</form>
<!-- ENDIF -->
<!-- IF S_VERSION_CHECK -->
<h1>{L_VERSION_CHECK}</h1>
<p>{L_VERSION_CHECK_EXPLAIN}</p>
<!-- IF S_UP_TO_DATE -->
<div class="successbox">
<p>{L_VERSION_UP_TO_DATE}</p>
</div>
<!-- ELSE -->
<div class="errorbox">
<p>{L_VERSION_NOT_UP_TO_DATE}</p>
</div>
<!-- ENDIF -->
<fieldset>
<legend></legend>
<dl>
<dt><label>{L_CURRENT_VERSION}</label></dt>
<dd><strong>{CURRENT_VERSION}</strong></dd>
</dl>
<dl>
<dt><label>{L_LATEST_VERSION}</label></dt>
<dd><strong>{LATEST_VERSION}</strong></dd>
</dl>
<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
<dl>
<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
<dd><strong>{PACKAGE_VERSION}</strong></dd>
</dl>
<!-- ENDIF -->
</fieldset>
<form id="install_update" method="post" action="{U_ACTION}">
<fieldset class="submit-buttons">
<p>{L_CHECK_FILES_EXPLAIN}</p>
<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
</fieldset>
</form>
<!-- ELSEIF S_DB_UPDATE -->
<!-- IF not S_DB_UPDATE_FINISHED -->
<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
<p>
{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
</p>
<br /><br />
<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
<fieldset class="submit-buttons">
<a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
<!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
</fieldset>
</form>
<!-- ELSE -->
<div class="successbox">
<h3>{L_UPDATE_SUCCESS}</h3>
<p>{L_EVERYTHING_UP_TO_DATE}</p>
</div>
<!-- ENDIF -->
<!-- ELSEIF S_FILE_CHECK -->
<!-- IF S_ALL_UP_TO_DATE -->
<h1>{L_UPDATE_FILE_SUCCESS}</h1>
<p>{L_ALL_FILES_UP_TO_DATE}</p>
<p>{L_UPDATE_DATABASE_EXPLAIN}</p>
<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
<fieldset class="submit-buttons">
<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
</fieldset>
</form>
<!-- ELSE -->
<h1>{L_COLLECTED_INFORMATION}</h1>
<p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
<!-- IF S_NO_UPDATE_FILES -->
<div class="errorbox">
<h3>{L_NO_UPDATE_FILES}</h3>
<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
<strong>{NO_UPDATE_FILES}</strong>
</div>
<!-- ENDIF -->
<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
<!-- IF .deleted -->
<h2>{L_FILES_DELETED}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('deleted', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_DELETED_EXPLAIN}</p>
<fieldset id="deleted">
<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
<!-- BEGIN deleted -->
<dl>
<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
</dl>
<!-- END deleted -->
</fieldset>
<!-- ENDIF -->
<!-- IF .conflict -->
<h2>{L_FILES_CONFLICT}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_CONFLICT_EXPLAIN}</p>
<!-- BEGIN conflict -->
<fieldset id="conflict">
<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
<dl>
<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
</dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF conflict.S_CUSTOM -->
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
<!-- ENDIF -->
</dl>
<!-- IF conflict.S_BINARY -->
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
</dl>
<!-- ELSE -->
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
</dl>
<!-- ENDIF -->
</fieldset>
<!-- END conflict -->
<!-- ENDIF -->
<!-- IF .new_conflict -->
<h2>{L_FILES_NEW_CONFLICT}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
<fieldset id="new_conflict">
<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
<!-- BEGIN new_conflict -->
<dl>
<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF new_conflict.S_CUSTOM -->
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
<!-- ENDIF -->
</dl>
<!-- END new_conflict -->
</fieldset>
<!-- ENDIF -->
<!-- IF .modified -->
<h2>{L_FILES_MODIFIED}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_MODIFIED_EXPLAIN}</p>
<!-- BEGIN modified -->
<fieldset id="modified">
<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
<dl>
<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
<!-- IF modified.S_CUSTOM -->
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
<!-- ENDIF -->
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
</dl>
</fieldset>
<!-- END modified -->
<!-- ENDIF -->
<!-- IF .new -->
<h2>{L_FILES_NEW}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_files', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_NEW_EXPLAIN}</p>
<fieldset id="new_files" style="display: none;">
<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
<!-- BEGIN new -->
<dl>
<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF new.S_CUSTOM -->
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
<!-- ENDIF -->
</dl>
<!-- END new -->
</fieldset>
<!-- ENDIF -->
<!-- IF .not_modified -->
<h2>{L_FILES_NOT_MODIFIED}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
<fieldset id="not_modified" style="display: none;">
<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
<!-- BEGIN not_modified -->
<dl>
<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
<!-- IF not_modified.S_CUSTOM -->
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
<!-- ENDIF -->
</dl>
<!-- END not_modified -->
</fieldset>
<!-- ENDIF -->
<!-- IF .up_to_date -->
<h2>{L_FILES_UP_TO_DATE}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('up_to_date', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
<fieldset id="up_to_date" style="display: none;">
<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
<!-- BEGIN up_to_date -->
<dl>
<dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd>
</dl>
<!-- END up_to_date -->
</fieldset>
<!-- ENDIF -->
<br />
<fieldset class="quick">
<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
</fieldset>
<br />
<h1>{L_UPDATE_METHOD}</h1>
<p>{L_UPDATE_METHOD_EXPLAIN}</p>
<fieldset class="submit-buttons">
<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
</fieldset>
</form>
<!-- ENDIF -->
<!-- ELSEIF S_DOWNLOAD_FILES -->
<h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
<form id="install_update" method="post" action="{U_ACTION}">
<fieldset>
<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
<dl>
<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>
<dd>{RADIO_BUTTONS}</dd>
</dl>
</fieldset>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
</fieldset>
</form>
<br /><br />
<p>{L_MAPPING_FILE_STRUCTURE}</p>
<table class="table1">
<col class="row1" /><col class="row2" /><col class="row1" />
<thead>
<tr>
<th style="width: 49%">{L_ARCHIVE_FILE}</th>
<th style="width: 2%">&nbsp;</th>
<th style="width: 49%">{L_DESTINATION}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN location -->
<tr>
<td>{location.SOURCE}</td>
<td><strong>&raquo;</strong></td>
<td>{location.DESTINATION}</td>
</tr>
<!-- END location -->
</tbody>
</table>
<!-- ELSEIF S_FTP_UPLOAD -->
<h1>{L_SELECT_FTP_SETTINGS}</h1>
<form id="install_update" method="post" action="{U_ACTION}">
<!-- IF S_CONNECTION_SUCCESS -->
<div class="successbox">
<p>{L_CONNECTION_SUCCESS}</p>
</div>
<!-- ELSEIF S_CONNECTION_FAILED -->
<div class="successbox">
<p>{L_TRY_DOWNLOAD_METHOD}</p>
<fieldset class="quick">
<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
</fieldset>
</div>
<div class="errorbox">
<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
</div>
<!-- ENDIF -->
<fieldset>
<legend>{L_FTP_SETTINGS}</legend>
<dl>
<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>
<dd><strong>{UPLOAD_METHOD}</strong></dd>
</dl>
<!-- BEGIN data -->
<dl>
<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>
<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
</dl>
<!-- END data -->
</fieldset>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
</fieldset>
</form>
<!-- ENDIF -->
<!-- INCLUDE install_footer.html -->

View File

@@ -1,254 +0,0 @@
<!DOCTYPE html>
<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width" />
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>
<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
<script type="text/javascript">
// <![CDATA[
function resize_panel()
{
var block = document.getElementById('diff_content');
var height;
if (window.innerHeight)
{
height = window.innerHeight - 200;
block.style.height = height + 'px';
}
else
{
//whatever IE needs to do this
}
}
window.onresize = resize_panel;
// ]]>
</script>
<style type="text/css">
/* <![CDATA[ */
#main, .rtl #main {
font-size: 1em;
line-height: 0.7em;
margin: 0;
padding: 0;
width: 99%;
}
#diff_content {
padding: 30px 10px 10px;
overflow: hidden;
}
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
div#codepanel {
width: 100%;
}
<!-- ELSE -->
div#codepanel {
background-color: #eee;
}
<!-- ENDIF -->
<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' -->
div#diff_content pre {
overflow: auto;
height: 414px;
width: 100% !important;
}
<!-- ENDIF -->
<!-- IF not S_DIFF_NEW_FILE -->
/**
* Unified Diff
*/
.file {
line-height: .7em;
overflow: auto;
height: 414px;
}
.diff {
margin: 0;
}
.added {
background-color: #dfd;
}
.removed {
background-color: #fdd;
}
.info {
color: #888;
}
.context {
background-color: #eee;
}
/**
* Inline Diff
*/
.ins {
background-color: #dfd;
text-decoration: underline;
}
.del {
background-color: #fdd;
text-decoration: line-through;
}
/**
* Column Diff
*/
table.hrdiff {
margin: 0 0 8px 5px;
width: 100%;
overflow: hidden;
border-bottom: 1px solid #999;
table-layout: fixed;
background: transparent;
}
table.hrdiff th {
text-align: left;
width: 50%;
color: #333;
font-family: Verdana,Helvetica,sans-serif;
font-size: 11px;
border-bottom: 1px solid #999;
border-right: 1px solid #999;
background: #D9D9D9;
}
table.hrdiff thead th {
font-weight: bold;
font-size: 110%;
padding: 2px;
}
table.hrdiff tr:first-child th {
border-top: none;
}
table.hrdiff tbody th {
font-size: 80%;
border-top: 1px solid #999;
}
table.hrdiff tbody td {
border-right: 1px solid #999;
}
table.hrdiff td pre {
font-family: "Consolas", monospace;
font-size: 1.1em;
white-space: pre-wrap; /* css-3 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
}
table.hrdiff .unmodified {
background: transparent;
}
table.hrdiff .added {
background: #9f9;
}
table.hrdiff .added_empty {
background: #cfc;
}
table.hrdiff .modified {
background: #fd9;
}
table.hrdiff .removed {
background: #f99;
}
table.hrdiff .removed_empty {
background: #fcc;
}
table.hrdiff caption {
caption-side: top;
text-align: left;
margin: 0 0 8px 5px;
font-size: 90%;
font-weight: bold;
padding: 5px;
}
table.hrdiff caption span {
height: 10px;
width: 10px;
line-height: 10px;
letter-spacing: 10px;
border: 1px solid #000;
margin-left: 0.5em;
vertical-align: baseline;
}
<!-- ENDIF -->
/* ]]> */
</style>
</head>
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
<body onload="resize_panel();">
<!-- ELSE -->
<body>
<!-- ENDIF -->
<div id="wrap">
<div id="page-header">
<!-- IF S_DIFF_NEW_FILE -->
<h1>{L_VIEWING_FILE_CONTENTS}</h1>
<!-- ELSE -->
<h1>{L_VIEWING_FILE_DIFF}</h1>
<!-- ENDIF -->
<!-- IF not S_DIFF_NEW_FILE -->
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
<form method="post" action="#">
<fieldset class="quick">
<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>
<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
</fieldset>
</form>
<!-- ENDIF -->
<!-- IF S_DIFF_CONFLICT_FILE -->
<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}</strong></div>
<br style="clear: both;" />
<!-- ENDIF -->
</div>
<div id="page-body">
<div id="acp">
<div id="codepanel">
<div id="diff_content">
<div id="main">
{DIFF_CONTENT}
</div>
</div>
</div>
</div>
</div>
<!-- INCLUDE simple_footer.html -->

View File

@@ -1,6 +1,6 @@
</div>
</div><!-- /#main -->
</div>
</div>
</div><!-- /#main -->
</div>
</div><!-- /#acp -->
</div>
@@ -13,7 +13,7 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS admin.js -->
{$SCRIPTS}

View File

@@ -0,0 +1,56 @@
<form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
<!-- IF .options -->
<!-- IF S_NOT_ONLY_BUTTON_FORM -->
<fieldset>
<!-- ENDIF -->
<!-- BEGIN options -->
<!-- IF options.S_LEGEND -->
<!-- IF not options.S_FIRST_ROW -->
</fieldset>
<fieldset>
<!-- ENDIF -->
<legend>{options.LEGEND}</legend>
<!-- ELSE -->
<dl>
<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>
<!-- IF options.TYPE == 'text' -->
<input type="text" name="{options.KEY}" value="{options.DEFAULT}" />
<!-- ENDIF -->
<!-- IF options.TYPE == 'email' -->
<input type="email" name="{options.KEY}" value="{options.DEFAULT}" />
<!-- ENDIF -->
<!-- IF options.TYPE == 'password' -->
<input type="password" name="{options.KEY}" />
<!-- ENDIF -->
<!-- IF options.TYPE == 'select' -->
<select name="{options.KEY}">
<!-- BEGIN options.OPTIONS -->
<option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option>
<!-- END options.OPTIONS -->
</select>
<!-- ENDIF -->
<!-- IF options.TYPE == 'radio' -->
<!-- BEGIN options.OPTIONS -->
<input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label}
<!-- END options.OPTIONS -->
<!-- ENDIF -->
</dd>
</dl>
<!-- ENDIF-->
<!-- END options -->
<!-- IF S_NOT_ONLY_BUTTON_FORM -->
</fieldset>
<!-- ENDIF -->
<!-- ENDIF -->
<!-- IF .submit_buttons -->
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>
<!-- BEGIN submit_buttons -->
<input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" />
<!-- END submit_buttons -->
</fieldset>
<!-- ENDIF -->
</form>

View File

@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width" />
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>
<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
</head>
<body class="{S_CONTENT_DIRECTION} nojs">
@@ -15,10 +15,14 @@
<h1>{L_INSTALL_PANEL}</h1>
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
<!-- IF S_LANG_SELECT -->
<form method="post" action="#">
<form method="post" action="#" id="language_selector">
<fieldset class="nobg">
<label for="language">{L_SELECT_LANG}{L_COLON}</label>
{S_LANG_SELECT}
<select id="language" name="language">
<!-- BEGIN language_select_item -->
<option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
<!-- END language_select_item -->
</select>
<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
</fieldset>
</form>
@@ -28,26 +32,26 @@
<div id="page-body">
<div id="tabs">
<ul>
<!-- BEGIN t_block1 -->
<!-- BEGIN t_block1 -->
<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
<!-- END t_block1 -->
<!-- END t_block1 -->
</ul>
</div>
<div id="acp">
<div id="content">
<div id="menu">
<div class="menu-block no-header">
<div id="content">
<div id="menu">
<div class="menu-block no-header">
<ul>
<!-- BEGIN l_block1 -->
<!-- BEGIN l_block1 -->
<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
<!-- END l_block1 -->
<!-- BEGIN l_block2 -->
<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
<!-- END l_block2 -->
<!-- END l_block1 -->
<!-- BEGIN l_block2 -->
<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
<!-- END l_block2 -->
</ul>
</div>
</div>
</div>
<div id="main" class="install-body">
<div class="main">
<div id="main" class="install-body">
<div class="main">

View File

@@ -0,0 +1,13 @@
<!-- INCLUDE installer_header.html -->
<h1>{TITLE}</h1>
<p>{CONTENT}</p>
<!-- IF SHOW_INSTALL_START_FORM -->
<form id="install_install" method="post" action="{U_ACTION}">
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>
<input class="button1" name="install" type="submit" value="{L_INSTALL}" />
</fieldset>
</form>
<!-- ENDIF -->
<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
<!-- INCLUDE installer_footer.html -->

View File

@@ -0,0 +1,6 @@
<!-- INCLUDE installer_header.html -->
<h1>{TITLE}</h1>
<p>{BODY}</p>
<!-- INCLUDE installer_footer.html -->

View File

@@ -0,0 +1,13 @@
<!-- INCLUDE installer_header.html -->
<h1>{TITLE}</h1>
<p>{CONTENT}</p>
<!-- IF SHOW_INSTALL_START_FORM -->
<form id="install_install" method="post" action="{U_ACTION}">
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>
<input class="button1" name="update" type="submit" value="{L_UPDATE}" />
</fieldset>
</form>
<!-- ENDIF -->
<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
<!-- INCLUDE installer_footer.html -->

View File

@@ -0,0 +1,80 @@
<!-- IF .deleted -->
<h2>{L_FILES_DELETED}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('deleted', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_DELETED_EXPLAIN}</p>
<fieldset id="deleted">
<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
<!-- BEGIN deleted -->
<dl>
<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
</dl>
<!-- END deleted -->
</fieldset>
<!-- ENDIF -->
<!-- IF .conflict -->
<h2>{L_FILES_CONFLICT}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_CONFLICT_EXPLAIN}</p>
<fieldset id="conflict">
<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
<!-- BEGIN conflict -->
<dl>
<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
</dl>
<!-- END conflict -->
</fieldset>
<!-- ENDIF -->
<!-- IF .modified -->
<h2>{L_FILES_MODIFIED}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_MODIFIED_EXPLAIN}</p>
<fieldset id="modified">
<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
<!-- BEGIN modified -->
<dl>
<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
</dl>
<!-- END modified -->
</fieldset>
<!-- ENDIF -->
<!-- IF .new -->
<h2>{L_FILES_NEW}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_files', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_NEW_EXPLAIN}</p>
<fieldset id="new_files" style="display: none;">
<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
<!-- BEGIN new -->
<dl>
<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
</dt>
</dl>
<!-- END new -->
</fieldset>
<!-- ENDIF -->
<!-- IF .not_modified -->
<h2>{L_FILES_NOT_MODIFIED}</h2>
<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
<fieldset id="not_modified" style="display: none;">
<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
<!-- BEGIN not_modified -->
<dl>
<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>
</dl>
<!-- END not_modified -->
</fieldset>
<!-- ENDIF -->

View File

@@ -2,7 +2,7 @@
<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>

View File

@@ -39,11 +39,23 @@
</div>
<dl class="permissions-simple">
<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
<!-- ELSE -->
{% if role_options %}
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
<div class="dropdown hidden">
<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
{% for role in loops.role_options %}
<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
{% endfor %}
</ul>
</div>
<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if S_ROLE_ID %}value="{{ S_ROLE_ID }}"{% endif %} />
</div>
</dd>
{% else %}
<dd>{L_NO_ROLE_AVAILABLE}</dd>
<!-- ENDIF -->
{% endif %}
</dl>
<!-- ENDIF -->

View File

@@ -2,6 +2,7 @@
<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>

View File

@@ -1,17 +1,25 @@
<dl>
<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
<!-- IF S_TZ_DATE_OPTIONS -->
<!-- IF .timezone_date -->
<dd id="tz_select_date" style="display: none;">
<select name="tz_date" id="tz_date" class="autowidth tz_select">
<option value="">{L_SELECT_CURRENT_TIME}</option>
{S_TZ_DATE_OPTIONS}
<!-- BEGIN timezone_date -->
<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
<!-- END timezone_date -->
</select>
</dd>
<!-- ENDIF -->
<dd>
<select name="tz" id="timezone" class="autowidth tz_select">
<option value="">{L_SELECT_TIMEZONE}</option>
{S_TZ_OPTIONS}
<!-- BEGIN timezone_select -->
<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}">
<!-- BEGIN timezone_options -->
<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option>
<!-- END timezone_options -->
</optgroup>
<!-- END timezone_select -->
</select>
<!-- INCLUDEJS timezone.js -->

View File

@@ -10,206 +10,196 @@ phpBB Development Team:
- further adjustements
*/
var head_text, tooltip_mode;
(function($) { // Avoid conflicts with other libraries
'use strict';
var tooltips = [];
/**
* Enable tooltip replacements for links
* Enable tooltip replacements for selects
* @param {string} id ID tag of select
* @param {string} headline Text that should appear on top of tooltip
* @param {string} [subId] Sub ID that should only be using tooltips (optional)
*/
function enable_tooltips_link(id, headline, sub_id) {
var links, i, hold;
phpbb.enableTooltipsSelect = function (id, headline, subId) {
var $links, hold;
head_text = headline;
hold = $('<span />', {
id: '_tooltip_container',
css: {
position: 'absolute'
}
});
if (!document.getElementById || !document.getElementsByTagName) {
return;
}
$('body').append(hold);
hold = document.createElement('span');
hold.id = '_tooltip_container';
hold.setAttribute('id', '_tooltip_container');
hold.style.position = 'absolute';
document.getElementsByTagName('body')[0].appendChild(hold);
if (id === null) {
links = document.getElementsByTagName('a');
if (!id) {
$links = $('.roles-options li');
} else {
links = document.getElementById(id).getElementsByTagName('a');
$links = $('.roles-options li', '#' + id);
}
for (i = 0; i < links.length; i++) {
if (sub_id) {
if (links[i].id.substr(0, sub_id.length) === sub_id) {
prepare(links[i]);
$links.each(function () {
var $this = $(this);
if (subId) {
if ($this.parent().attr('id').substr(0, subId.length) === subId) {
phpbb.prepareTooltips($this, headline);
}
} else {
prepare(links[i]);
phpbb.prepareTooltips($this, headline);
}
}
tooltip_mode = 'link';
}
});
};
/**
* Enable tooltip replacements for selects
* Prepare elements to replace
*
* @param {jQuery} $element Element to prepare for tooltips
* @param {string} headText Text heading to display
*/
function enable_tooltips_select(id, headline, sub_id) {
var links, i, hold;
phpbb.prepareTooltips = function ($element, headText) {
var $tooltip, text, $desc, $title;
head_text = headline;
if (!document.getElementById || !document.getElementsByTagName) {
return;
}
hold = document.createElement('span');
hold.id = '_tooltip_container';
hold.setAttribute('id', '_tooltip_container');
hold.style.position = 'absolute';
document.getElementsByTagName('body')[0].appendChild(hold);
if (id === null) {
links = document.getElementsByTagName('option');
} else {
links = document.getElementById(id).getElementsByTagName('option');
}
for (i = 0; i < links.length; i++) {
if (sub_id) {
if (links[i].parentNode.id.substr(0, sub_id.length) === sub_id) {
prepare(links[i]);
}
} else {
prepare(links[i]);
}
}
tooltip_mode = 'select';
}
/**
* Prepare elements to replace
*/
function prepare(element) {
var tooltip, text, desc, title;
text = element.getAttribute('title');
text = $element.attr('data-title');
if (text === null || text.length === 0) {
return;
}
element.removeAttribute('title');
tooltip = create_element('span', 'tooltip');
$title = $('<span />', {
class: 'top',
css: {
display: 'block'
}
})
.append(document.createTextNode(headText));
title = create_element('span', 'top');
title.appendChild(document.createTextNode(head_text));
tooltip.appendChild(title);
$desc = $('<span />', {
class: 'bottom',
html: text,
css: {
display: 'block'
}
});
desc = create_element('span', 'bottom');
desc.innerHTML = text;
tooltip.appendChild(desc);
$tooltip = $('<span />', {
class: 'tooltip',
css: {
display: 'block'
}
})
.append($title)
.append($desc);
set_opacity(tooltip);
element.tooltip = tooltip;
element.onmouseover = show_tooltip;
element.onmouseout = hide_tooltip;
if (tooltip_mode === 'link') {
element.onmousemove = locate;
}
}
tooltips[$element.attr('data-id')] = $tooltip;
$element.on('mouseover', phpbb.showTooltip);
$element.on('mouseout', phpbb.hideTooltip);
};
/**
* Show tooltip
* Show tooltip
*
* @param {object} $element Element passed by .on()
*/
function show_tooltip(e) {
document.getElementById('_tooltip_container').appendChild(this.tooltip);
locate(this);
}
phpbb.showTooltip = function ($element) {
var $this = $($element.target);
$('#_tooltip_container').append(tooltips[$this.attr('data-id')]);
phpbb.positionTooltip($this);
};
/**
* Hide tooltip
* Hide tooltip
*/
function hide_tooltip(e) {
phpbb.hideTooltip = function () {
var d = document.getElementById('_tooltip_container');
if (d.childNodes.length > 0) {
d.removeChild(d.firstChild);
}
}
};
/**
* Set opacity on tooltip element
* Correct positioning of tooltip container
*
* @param {jQuery} $element Tooltip element that should be positioned
*/
function set_opacity(element) {
element.style.filter = 'alpha(opacity:95)';
element.style.KHTMLOpacity = '0.95';
element.style.MozOpacity = '0.95';
element.style.opacity = '0.95';
}
phpbb.positionTooltip = function ($element) {
var offset;
$element = $element.parent();
offset = $element.offset();
$('#_tooltip_container').css({
top: offset.top + 30,
left: offset.left - 205
});
};
/**
* Create new element
*/
function create_element(tag, c) {
var x = document.createElement(tag);
x.className = c;
x.style.display = 'block';
return x;
}
* Prepare roles drop down select
*/
phpbb.prepareRolesDropdown = function () {
var $options = $('.roles-options li');
var $rolesOptions = $options.closest('.roles-options');
var $span = $rolesOptions.children('span');
/**
* Correct positioning of tooltip container
*/
function locate(e) {
var posx = 0;
var posy = 0;
// Prepare highlighting of select options and settings update
$options.each(function () {
var $this = $(this);
e = e.parentNode;
if (e.offsetParent) {
for (posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) {
posx += e.offsetLeft;
posy += e.offsetTop;
// Correctly show selected option
if (typeof $this.attr('data-selected') !== 'undefined') {
$rolesOptions.closest('.roles-options')
.children('span')
.text($this.text())
.attr('data-default', $this.text())
.attr('data-default-val', $this.attr('data-id'));
}
} else {
posx = e.offsetLeft;
posy = e.offsetTop;
$this.on('mouseover', function () {
var $this = $(this);
$options.removeClass('roles-highlight');
$this.addClass('roles-highlight');
}).on('click', function () {
var $this = $(this);
// Update settings
set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
init_colours($this.attr('data-target-id').replace('advanced', ''));
// Set selected setting
$rolesOptions.children('span')
.text($this.text());
$rolesOptions.children('input[type=hidden]')
.val($this.attr('data-id'));
// Trigger hiding of selection options
$('body').trigger('click');
});
});
// Save default text of drop down if there is no default set yet
if (typeof $span.attr('data-default') === 'undefined') {
$span.attr('data-default', $span.text());
}
if (tooltip_mode === 'link') {
document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';
} else {
document.getElementById('_tooltip_container').style.top=(posy+30) + 'px';
document.getElementById('_tooltip_container').style.left=(posx-205) + 'px';
}
// Prepare resetting drop down on form reset
$options.closest('form').on('reset', function () {
$span.text($span.attr('data-default'));
$rolesOptions.children('input[type=hidden]')
.val($span.attr('data-id'));
});
/*
if (e == null)
{
e = window.event;
}
};
if (e.pageX || e.pageY)
{
posx = e.pageX;
posy = e.pageY;
}
else if (e.clientX || e.clientY)
{
if (document.documentElement.scrollTop)
{
posx = e.clientX+document.documentElement.scrollLeft;
posy = e.clientY+document.documentElement.scrollTop;
}
else
{
posx = e.clientX+document.body.scrollLeft;
posy = e.clientY+document.body.scrollTop;
}
}
*/
}
// Run onload functions for RolesDropdown and tooltips
$(function() {
// Enable tooltips
phpbb.enableTooltipsSelect('set-permissions', $('#set-permissions').attr('data-role-description'), 'role');
// Prepare dropdown
phpbb.prepareRolesDropdown();
});
})(jQuery); // Avoid conflicts with other libraries

View File

@@ -21,14 +21,16 @@ define('IN_PHPBB', true);
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.' . $phpEx);
include($phpbb_root_path . 'includes/functions_url_matcher.' . $phpEx);
// Start session management
$user->session_begin();
$auth->acl($user->data);
$user->setup('app');
/* @var $http_kernel \Symfony\Component\HttpKernel\HttpKernel */
$http_kernel = $phpbb_container->get('http_kernel');
/* @var $symfony_request \phpbb\symfony_request */
$symfony_request = $phpbb_container->get('symfony_request');
$response = $http_kernel->handle($symfony_request);
$response->send();

4
phpBB/assets/css/font-awesome.min.css vendored Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,640 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
<metadata></metadata>
<defs>
<font id="fontawesomeregular" horiz-adv-x="1536" >
<font-face units-per-em="1792" ascent="1536" descent="-256" />
<missing-glyph horiz-adv-x="448" />
<glyph unicode=" " horiz-adv-x="448" />
<glyph unicode="&#x09;" horiz-adv-x="448" />
<glyph unicode="&#xa0;" horiz-adv-x="448" />
<glyph unicode="&#xa8;" horiz-adv-x="1792" />
<glyph unicode="&#xa9;" horiz-adv-x="1792" />
<glyph unicode="&#xae;" horiz-adv-x="1792" />
<glyph unicode="&#xb4;" horiz-adv-x="1792" />
<glyph unicode="&#xc6;" horiz-adv-x="1792" />
<glyph unicode="&#xd8;" horiz-adv-x="1792" />
<glyph unicode="&#x2000;" horiz-adv-x="768" />
<glyph unicode="&#x2001;" horiz-adv-x="1537" />
<glyph unicode="&#x2002;" horiz-adv-x="768" />
<glyph unicode="&#x2003;" horiz-adv-x="1537" />
<glyph unicode="&#x2004;" horiz-adv-x="512" />
<glyph unicode="&#x2005;" horiz-adv-x="384" />
<glyph unicode="&#x2006;" horiz-adv-x="256" />
<glyph unicode="&#x2007;" horiz-adv-x="256" />
<glyph unicode="&#x2008;" horiz-adv-x="192" />
<glyph unicode="&#x2009;" horiz-adv-x="307" />
<glyph unicode="&#x200a;" horiz-adv-x="85" />
<glyph unicode="&#x202f;" horiz-adv-x="307" />
<glyph unicode="&#x205f;" horiz-adv-x="384" />
<glyph unicode="&#x2122;" horiz-adv-x="1792" />
<glyph unicode="&#x221e;" horiz-adv-x="1792" />
<glyph unicode="&#x2260;" horiz-adv-x="1792" />
<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
<glyph unicode="&#xf016;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
<glyph unicode="&#xf035;" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
<glyph unicode="&#xf053;" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
<glyph unicode="&#xf054;" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf077;" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
<glyph unicode="&#xf078;" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45 t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf080;" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf082;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960z" />
<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
<glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
<glyph unicode="&#xf0a2;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
<glyph unicode="&#xf0f3;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f6;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
<glyph unicode="&#xf110;" horiz-adv-x="1792" d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5 q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
<glyph unicode="&#xf116;" horiz-adv-x="1792" />
<glyph unicode="&#xf117;" horiz-adv-x="1792" />
<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
<glyph unicode="&#xf15b;" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
<glyph unicode="&#xf15c;" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
<glyph unicode="&#xf174;" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
<glyph unicode="&#xf180;" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
<glyph unicode="&#xf194;" d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179 q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf197;" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
<glyph unicode="&#xf198;" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
<glyph unicode="&#xf199;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
<glyph unicode="&#xf19a;" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
<glyph unicode="&#xf19b;" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
<glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
<glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
<glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
<glyph unicode="&#xf1a1;" horiz-adv-x="1792" d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26 t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37 q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191 t348 71t348 -71t286 -191t191 -286t71 -348z" />
<glyph unicode="&#xf1a2;" d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54 q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83 q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf1a4;" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
<glyph unicode="&#xf1a5;" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
<glyph unicode="&#xf1a6;" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
<glyph unicode="&#xf1a7;" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf1a8;" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
<glyph unicode="&#xf1a9;" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
<glyph unicode="&#xf1aa;" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
<glyph unicode="&#xf1ab;" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
<glyph unicode="&#xf1ac;" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
<glyph unicode="&#xf1ad;" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
<glyph unicode="&#xf1ae;" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf1b0;" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
<glyph unicode="&#xf1b1;" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
<glyph unicode="&#xf1b2;" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
<glyph unicode="&#xf1b3;" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
<glyph unicode="&#xf1b4;" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
<glyph unicode="&#xf1b5;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
<glyph unicode="&#xf1b6;" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
<glyph unicode="&#xf1b7;" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
<glyph unicode="&#xf1b8;" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
<glyph unicode="&#xf1b9;" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf1ba;" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
<glyph unicode="&#xf1bb;" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
<glyph unicode="&#xf1bc;" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf1bd;" horiz-adv-x="1024" d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
<glyph unicode="&#xf1be;" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
<glyph unicode="&#xf1c0;" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
<glyph unicode="&#xf1c1;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
<glyph unicode="&#xf1c2;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
<glyph unicode="&#xf1c3;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
<glyph unicode="&#xf1c4;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
<glyph unicode="&#xf1c5;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
<glyph unicode="&#xf1c6;" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
<glyph unicode="&#xf1c7;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
<glyph unicode="&#xf1c8;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
<glyph unicode="&#xf1c9;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
<glyph unicode="&#xf1ca;" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
<glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
<glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
<glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
<glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
<glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
<glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf1d3;" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
<glyph unicode="&#xf1d4;" d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf1d5;" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
<glyph unicode="&#xf1d6;" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
<glyph unicode="&#xf1d7;" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
<glyph unicode="&#xf1d8;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
<glyph unicode="&#xf1d9;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
<glyph unicode="&#xf1da;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf1db;" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf1dc;" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
<glyph unicode="&#xf1dd;" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
<glyph unicode="&#xf1de;" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
<glyph unicode="&#xf1e0;" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
<glyph unicode="&#xf1e1;" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf1e2;" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
<glyph unicode="&#xf1e3;" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
<glyph unicode="&#xf1e4;" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
<glyph unicode="&#xf1e5;" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf1e6;" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
<glyph unicode="&#xf1e7;" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
<glyph unicode="&#xf1e8;" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
<glyph unicode="&#xf1e9;" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
<glyph unicode="&#xf1ea;" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
<glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
<glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf1ed;" d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246 q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598 q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
<glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
<glyph unicode="&#xf1f3;" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
<glyph unicode="&#xf1f4;" horiz-adv-x="2304" d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16 t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76 q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59 t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489 l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66 q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf1f5;" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf1f6;" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
<glyph unicode="&#xf1f7;" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
<glyph unicode="&#xf1f8;" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf1f9;" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf1fa;" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
<glyph unicode="&#xf1fb;" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
<glyph unicode="&#xf1fc;" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
<glyph unicode="&#xf1fd;" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
<glyph unicode="&#xf1fe;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
<glyph unicode="&#xf200;" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf201;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
<glyph unicode="&#xf202;" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
<glyph unicode="&#xf203;" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf204;" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
<glyph unicode="&#xf205;" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
<glyph unicode="&#xf206;" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
<glyph unicode="&#xf207;" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
<glyph unicode="&#xf208;" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
<glyph unicode="&#xf209;" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
<glyph unicode="&#xf20a;" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
<glyph unicode="&#xf20b;" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf20c;" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
<glyph unicode="&#xf20d;" d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
<glyph unicode="&#xf20e;" horiz-adv-x="2048" d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335 q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5 q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360q2 0 4.5 -1t5.5 -2.5l5 -2.5l188 199v347l-187 194 q-13 -8 -29 -10zM986 1438h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13 zM552 226h402l64 66l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224 l213 -225zM1023 946l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196 l-48 -227l130 227h-82zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
<glyph unicode="&#xf210;" d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
<glyph unicode="&#xf211;" d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384 q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
<glyph unicode="&#xf212;" horiz-adv-x="2048" d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021 q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25 q209 0 374 -102q172 107 374 102z" />
<glyph unicode="&#xf213;" horiz-adv-x="2048" d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101 q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284 q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
<glyph unicode="&#xf214;" d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34 l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114 v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378 v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51 h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5 t-43 -34t-16.5 -53.5z" />
<glyph unicode="&#xf215;" horiz-adv-x="2048" d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832 q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
<glyph unicode="&#xf216;" horiz-adv-x="2048" d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126.5t-103.5 132.5t-108.5 126t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5 t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113 t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5 q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
<glyph unicode="&#xf217;" horiz-adv-x="1664" d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920 q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf218;" horiz-adv-x="1664" d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920 q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf219;" horiz-adv-x="2048" d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20 l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
<glyph unicode="&#xf21a;" horiz-adv-x="2048" d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83 q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83 q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314 v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83 q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
<glyph unicode="&#xf21b;" d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14 t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5 q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31 t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
<glyph unicode="&#xf21c;" horiz-adv-x="2304" d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5 t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105 l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226 t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
<glyph unicode="&#xf21d;" d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12 q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384 q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5 t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf21e;" horiz-adv-x="1792" d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221 q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124 t127 -344z" />
<glyph unicode="&#xf221;" horiz-adv-x="1280" d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292 q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
<glyph unicode="&#xf222;" d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5 q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf223;" horiz-adv-x="1280" d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5 t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf224;" d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf225;" horiz-adv-x="1792" d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9 t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5 t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf226;" horiz-adv-x="1792" d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23 t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391 q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391 q0 -226 -154 -391q103 -57 218 -57z" />
<glyph unicode="&#xf227;" horiz-adv-x="1920" d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230 q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9 t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128 q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -29 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
<glyph unicode="&#xf228;" horiz-adv-x="2048" d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23 t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9 t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5 t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
<glyph unicode="&#xf229;" d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5 t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf22a;" horiz-adv-x="1280" d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22 t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5 t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf22b;" horiz-adv-x="2048" d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5 t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5 t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf22c;" horiz-adv-x="1280" d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5 t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf22d;" horiz-adv-x="1280" d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123 t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
<glyph unicode="&#xf22e;" horiz-adv-x="1792" />
<glyph unicode="&#xf22f;" horiz-adv-x="1792" />
<glyph unicode="&#xf230;" d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
<glyph unicode="&#xf231;" horiz-adv-x="1280" d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5 l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5 q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
<glyph unicode="&#xf232;" d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5 t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233 l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
<glyph unicode="&#xf233;" horiz-adv-x="1792" d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216 q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
<glyph unicode="&#xf234;" horiz-adv-x="2048" d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5 t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
<glyph unicode="&#xf235;" horiz-adv-x="2048" d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136 q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69 t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
<glyph unicode="&#xf236;" horiz-adv-x="2048" d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704 q-26 0 -45 -19t-19 -45v-384h1152z" />
<glyph unicode="&#xf237;" d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
<glyph unicode="&#xf238;" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56 t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
<glyph unicode="&#xf239;" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47 t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
<glyph unicode="&#xf23a;" horiz-adv-x="1792" d="M1792 204v-209h-642v209h134v926h-6l-314 -1135h-243l-310 1135h-8v-926h135v-209h-538v209h69q21 0 43 19.5t22 37.5v881q0 18 -22 40t-43 22h-69v209h672l221 -821h6l223 821h670v-209h-71q-19 0 -41 -22t-22 -40v-881q0 -18 21.5 -37.5t41.5 -19.5h71z" />
<glyph unicode="&#xf23b;" d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
<glyph unicode="&#xf23c;" horiz-adv-x="2296" d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5 q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5 q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42 q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37 q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5 q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139 q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 4 5 8q16 18 60 23h13q5 18 19 30t33 8 t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132 q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132 q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-106 2 -211 0v1q-1 -27 2.5 -86 t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103 q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34l3 9v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4l-10 -2.5t-12 -2 l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-2 0 -3 -0.5t-3 -0.5h-3q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130t-73 70 q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -2 -1 -5t-1 -4q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150 q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12 q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
<glyph unicode="&#xf23d;" horiz-adv-x="2304" d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5 t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5 t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
<glyph unicode="&#xf23e;" horiz-adv-x="1792" d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348 t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23 t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512 q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
<glyph unicode="&#xf240;" horiz-adv-x="2304" d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113 v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf241;" horiz-adv-x="2304" d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
<glyph unicode="&#xf242;" horiz-adv-x="2304" d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
<glyph unicode="&#xf243;" horiz-adv-x="2304" d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
<glyph unicode="&#xf244;" horiz-adv-x="2304" d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23 v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
<glyph unicode="&#xf245;" horiz-adv-x="1280" d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
<glyph unicode="&#xf246;" horiz-adv-x="1024" d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
<glyph unicode="&#xf247;" horiz-adv-x="2048" d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128 h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
<glyph unicode="&#xf248;" horiz-adv-x="2304" d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256 v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
<glyph unicode="&#xf249;" d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
<glyph unicode="&#xf24a;" d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68 z" />
<glyph unicode="&#xf24b;" horiz-adv-x="2304" d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5 t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88 t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90 t90 38h2048q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf24c;" horiz-adv-x="2304" d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294 t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf24d;" horiz-adv-x="1792" d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113 zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf24e;" horiz-adv-x="2304" d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64 q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91 t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5 t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
<glyph unicode="&#xf250;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5 t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
<glyph unicode="&#xf251;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
<glyph unicode="&#xf252;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
<glyph unicode="&#xf253;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196 h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
<glyph unicode="&#xf254;" d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87 t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9 h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
<glyph unicode="&#xf255;" d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25 q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27 t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21 q72 69 174 69z" />
<glyph unicode="&#xf256;" horiz-adv-x="1792" d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33 t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52 h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
<glyph unicode="&#xf257;" horiz-adv-x="1792" d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668 q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17 t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5 t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5 q0 -42 -23 -78t-61 -53l-310 -141h91z" />
<glyph unicode="&#xf258;" horiz-adv-x="2048" d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32 q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68 q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
<glyph unicode="&#xf259;" horiz-adv-x="2048" d="M816 1408q-48 0 -79.5 -34t-31.5 -82q0 -14 3 -28l150 -624h-26l-116 482q-9 38 -39.5 62t-69.5 24q-47 0 -79 -34t-32 -81q0 -11 4 -29q3 -13 39 -161t68 -282t32 -138v-227l-307 230q-34 26 -77 26q-52 0 -89.5 -36.5t-37.5 -88.5q0 -67 56 -110l507 -379 q34 -26 76 -26h694q33 0 59 20.5t34 52.5l100 401q8 30 10 88t9 86l116 478q3 12 3 26q0 46 -33 79t-80 33q-38 0 -69 -25.5t-40 -62.5l-99 -408h-26l132 547q3 14 3 28q0 47 -32 80t-80 33q-38 0 -68.5 -24t-39.5 -62l-145 -602h-127l-164 682q-9 38 -39.5 62t-68.5 24z M1461 -256h-694q-85 0 -153 51l-507 380q-50 38 -78.5 94t-28.5 118q0 105 75 179t180 74q25 0 49.5 -5.5t41.5 -11t41 -20.5t35 -23t38.5 -29.5t37.5 -28.5l-123 512q-7 35 -7 59q0 93 60 162t152 79q14 87 80.5 144.5t155.5 57.5q83 0 148 -51.5t85 -132.5l103 -428 l83 348q20 81 85 132.5t148 51.5q87 0 152.5 -54t82.5 -139q93 -10 155 -78t62 -161q0 -30 -7 -57l-116 -477q-5 -22 -5 -67q0 -51 -13 -108l-101 -401q-19 -75 -79.5 -122.5t-137.5 -47.5z" />
<glyph unicode="&#xf25a;" horiz-adv-x="1792" d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5 q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5 v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32 v-384h32z" />
<glyph unicode="&#xf25b;" d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181 v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46 q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5 q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308 q0 -53 37.5 -90.5t90.5 -37.5h668z" />
<glyph unicode="&#xf25c;" horiz-adv-x="1973" d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5 t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141 q13 0 22 -8.5t10 -20.5z" />
<glyph unicode="&#xf25d;" horiz-adv-x="1792" d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109 t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640 q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
<glyph unicode="&#xf25e;" horiz-adv-x="1792" d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13t-23.5 -14.5t-28.5 -13.5t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78 q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13t-23.5 -14.5t-28.5 -13.5t-33.5 -9.5 t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376 q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191 t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
<glyph unicode="&#xf260;" horiz-adv-x="2048" d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
<glyph unicode="&#xf261;" horiz-adv-x="1792" d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191 t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
<glyph unicode="&#xf262;" horiz-adv-x="2304" d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57 t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197 t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5 t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5 t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5 q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
<glyph unicode="&#xf263;" horiz-adv-x="1280" d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5 t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94 q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
<glyph unicode="&#xf264;" d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32 q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5 zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf265;" horiz-adv-x="1720" d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33 l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
<glyph unicode="&#xf266;" horiz-adv-x="2304" d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540 q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81 l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
<glyph unicode="&#xf267;" horiz-adv-x="1792" d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640 q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5 t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5 t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5 t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191 t191 -286t71 -348z" />
<glyph unicode="&#xf268;" horiz-adv-x="1792" d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962 q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
<glyph unicode="&#xf269;" horiz-adv-x="1792" d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5 q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5 q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
<glyph unicode="&#xf26a;" d="M768 -92q77 0 139.5 63t100.5 166t59 234.5t21 268.5t-21 268.5t-59 234.5t-100.5 166t-139.5 63t-139.5 -63t-100.5 -166t-59 -234.5t-21 -268.5t21 -268.5t59 -234.5t100.5 -166t139.5 -63zM768 -256q-184 0 -333 77t-240 203t-141 287t-50 329t50 329t141 287t240 203 t333 77q148 0 274 -50t214.5 -136t151.5 -201t92.5 -244t29.5 -265t-29.5 -265t-92.5 -244t-151.5 -201t-214.5 -136t-274 -50z" />
<glyph unicode="&#xf26b;" horiz-adv-x="1792" d="M716 -69q-143 35 -261.5 114t-197.5 191q-139 -300 -17 -398q26 -21 85 -24.5t127.5 9.5t141 41.5t122.5 66.5zM693 762h452q0 108 -61.5 169t-168.5 61q-103 0 -162.5 -62.5t-59.5 -167.5zM1724 1137h-34q26 102 22.5 170t-25 110t-63.5 57t-93.5 11t-115 -26.5 t-128.5 -56.5t-134 -79q129 -37 238.5 -113.5t185 -179t110 -231.5t15.5 -262h-1005q0 -60 10 -106t34 -85t69.5 -60t112.5 -21q87 0 142.5 44t72.5 122h540q-71 -230 -281.5 -377t-477.5 -147q-83 0 -159 15q-35 -40 -151 -94t-248 -78t-219 35q-78 60 -100 159t7 214 t88 242t143.5 248t173.5 226.5t177.5 183.5t156.5 112v24q-120 -37 -258.5 -137.5t-240.5 -207t-159 -195.5q4 106 34 201t80 169t118 135.5t147.5 100.5t168 65.5t180.5 29.5t185 -8q310 186 503 189h7q57 0 103 -18q80 -30 98 -132.5t-30 -248.5z" />
<glyph unicode="&#xf26c;" horiz-adv-x="2048" d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23 v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf26d;" horiz-adv-x="1792" d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34 h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100 q-68 175 -180 287z" />
<glyph unicode="&#xf26e;" horiz-adv-x="2304" d="M1391 390v0l-1 1q-15 18 -34.5 37.5t-62.5 57.5t-93.5 62t-95.5 24q-48 0 -83 -21.5t-51 -54t-23 -59t-7 -47.5v0v0q0 -21 7 -48t23 -59t51 -53.5t83 -21.5q45 0 95.5 24t94 62.5t62 57t34.5 37.5zM2103 390q0 21 -7 47.5t-23 59t-51 54t-83 21.5q-45 0 -95.5 -24 t-94 -62.5t-62 -57t-34.5 -37.5l-1 -1v0v0l1 -1q15 -18 34.5 -37.5t62.5 -57.5t93.5 -62t95.5 -24q48 0 83 21.5t51 53.5t23 59t7 48zM2304 393q0 -69 -24 -137.5t-68 -126t-116 -93.5t-159 -36q-68 0 -134 24t-113.5 58.5t-84.5 69.5t-59.5 59t-25.5 24t-22.5 -24 t-54.5 -58.5t-81.5 -69.5t-115 -59t-143.5 -24q-65 0 -123.5 22.5t-96.5 54t-66.5 66.5t-41 59.5t-12.5 32.5q0 -8 -8.5 -26.5t-25 -45.5t-47 -55t-69 -52.5t-96.5 -40t-125 -15.5q-71 0 -130 15.5t-98.5 39.5t-70.5 56.5t-48 63.5t-27.5 63.5t-14 54t-3.5 36.5h217 q0 -55 49 -107.5t126 -52.5q79 0 134.5 67t55.5 148q0 80 -52 136.5t-138 56.5q-5 0 -13 -0.5t-31 -5t-43 -12t-42 -24.5t-34 -40h-195l102 583h602v-174h-445q-27 -159 -41 -248q4 0 16.5 13t31.5 28.5t65 28.5t108 13t114 -20.5t82.5 -49.5t51.5 -58.5t31 -50t11 -20.5 t13 25t36.5 60.5t60.5 71.5t97 61t133 25t140.5 -25t115.5 -60.5t83.5 -71.5t56.5 -61t21 -25q2 0 22 25t56 60.5t83.5 71.5t115.5 61t140 25q92 0 164.5 -35t115.5 -93t65 -125t22 -137z" />
<glyph unicode="&#xf270;" horiz-adv-x="1792" d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30 q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57 t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133 q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
<glyph unicode="&#xf271;" horiz-adv-x="1792" d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9 h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224 v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
<glyph unicode="&#xf272;" horiz-adv-x="1792" d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23 t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47 t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf273;" horiz-adv-x="1792" d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf274;" horiz-adv-x="1792" d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23 t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47 t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf275;" horiz-adv-x="1792" d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
<glyph unicode="&#xf276;" horiz-adv-x="1024" d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q61 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249 q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
<glyph unicode="&#xf277;" horiz-adv-x="1792" d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768 q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
<glyph unicode="&#xf278;" horiz-adv-x="2048" d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173 v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
<glyph unicode="&#xf279;" horiz-adv-x="1792" d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472 q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
<glyph unicode="&#xf27a;" horiz-adv-x="1792" d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37 t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
<glyph unicode="&#xf27b;" horiz-adv-x="1792" d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5 t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51 t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
<glyph unicode="&#xf27c;" horiz-adv-x="1024" d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
<glyph unicode="&#xf27d;" horiz-adv-x="1792" d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246 q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
<glyph unicode="&#xf27e;" d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
<glyph unicode="&#xf280;" d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72 h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275 l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
<glyph unicode="&#xf281;" horiz-adv-x="1792" />
<glyph unicode="&#xf282;" horiz-adv-x="1792" />
<glyph unicode="&#xf283;" horiz-adv-x="1792" />
<glyph unicode="&#xf284;" horiz-adv-x="1792" />
<glyph unicode="&#xf285;" horiz-adv-x="1792" />
<glyph unicode="&#xf286;" horiz-adv-x="1792" />
<glyph unicode="&#xf287;" horiz-adv-x="1792" />
<glyph unicode="&#xf288;" horiz-adv-x="1792" />
<glyph unicode="&#xf289;" horiz-adv-x="1792" />
<glyph unicode="&#xf28a;" horiz-adv-x="1792" />
<glyph unicode="&#xf28b;" horiz-adv-x="1792" />
<glyph unicode="&#xf28c;" horiz-adv-x="1792" />
<glyph unicode="&#xf28d;" horiz-adv-x="1792" />
<glyph unicode="&#xf28e;" horiz-adv-x="1792" />
<glyph unicode="&#xf500;" horiz-adv-x="1792" />
</font>
</defs></svg>

After

Width:  |  Height:  |  Size: 348 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -111,7 +111,6 @@ function bbfontstyle(bbopen, bbclose) {
}
textarea.focus();
return;
}
/**
@@ -159,7 +158,7 @@ function insert_text(text, spaces, popup) {
/**
* Add inline attachment at position
*/
function attach_inline(index, filename) {
function attachInline(index, filename) {
insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
document.forms[form_name].elements[text_name].focus();
}
@@ -167,7 +166,7 @@ function attach_inline(index, filename) {
/**
* Add quote text to message
*/
function addquote(post_id, username, l_wrote) {
function addquote(post_id, username, l_wrote, attributes) {
var message_name = 'message_' + post_id;
var theSelection = '';
var divarea = false;
@@ -177,6 +176,9 @@ function addquote(post_id, username, l_wrote) {
// Backwards compatibility
l_wrote = 'wrote';
}
if (typeof attributes !== 'object') {
attributes = {};
}
if (document.all) {
divarea = document.all[message_name];
@@ -213,7 +215,8 @@ function addquote(post_id, username, l_wrote) {
if (theSelection) {
if (bbcodeEnabled) {
insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
attributes.author = username;
insert_text(generateQuote(theSelection, attributes));
} else {
insert_text(username + ' ' + l_wrote + ':' + '\n');
var lines = split_lines(theSelection);
@@ -222,8 +225,61 @@ function addquote(post_id, username, l_wrote) {
}
}
}
}
return;
/**
* Create a quote block for given text
*
* Possible attributes:
* - author: author's name (usually a username)
* - post_id: post_id of the post being quoted
* - user_id: user_id of the user being quoted
* - time: timestamp of the original message
*
* @param {!string} text Quote's text
* @param {!Object} attributes Quote's attributes
* @return {!string} Quote block to be used in a new post/text
*/
function generateQuote(text, attributes) {
text = text.replace(/^\s+/, '').replace(/\s+$/, '');
var quote = '[quote';
if (attributes.author) {
// Add the author as the BBCode's default attribute
quote += '=' + formatAttributeValue(attributes.author);
delete attributes.author;
}
for (var name in attributes) {
if (attributes.hasOwnProperty(name)) {
var value = attributes[name];
quote += ' ' + name + '=' + formatAttributeValue(value.toString());
}
}
quote += ']';
var newline = ((quote + text + '[/quote]').length > 80 || text.indexOf('\n') > -1) ? '\n' : '';
quote += newline + text + newline + '[/quote]';
return quote;
}
/**
* Format given string to be used as an attribute value
*
* Will return the string as-is if it can be used in a BBCode without quotes. Otherwise,
* it will use either single- or double- quotes depending on whichever requires less escaping.
* Quotes and backslashes are escaped with backslashes where necessary
*
* @param {!string} str Original string
* @return {!string} Same string if possible, escaped string within quotes otherwise
*/
function formatAttributeValue(str) {
if (!/[ "'\\\]]/.test(str)) {
// Return as-is if it contains none of: space, ' " \ or ]
return str;
}
var singleQuoted = "'" + str.replace(/[\\']/g, '\\$&') + "'",
doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';
return (singleQuoted.length < doubleQuoted.length) ? singleQuoted : doubleQuoted;
}
function split_lines(text) {
@@ -266,10 +322,6 @@ function mozWrap(txtarea, open, close) {
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
if (selEnd === 1 || selEnd === 2) {
selEnd = selLength;
}
var s1 = (txtarea.value).substring(0,selStart);
var s2 = (txtarea.value).substring(selStart, selEnd);
var s3 = (txtarea.value).substring(selEnd, selLength);
@@ -359,6 +411,9 @@ function getCaretPosition(txtarea) {
textarea = doc.forms[form_name].elements[text_name];
phpbb.applyCodeEditor(textarea);
if ($('#attach-panel').length) {
phpbb.showDragNDrop(textarea);
}
});
})(jQuery);

View File

@@ -0,0 +1,515 @@
/**
* Installer's AJAX frontend handler
*/
(function($) { // Avoid conflicts with other libraries
'use strict';
// Installer variables
var pollTimer = null;
var nextReadPosition = 0;
var progressBarTriggered = false;
var progressTimer = null;
var currentProgress = 0;
var refreshRequested = false;
// Template related variables
var $contentWrapper = $('.install-body').find('.main');
// Intercept form submits
interceptFormSubmit($('#install_install'));
/**
* Creates an XHR object
*
* jQuery cannot be used as the response is streamed, and
* as of now, jQuery does not provide access to the response until
* the connection is not closed.
*
* @return XMLHttpRequest
*/
function createXhrObject() {
return new XMLHttpRequest();
}
/**
* Displays error, warning and log messages
*
* @param type
* @param messages
*/
function addMessage(type, messages) {
// Get message containers
var $errorContainer = $('#error-container');
var $warningContainer = $('#warning-container');
var $logContainer = $('#log-container');
var $title, $description, $msgElement, arraySize = messages.length;
for (var i = 0; i < arraySize; i++) {
$msgElement = $('<div />');
$title = $('<strong />');
$title.text(messages[i].title);
$msgElement.append($title);
if (messages[i].hasOwnProperty('description')) {
$description = $('<p />');
$description.html(messages[i].description);
$msgElement.append($description);
}
switch (type) {
case 'error':
$msgElement.addClass('errorbox');
$errorContainer.append($msgElement);
break;
case 'warning':
$msgElement.addClass('warningbox');
$warningContainer.append($msgElement);
break;
case 'log':
$msgElement.addClass('log');
$logContainer.prepend($msgElement);
$logContainer.addClass('show_log_container');
break;
case 'success':
$msgElement.addClass('successbox');
$errorContainer.prepend($msgElement);
break;
}
}
}
/**
* Render a download box
*/
function addDownloadBox(downloadArray)
{
var $downloadContainer = $('#download-wrapper');
var $downloadBox, $title, $content, $link;
for (var i = 0; i < downloadArray.length; i++) {
$downloadBox = $('<div />');
$downloadBox.addClass('download-box');
$title = $('<strong />');
$title.text(downloadArray[i].title);
$downloadBox.append($title);
if (downloadArray[i].hasOwnProperty('msg')) {
$content = $('<p />');
$content.text(downloadArray[i].msg);
$downloadBox.append($content);
}
$link = $('<a />');
$link.addClass('button1');
$link.attr('href', downloadArray[i].href);
$link.text(downloadArray[i].download);
$downloadBox.append($link);
$downloadContainer.append($downloadBox);
}
}
/**
* Render update files' status
*/
function addUpdateFileStatus(fileStatus)
{
var $statusContainer = $('#file-status-wrapper');
$statusContainer.html(fileStatus);
}
/**
* Displays a form from the response
*
* @param formHtml
*/
function addForm(formHtml) {
var $formContainer = $('#form-wrapper');
$formContainer.html(formHtml);
var $form = $('#install_install');
interceptFormSubmit($form);
}
/**
* Handles navigation status updates
*
* @param navObj
*/
function updateNavbarStatus(navObj) {
var navID, $stage, $stageListItem, $active;
$active = $('#activemenu');
if (navObj.hasOwnProperty('finished')) {
// This should be an Array
var navItems = navObj.finished;
for (var i = 0; i < navItems.length; i++) {
navID = 'installer-stage-' + navItems[i];
$stage = $('#' + navID);
$stageListItem = $stage.parent();
if ($active.length && $active.is($stageListItem)) {
$active.removeAttr('id');
}
$stage.addClass('completed');
}
}
if (navObj.hasOwnProperty('active')) {
navID = 'installer-stage-' + navObj.active;
$stage = $('#' + navID);
$stageListItem = $stage.parent();
if ($active.length && !$active.is($stageListItem)) {
$active.removeAttr('id');
}
$stageListItem.attr('id', 'activemenu');
}
}
/**
* Renders progress bar
*
* @param progressObject
*/
function setProgress(progressObject) {
var $statusText, $progressBar, $progressText, $progressFiller;
if (progressObject.task_name.length) {
if (!progressBarTriggered) {
// Create progress bar
var $progressBarWrapper = $('#progress-bar-container');
// Create progress bar elements
$progressBar = $('<div />');
$progressBar.attr('id', 'progress-bar');
$progressText = $('<p />');
$progressText.attr('id', 'progress-bar-text');
$progressFiller = $('<span />');
$progressFiller.attr('id', 'progress-bar-filler');
$statusText = $('<p />');
$statusText.attr('id', 'progress-status-text');
$progressBar.append($progressFiller);
$progressBar.append($progressText);
$progressBarWrapper.append($statusText);
$progressBarWrapper.append($progressBar);
progressBarTriggered = true;
} else if (progressObject.hasOwnProperty('restart')) {
clearInterval(progressTimer);
$progressFiller = $('#progress-bar-filler');
$progressText = $('#progress-bar-text');
$statusText = $('#progress-status-text');
$progressText.text('0%');
$progressFiller.css('width', '0%');
currentProgress = 0;
} else {
$statusText = $('#progress-status-text');
}
// Update progress bar
$statusText.text(progressObject.task_name + '…');
incrementProgressBar(Math.round(progressObject.task_num / progressObject.task_count * 100));
}
}
// Set cookies
function setCookies(cookies) {
var cookie;
for (var i = 0; i < cookies.length; i++) {
// Set cookie name and value
cookie = encodeURIComponent(cookies[i].name) + '=' + encodeURIComponent(cookies[i].value);
// Set path
cookie += '; path=/';
document.cookie = cookie;
}
}
/**
* Parse messages from the response object
*
* @param messageJSON
*/
function parseMessage(messageJSON) {
$('#loading_indicator').css('display', 'none');
var responseObject;
try {
responseObject = JSON.parse(messageJSON);
} catch (err) {
if (window.console) {
console.log('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON);
} else {
alert('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON);
}
resetPolling();
return;
}
// Parse object
if (responseObject.hasOwnProperty('errors')) {
addMessage('error', responseObject.errors);
}
if (responseObject.hasOwnProperty('warnings')) {
addMessage('warning', responseObject.warnings);
}
if (responseObject.hasOwnProperty('logs')) {
addMessage('log', responseObject.logs);
}
if (responseObject.hasOwnProperty('success')) {
addMessage('success', responseObject.success);
}
if (responseObject.hasOwnProperty('form')) {
addForm(responseObject.form);
}
if (responseObject.hasOwnProperty('progress')) {
setProgress(responseObject.progress);
}
if (responseObject.hasOwnProperty('download')) {
addDownloadBox(responseObject.download);
}
if (responseObject.hasOwnProperty('file_status')) {
addUpdateFileStatus(responseObject.file_status);
}
if (responseObject.hasOwnProperty('nav')) {
updateNavbarStatus(responseObject.nav);
}
if (responseObject.hasOwnProperty('cookies')) {
setCookies(responseObject.cookies);
}
if (responseObject.hasOwnProperty('refresh')) {
refreshRequested = true;
}
}
/**
* Process updates in streamed response
*
* @param xhReq XHR object
*/
function pollContent(xhReq) {
var messages = xhReq.responseText;
var msgSeparator = '}\n\n';
var unprocessed, messageEndIndex, endOfMessageIndex, message;
do {
unprocessed = messages.substring(nextReadPosition);
messageEndIndex = unprocessed.indexOf(msgSeparator);
if (messageEndIndex !== -1) {
endOfMessageIndex = messageEndIndex + msgSeparator.length;
message = unprocessed.substring(0, endOfMessageIndex);
parseMessage($.trim(message));
nextReadPosition += endOfMessageIndex;
}
} while (messageEndIndex !== -1);
if (xhReq.readyState === 4) {
$('#loading_indicator').css('display', 'none');
resetPolling();
if (refreshRequested) {
refreshRequested = false;
doRefresh();
}
}
}
/**
* Animates the progress bar
*
* @param $progressText
* @param $progressFiller
* @param progressLimit
*/
function incrementFiller($progressText, $progressFiller, progressLimit) {
if (currentProgress >= progressLimit || currentProgress >= 100) {
clearInterval(progressTimer);
return;
}
currentProgress++;
$progressText.text(currentProgress + '%');
$progressFiller.css('width', currentProgress + '%');
}
/**
* Wrapper function for progress bar rendering and animating
*
* @param progressLimit
*/
function incrementProgressBar(progressLimit) {
var $progressFiller = $('#progress-bar-filler');
var $progressText = $('#progress-bar-text');
var progressStart = $progressFiller.width() / $progressFiller.offsetParent().width() * 100;
currentProgress = Math.floor(progressStart);
clearInterval(progressTimer);
progressTimer = setInterval(function() {
incrementFiller($progressText, $progressFiller, progressLimit);
}, 10);
}
/**
* Resets the polling timer
*/
function resetPolling() {
clearInterval(pollTimer);
nextReadPosition = 0;
}
/**
* Sets up timer for processing the streamed HTTP response
*
* @param xhReq
*/
function startPolling(xhReq) {
resetPolling();
pollTimer = setInterval(function () {
pollContent(xhReq);
}, 250);
}
/**
* Refresh page
*/
function doRefresh() {
resetPolling();
var xhReq = createXhrObject();
xhReq.open('GET', $(location).attr('pathname'), true);
xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
xhReq.send();
startPolling(xhReq);
}
/**
* Renders the AJAX UI layout
*/
function setupAjaxLayout() {
progressBarTriggered = false;
// Clear content
$contentWrapper.html('');
var $header = $('<div />');
$header.attr('id', 'header-container');
$contentWrapper.append($header);
var $description = $('<div />');
$description.attr('id', 'description-container');
$contentWrapper.append($description);
var $errorContainer = $('<div />');
$errorContainer.attr('id', 'error-container');
$contentWrapper.append($errorContainer);
var $warningContainer = $('<div />');
$warningContainer.attr('id', 'warning-container');
$contentWrapper.append($warningContainer);
var $progressContainer = $('<div />');
$progressContainer.attr('id', 'progress-bar-container');
$contentWrapper.append($progressContainer);
var $logContainer = $('<div />');
$logContainer.attr('id', 'log-container');
$contentWrapper.append($logContainer);
var $installerContentWrapper = $('<div />');
$installerContentWrapper.attr('id', 'content-container');
$contentWrapper.append($installerContentWrapper);
var $installerDownloadWrapper = $('<div />');
$installerDownloadWrapper.attr('id', 'download-wrapper');
$installerContentWrapper.append($installerDownloadWrapper);
var $updaterFileStatusWrapper = $('<div />');
$updaterFileStatusWrapper.attr('id', 'file-status-wrapper');
$installerContentWrapper.append($updaterFileStatusWrapper);
var $formWrapper = $('<div />');
$formWrapper.attr('id', 'form-wrapper');
$installerContentWrapper.append($formWrapper);
var $spinner = $('<div />');
$spinner.attr('id', 'loading_indicator');
$spinner.html('&nbsp;');
$contentWrapper.append($spinner);
}
// Submits a form
function submitForm($form, $submitBtn) {
$form.css('display', 'none');
var xhReq = createXhrObject();
xhReq.open('POST', $form.attr('action'), true);
xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
xhReq.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhReq.send(getFormFields($form, $submitBtn));
// Disable language selector
$('#language_selector :input, label').css('display', 'none');
// Clear content
setupAjaxLayout();
$('#loading_indicator').css('display', 'block');
startPolling(xhReq);
}
/**
* Add submit button to the POST information
*
* @param $form
* @param $submitBtn
*
* @returns {*}
*/
function getFormFields($form, $submitBtn) {
var formData = $form.serialize();
formData += ((formData.length) ? '&' : '') + encodeURIComponent($submitBtn.attr('name')) + '=';
formData += encodeURIComponent($submitBtn.attr('value'));
return formData;
}
/**
* Intercept form submit events and determine the submit button used
*
* @param $form
*/
function interceptFormSubmit($form) {
if (!$form.length) {
return;
}
$form.find(':submit').bind('click', function (event) {
event.preventDefault();
submitForm($form, $(this));
});
}
})(jQuery); // Avoid conflicts with other libraries

View File

@@ -1,26 +1,26 @@
/* global phpbb, plupload, attachInline */
plupload.addI18n(phpbb.plupload.i18n);
phpbb.plupload.ids = [];
(function($) { // Avoid conflicts with other libraries
"use strict";
'use strict';
/**
* Set up the uploader.
*
* @return undefined
*/
phpbb.plupload.initialize = function() {
// Initialize the Plupload uploader.
uploader.init();
phpbb.plupload.uploader.init();
// Set attachment data.
phpbb.plupload.setData(phpbb.plupload.data);
phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
// Only execute if Plupload initialized successfully.
uploader.bind('Init', function() {
phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0],
phpbb.plupload.uploader.bind('Init', function() {
phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0];
phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML;
// Hide the basic upload panel and remove the attach row template.
@@ -29,48 +29,51 @@ phpbb.plupload.initialize = function() {
$('#attach-panel-multi').show();
});
uploader.bind('PostInit', function() {
phpbb.plupload.uploader.bind('PostInit', function() {
// Point out the drag-and-drop zone if it's supported.
if (uploader.features.dragdrop) {
if (phpbb.plupload.uploader.features.dragdrop) {
$('#drag-n-drop-message').show();
}
// Ensure "Add files" button position is correctly calculated.
if ($('#attach-panel-multi').is(':visible')) {
phpbb.plupload.uploader.refresh();
}
$('[data-subpanel="attach-panel"]').one('click', function() {
phpbb.plupload.uploader.refresh();
});
});
};
/**
* Unsets all elements in the object uploader.settings.multipart_params whose keys
* begin with 'attachment_data['
*
* @return undefined
*/
phpbb.plupload.clearParams = function() {
var obj = uploader.settings.multipart_params;
var obj = phpbb.plupload.uploader.settings.multipart_params;
for (var key in obj) {
if (!obj.hasOwnProperty(key) || key.indexOf('attachment_data[') !== 0) {
continue;
}
delete uploader.settings.multipart_params[key];
delete phpbb.plupload.uploader.settings.multipart_params[key];
}
};
/**
* Update uploader.settings.multipart_params object with new data.
*
* @param object obj
* @return undefined
* @param {object} obj
*/
phpbb.plupload.updateMultipartParams = function(obj) {
uploader.settings.multipart_params = $.extend(
uploader.settings.multipart_params,
obj
);
var settings = phpbb.plupload.uploader.settings;
settings.multipart_params = $.extend(settings.multipart_params, obj);
};
/**
* Convert the array of attachment objects into an object that PHP would expect as POST data.
*
* @return object An object in the form 'attachment_data[i][key]': value as
* @returns {object} An object in the form 'attachment_data[i][key]': value as
* expected by the server
*/
phpbb.plupload.getSerializedData = function() {
@@ -92,22 +95,19 @@ phpbb.plupload.getSerializedData = function() {
* Get the index from the phpbb.plupload.data array where the given
* attachment id appears.
*
* @param int attach_id The attachment id of the file.
* @return bool Returns false if the id cannot be found.
* @return int Returns the index of the file if it exists.
* @param {int} attachId The attachment id of the file.
* @returns {bool|int} Index of the file if exists, otherwise false.
*/
phpbb.plupload.getIndex = function(attach_id) {
var index = $.inArray(Number(attach_id), phpbb.plupload.ids);
phpbb.plupload.getIndex = function(attachId) {
var index = $.inArray(Number(attachId), phpbb.plupload.ids);
return (index !== -1) ? index : false;
};
/**
* Set the data in phpbb.plupload.data and phpbb.plupload.ids arrays.
*
* @param array data Array containing the new data to use. In the form of
* array(index => object(property: value). Requires attach_id to be one of the object properties.
*
* @return undefined
* @param {Array} data Array containing the new data to use. In the form of
* array(index => object(property: value). Requires attach_id to be one of the object properties.
*/
phpbb.plupload.setData = function(data) {
// Make sure that the array keys are reset.
@@ -121,12 +121,11 @@ phpbb.plupload.setData = function(data) {
/**
* Update the attachment data in the HTML and the phpbb & phpbb.plupload objects.
*
* @param array data Array containing the new data to use.
* @param string action The action that required the update. Used to update the inline attachment bbcodes.
* @param int index The index from phpbb.plupload_ids that was affected by the action.
* @param array downloadUrl Optional array of download urls to update.
* @return undefined
*
* @param {Array} data Array containing the new data to use.
* @param {string} action The action that required the update. Used to update the inline attachment bbcodes.
* @param {int} index The index from phpbb.plupload_ids that was affected by the action.
* @param {Array} downloadUrl Optional array of download urls to update.
*/
phpbb.plupload.update = function(data, action, index, downloadUrl) {
@@ -139,9 +138,8 @@ phpbb.plupload.update = function(data, action, index, downloadUrl) {
/**
* Update the relevant elements and hidden data for all attachments.
*
* @param array downloadUrl Optional array of download urls to update.
* @return undefined
*
* @param {Array} downloadUrl Optional array of download urls to update.
*/
phpbb.plupload.updateRows = function(downloadUrl) {
for (var i = 0; i < phpbb.plupload.ids.length; i++) {
@@ -154,9 +152,8 @@ phpbb.plupload.updateRows = function(downloadUrl) {
* using the id "attach-row-tpl" to be present. This snippet is cloned and the
* data for the file inserted into it. The row is then appended or prepended to
* #file-list based on the attach_order setting.
*
* @param object file Plupload file object for the new attachment.
* @return undefined
*
* @param {object} file Plupload file object for the new attachment.
*/
phpbb.plupload.insertRow = function(file) {
var row = $(phpbb.plupload.rowTpl);
@@ -165,7 +162,7 @@ phpbb.plupload.insertRow = function(file) {
row.find('.file-name').html(plupload.xmlEncode(file.name));
row.find('.file-size').html(plupload.formatSize(file.size));
if (phpbb.plupload.order == 'desc') {
if (phpbb.plupload.order === 'desc') {
$('#file-list').prepend(row);
} else {
$('#file-list').append(row);
@@ -174,10 +171,9 @@ phpbb.plupload.insertRow = function(file) {
/**
* Update the relevant elements and hidden data for an attachment.
*
* @param int index The index from phpbb.plupload.ids of the attachment to edit.
* @param array downloadUrl Optional array of download urls to update.
* @return undefined
*
* @param {int} index The index from phpbb.plupload.ids of the attachment to edit.
* @param {Array} downloadUrl Optional array of download urls to update.
*/
phpbb.plupload.updateRow = function(index, downloadUrl) {
var attach = phpbb.plupload.data[index],
@@ -189,7 +185,7 @@ phpbb.plupload.updateRow = function(index, downloadUrl) {
link = $('<a></a>');
link.attr('href', url).html(attach.real_filename);
row.find('.file-name').html(link)
row.find('.file-name').html(link);
}
row.find('textarea').attr('name', 'comment_list[' + index + ']');
@@ -199,18 +195,21 @@ phpbb.plupload.updateRow = function(index, downloadUrl) {
/**
* Update hidden input data for an attachment.
*
* @param object row jQuery object for the attachment row.
* @param object attach Attachment data object from phpbb.plupload.data
* @param int index Attachment index from phpbb.plupload.ids
* @return undefined
* @param {object} row jQuery object for the attachment row.
* @param {object} attach Attachment data object from phpbb.plupload.data
* @param {int} index Attachment index from phpbb.plupload.ids
*/
phpbb.plupload.updateHiddenData = function(row, attach, index) {
row.find('input[type="hidden"]').remove();
for (var key in attach) {
if (!attach.hasOwnProperty(key)) {
return;
}
var input = $('<input />')
.attr('type', 'hidden')
.attr('name', 'attachment_data[' + index + '][' + key +']')
.attr('name', 'attachment_data[' + index + '][' + key + ']')
.attr('value', attach[key]);
$('textarea', row).after(input);
}
@@ -222,16 +221,14 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) {
* responds with the updated attachment data list so that any future
* uploads can maintain state with the server
*
* @param object row jQuery object for the attachment row.
* @param int attachId Attachment id of the file to be removed.
*
* @return undefined
* @param {object} row jQuery object for the attachment row.
* @param {int} attachId Attachment id of the file to be removed.
*/
phpbb.plupload.deleteFile = function(row, attachId) {
// If there's no attach id, then the file hasn't been uploaded. Simply delete the row.
if (typeof attachId === 'undefined') {
var file = uploader.getFile(row.attr('id'));
uploader.removeFile(file);
var file = phpbb.plupload.uploader.getFile(row.attr('id'));
phpbb.plupload.uploader.removeFile(file);
row.slideUp(100, function() {
row.remove();
@@ -259,7 +256,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
// trigger_error() was called which likely means a permission error was encountered.
if (typeof response.title !== 'undefined') {
uploader.trigger('Error', {message: response.message});
phpbb.plupload.uploader.trigger('Error', { message: response.message });
// We will have to assume that the deletion failed. So leave the file status as uploaded.
row.find('.file-status').toggleClass('file-uploaded');
@@ -270,21 +267,21 @@ phpbb.plupload.deleteFile = function(row, attachId) {
phpbb.plupload.handleMaxFilesReached();
if (row.attr('id')) {
var file = uploader.getFile(row.attr('id'));
uploader.removeFile(file);
var file = phpbb.plupload.uploader.getFile(row.attr('id'));
phpbb.plupload.uploader.removeFile(file);
}
row.slideUp(100, function() {
row.remove();
// Hide the file list if it's empty now.
phpbb.plupload.hideEmptyList();
});
uploader.trigger('FilesRemoved');
phpbb.plupload.uploader.trigger('FilesRemoved');
};
$.ajax(phpbb.plupload.config.url, {
type: 'POST',
data: $.extend(fields, phpbb.plupload.getSerializedData()),
headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'}
headers: phpbb.plupload.config.headers
})
.always(always)
.done(done);
@@ -292,25 +289,21 @@ phpbb.plupload.deleteFile = function(row, attachId) {
/**
* Check the attachment list and hide its container if it's empty.
*
* @return undefined
*/
phpbb.plupload.hideEmptyList = function() {
if (!$('#file-list').children().length) {
$('#file-list-container').slideUp(100);
}
}
};
/**
* Update the indices used in inline attachment bbcodes. This ensures that the bbcodes
* correspond to the correct file after a file is added or removed. This should be called
* before the phpbb.plupload,data and phpbb.plupload.ids arrays are updated, otherwise it will
* not work correctly.
* Update the indices used in inline attachment bbcodes. This ensures that the
* bbcodes correspond to the correct file after a file is added or removed.
* This should be called before the phpbb.plupload,data and phpbb.plupload.ids
* arrays are updated, otherwise it will not work correctly.
*
* @param string action The action that occurred -- either "addition" or "removal"
* @param int index The index of the attachment from phpbb.plupload.ids that was affected.
*
* @return undefined
* @param {string} action The action that occurred -- either "addition" or "removal"
* @param {int} index The index of the attachment from phpbb.plupload.ids that was affected.
*/
phpbb.plupload.updateBbcode = function(action, index) {
var textarea = $('#message', phpbb.plupload.form),
@@ -322,64 +315,59 @@ phpbb.plupload.updateBbcode = function(action, index) {
return;
}
// Private function used to replace the bbcode.
var updateBbcode = function(match, fileName) {
// Remove the bbcode if the file was removed.
if (removal && index === i) {
return '';
}
var newIndex = i + ((removal) ? -1 : 1);
return '[attachment=' + newIndex +']' + fileName + '[/attachment]';
};
function runUpdate(i) {
var regex = new RegExp('\\[attachment=' + i + '\\](.*?)\\[\\/attachment\\]', 'g');
text = text.replace(regex, function updateBbcode(_, fileName) {
// Remove the bbcode if the file was removed.
if (removal && index === i) {
return '';
}
var newIndex = i + ((removal) ? -1 : 1);
return '[attachment=' + newIndex + ']' + fileName + '[/attachment]';
});
}
// Private function used to generate search regexp
var searchRegexp = function(index) {
return new RegExp('\\[attachment=' + index + '\\](.*?)\\[\\/attachment\\]', 'g');
}
// The update order of the indices is based on the action taken to ensure that we don't corrupt
// the bbcode index by updating it several times as we move through the loop.
// Removal loop starts at the removed index and moves to the end of the array.
// Addition loop starts at the end of the array and moves to the added index at 0.
var searchLoop = function() {
if (typeof i === 'undefined') {
i = (removal) ? index : phpbb.plupload.ids.length - 1;
}
return (removal) ? (i < phpbb.plupload.ids.length): (i >= index);
}
// Loop forwards when removing and backwards when adding ensures we don't
// corrupt the bbcode index.
var i;
while (searchLoop()) {
text = text.replace(searchRegexp(i), updateBbcode);
(removal) ? i++ : i--;
if (removal) {
for (i = index; i < phpbb.plupload.ids.length; i++) {
runUpdate(i);
}
} else {
for (i = phpbb.plupload.ids.length - 1; i >= index; i--) {
runUpdate(i);
}
}
textarea.val(text);
};
/**
* Get Plupload file objects based on their upload status.
*
* @param int status Plupload status - plupload.DONE, plupload.FAILED, plupload.QUEUED,
* plupload.STARTED, plupload.STOPPED
* @param {int} status Plupload status - plupload.DONE, plupload.FAILED,
* plupload.QUEUED, plupload.STARTED, plupload.STOPPED
*
* @return Returns an array of the Plupload file objects matching the status.
* @returns {Array} The Plupload file objects matching the status.
*/
phpbb.plupload.getFilesByStatus = function(status) {
var files = [];
$.each(uploader.files, function(i, file) {
$.each(phpbb.plupload.uploader.files, function(i, file) {
if (file.status === status) {
files.push(file);
}
});
return files;
}
};
/**
* Check whether the user has reached the maximun number of files that he's allowed
* to upload. If so, disables the uploader and marks the queued files as failed. Otherwise
* makes sure that the uploader is enabled.
*
* @return bool Returns true if the limit has been reached. False if otherwise.
* @returns {bool} True if the limit has been reached. False if otherwise.
*/
phpbb.plupload.handleMaxFilesReached = function() {
// If there is no limit, the user is an admin or moderator.
@@ -392,41 +380,36 @@ phpbb.plupload.handleMaxFilesReached = function() {
phpbb.plupload.markQueuedFailed(phpbb.plupload.lang.TOO_MANY_ATTACHMENTS);
// Disable the uploader.
phpbb.plupload.disableUploader();
uploader.trigger('Error', {message: phpbb.plupload.lang.TOO_MANY_ATTACHMENTS});
phpbb.plupload.uploader.trigger('Error', { message: phpbb.plupload.lang.TOO_MANY_ATTACHMENTS });
return true;
} else if(phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
} else if (phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
// Enable the uploader if the user is under the limit
phpbb.plupload.enableUploader();
}
return false;
}
};
/**
* Disable the uploader
*
* @return undefined
*/
phpbb.plupload.disableUploader = function() {
$('#add_files').addClass('disabled');
uploader.disableBrowse();
}
phpbb.plupload.uploader.disableBrowse();
};
/**
* Enable the uploader
*
* @return undefined
*/
phpbb.plupload.enableUploader = function() {
$('#add_files').removeClass('disabled');
uploader.disableBrowse(false);
}
phpbb.plupload.uploader.disableBrowse(false);
};
/**
* Mark all queued files as failed.
*
* @param string error Error message to present to the user.
* @return undefined
* @param {string} error Error message to present to the user.
*/
phpbb.plupload.markQueuedFailed = function(error) {
var files = phpbb.plupload.getFilesByStatus(plupload.QUEUED);
@@ -435,48 +418,49 @@ phpbb.plupload.markQueuedFailed = function(error) {
$('#' + file.id).find('.file-progress').hide();
phpbb.plupload.fileError(file, error);
});
}
};
/**
* Marks a file as failed and sets the error message for it.
*
* @param object file Plupload file object that failed.
* @param string error Error message to present to the user.
* @return undefined
* @param {object} file Plupload file object that failed.
* @param {string} error Error message to present to the user.
*/
phpbb.plupload.fileError = function(file, error) {
file.status = plupload.FAILED;
file.error = error;
$('#' + file.id).find('.file-status').addClass('file-error').attr({'data-error-title': phpbb.plupload.lang.ERROR, 'data-error-message': error});
}
$('#' + file.id).find('.file-status')
.addClass('file-error')
.attr({
'data-error-title': phpbb.plupload.lang.ERROR,
'data-error-message': error
});
};
/**
* Set up the Plupload object and get some basic data.
*/
var uploader = new plupload.Uploader(phpbb.plupload.config);
phpbb.plupload.uploader = new plupload.Uploader(phpbb.plupload.config);
phpbb.plupload.initialize();
var $fileList = $('#file-list');
/**
* Insert inline attachment bbcode.
*/
$('#file-list').on('click', '.file-inline-bbcode', function(e) {
$fileList.on('click', '.file-inline-bbcode', function(e) {
var attachId = $(this).parents('.attach-row').attr('data-attach-id'),
index = phpbb.plupload.getIndex(attachId);
attach_inline(index, phpbb.plupload.data[index].real_filename);
attachInline(index, phpbb.plupload.data[index].real_filename);
e.preventDefault();
});
/**
* Delete a file.
*/
$('#file-list').on('click', '.file-delete', function(e) {
$fileList.on('click', '.file-delete', function(e) {
var row = $(this).parents('.attach-row'),
attachId = row.attr('data-attach-id');
@@ -487,7 +471,7 @@ $('#file-list').on('click', '.file-delete', function(e) {
/**
* Display the error message for a particular file when the error icon is clicked.
*/
$('#file-list').on('click', '.file-error', function(e) {
$fileList.on('click', '.file-error', function(e) {
phpbb.alert($(this).attr('data-error-title'), $(this).attr('data-error-message'));
e.preventDefault();
});
@@ -495,7 +479,7 @@ $('#file-list').on('click', '.file-error', function(e) {
/**
* Fires when an error occurs.
*/
uploader.bind('Error', function(up, error) {
phpbb.plupload.uploader.bind('Error', function(up, error) {
error.file.name = plupload.xmlEncode(error.file.name);
// The error message that Plupload provides for these is vague, so we'll be more specific.
@@ -512,18 +496,15 @@ uploader.bind('Error', function(up, error) {
* send the real filename along with the chunk. This is necessary because
* for some reason the filename is set to 'blob' whenever a file is chunked
*
* @param object up The plupload.Uploader object
* @param object file The plupload.File object that is about to be
* uploaded
*
* @return undefined
* @param {object} up The plupload.Uploader object
* @param {object} file The plupload.File object that is about to be uploaded
*/
uploader.bind('BeforeUpload', function(up, file) {
phpbb.plupload.uploader.bind('BeforeUpload', function(up, file) {
if (phpbb.plupload.handleMaxFilesReached()) {
return;
}
phpbb.plupload.updateMultipartParams({'real_filename': file.name});
phpbb.plupload.updateMultipartParams({ real_filename: file.name });
});
/**
@@ -531,14 +512,12 @@ uploader.bind('BeforeUpload', function(up, file) {
* response from the server and checks for an error. If an error occurs it
* is reported to the user and the upload of this particular file is halted
*
* @param object up The plupload.Uploader object
* @param object file The plupload.File object whose chunk has just
* @param {object} up The plupload.Uploader object
* @param {object} file The plupload.File object whose chunk has just
* been uploaded
* @param object response The response object from the server
*
* @return undefined
* @param {object} response The response object from the server
*/
uploader.bind('ChunkUploaded', function(up, file, response) {
phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
if (response.chunk >= response.chunks - 1) {
return;
}
@@ -559,7 +538,7 @@ uploader.bind('ChunkUploaded', function(up, file, response) {
// If trigger_error() was called, then a permission error likely occurred.
if (typeof json.title !== 'undefined') {
json.error = {message: json.message};
json.error = { message: json.message };
}
if (json.error) {
@@ -576,10 +555,8 @@ uploader.bind('ChunkUploaded', function(up, file, response) {
/**
* Fires when files are added to the queue.
*
* @return undefined
*/
uploader.bind('FilesAdded', function(up, files) {
phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
// Prevent unnecessary requests to the server if the user already uploaded
// the maximum number of files allowed.
if (phpbb.plupload.handleMaxFilesReached()) {
@@ -587,13 +564,14 @@ uploader.bind('FilesAdded', function(up, files) {
}
// Switch the active tab if the style supports it
if (typeof activateSubPanel == 'function') {
activateSubPanel('attach-panel');
if (typeof activateSubPanel === 'function') {
activateSubPanel('attach-panel'); // jshint ignore: line
}
// Show the file list if there aren't any files currently.
if (!$('#file-list-container').is(':visible')) {
$('#file-list-container').show(100);
var $fileListContainer = $('#file-list-container');
if (!$fileListContainer.is(':visible')) {
$fileListContainer.show(100);
}
$.each(files, function(i, file) {
@@ -601,7 +579,7 @@ uploader.bind('FilesAdded', function(up, files) {
});
up.bind('UploadProgress', function(up, file) {
$('#' + file.id + " .file-progress-bar").css('width', file.percent + '%');
$('.file-progress-bar', '#' + file.id).css('width', file.percent + '%');
$('#file-total-progress-bar').css('width', up.total.percent + '%');
});
@@ -619,14 +597,12 @@ uploader.bind('FilesAdded', function(up, files) {
* appends it to the next file upload so that the server can maintain state
* with regards to the attachments in a given post
*
* @param object up The plupload.Uploader object
* @param object file The plupload.File object that has just been
* @param {object} up The plupload.Uploader object
* @param {object} file The plupload.File object that has just been
* uploaded
* @param string response The response string from the server
*
* @return undefined
* @param {string} response The response string from the server
*/
uploader.bind('FileUploaded', function(up, file, response) {
phpbb.plupload.uploader.bind('FileUploaded', function(up, file, response) {
var json = {},
row = $('#' + file.id),
error;
@@ -635,7 +611,7 @@ uploader.bind('FileUploaded', function(up, file, response) {
row.find('.file-progress').hide();
try {
json = $.parseJSON(response.response);
json = JSON.parse(response.response);
} catch (e) {
error = 'Error parsing server response.';
}
@@ -643,7 +619,7 @@ uploader.bind('FileUploaded', function(up, file, response) {
// If trigger_error() was called, then a permission error likely occurred.
if (typeof json.title !== 'undefined') {
error = json.message;
up.trigger('Error', {message: error});
up.trigger('Error', { message: error });
// The rest of the queue will fail.
phpbb.plupload.markQueuedFailed(error);
@@ -654,25 +630,19 @@ uploader.bind('FileUploaded', function(up, file, response) {
if (typeof error !== 'undefined') {
phpbb.plupload.fileError(file, error);
} else if (file.status === plupload.DONE) {
file.attachment_data = json['data'][0];
file.attachment_data = json.data[0];
row.attr('data-attach-id', file.attachment_data.attach_id);
row.find('.file-inline-bbcode').show();
row.find('.file-status').addClass('file-uploaded');
phpbb.plupload.update(json['data'], 'addition', 0, [json['download_url']]);
phpbb.plupload.update(json.data, 'addition', 0, [json.download_url]);
}
});
/**
* Fires when the entire queue of files have been uploaded.
*
* @param object up The plupload.Uploader object
* @param array files An array of plupload.File objects that have just
* been uploaded as part of a queue
*
* @return undefined
* Fires when the entire queue of files have been uploaded.
*/
uploader.bind('UploadComplete', function(up, files) {
phpbb.plupload.uploader.bind('UploadComplete', function() {
// Hide the progress bar
setTimeout(function() {
$('#file-total-progress-bar').fadeOut(500, function() {

File diff suppressed because one or more lines are too long

View File

@@ -21,6 +21,7 @@ if (php_sapi_name() != 'cli')
}
define('IN_PHPBB', true);
$phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
require($phpbb_root_path . 'includes/startup.' . $phpEx);
@@ -32,36 +33,50 @@ $phpbb_class_loader->register();
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
extract($phpbb_config_php_file->get_all());
if (!defined('PHPBB_ENVIRONMENT'))
{
@define('PHPBB_ENVIRONMENT', 'production');
}
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file);
$input = new ArgvInput();
if ($input->hasParameterOption(array('--env')))
{
$phpbb_container_builder->with_environment($input->getParameterOption('--env'));
}
if ($input->hasParameterOption(array('--safe-mode')))
{
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder->without_extensions();
$phpbb_container_builder->without_cache();
}
else
{
$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register();
phpbb_load_extensions_autoloaders($phpbb_root_path);
}
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container->get('request')->enable_super_globals();
require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
/* @var $user \phpbb\user */
$user = $phpbb_container->get('user');
$user->add_lang('acp/common');
$user->add_lang('cli');
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $user);
/* @var $lang \phpbb\language\language */
$lang = $phpbb_container->get('language');
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $lang);
$application->setDispatcher($phpbb_container->get('dispatcher'));
$application->register_container_commands($phpbb_container->get('console.command_collection'));
$application->run($input);

View File

@@ -12,7 +12,7 @@
*/
/**
* Minimum Requirement: PHP 5.3.3
* Minimum Requirement: PHP 5.3.9
*/
if (!defined('IN_PHPBB'))
@@ -29,6 +29,11 @@ $phpbb_class_loader->register();
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
extract($phpbb_config_php_file->get_all());
if (!defined('PHPBB_ENVIRONMENT'))
{
@define('PHPBB_ENVIRONMENT', 'production');
}
if (!defined('PHPBB_INSTALLED'))
{
// Redirect the user to the installer
@@ -47,14 +52,14 @@ if (!defined('PHPBB_INSTALLED'))
}
// $phpbb_root_path accounts for redirects from e.g. /adm
$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/index.' . $phpEx;
$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/app.' . $phpEx;
// Replace any number of consecutive backslashes and/or slashes with a single slash
// (could happen on some proxy setups and/or Windows servers)
$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
// Eliminate . and .. from the path
require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx);
$phpbb_filesystem = new phpbb\filesystem();
$phpbb_filesystem = new phpbb\filesystem\filesystem();
$script_path = $phpbb_filesystem->clean_path($script_path);
$url = (($secure) ? 'https://' : 'http://') . $server_name;
@@ -91,11 +96,19 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle
$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register();
phpbb_load_extensions_autoloaders($phpbb_root_path);
// Set up container
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
try
{
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file)->get_container();
}
catch (InvalidArgumentException $e)
{
trigger_error(
'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
E_USER_ERROR
);
}
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
@@ -104,7 +117,9 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
// Add own hook handler
require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('\phpbb\template\template', 'display')));
$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
/* @var $phpbb_hook_finder \phpbb\hook\finder */
$phpbb_hook_finder = $phpbb_container->get('hook_finder');
foreach ($phpbb_hook_finder->find() as $hook)

View File

@@ -25,30 +25,39 @@
"phpbb/phpbb-core": "self.version"
},
"require": {
"php": ">=5.3.3",
"bantu/ini-get-wrapper": "1.0.*",
"google/recaptcha": "~1.1",
"lusitanian/oauth": "0.2.*",
"symfony/config": "2.3.*",
"symfony/console": "2.3.*",
"symfony/dependency-injection": "2.3.*",
"symfony/event-dispatcher": "2.3.*",
"symfony/http-kernel": "2.3.*",
"symfony/routing": "2.3.*",
"symfony/yaml": "2.3.*",
"twig/twig": "1.13.*"
"marc1706/fast-image-size": "1.1.*",
"patchwork/utf8": "1.1.*",
"php": ">=5.4",
"s9e/text-formatter": "dev-release/php5.3",
"symfony/config": "2.8.*@dev",
"symfony/console": "2.8.*@dev",
"symfony/dependency-injection": "2.8.*@dev",
"symfony/event-dispatcher": "2.8.*@dev",
"symfony/filesystem": "2.8.*@dev",
"symfony/finder": "2.8.*@dev",
"symfony/http-kernel": "2.8.*@dev",
"symfony/routing": "2.8.*@dev",
"symfony/security-core": "2.8.*@dev",
"symfony/security-csrf": "2.8.*@dev",
"symfony/twig-bridge": "2.8.*@dev",
"symfony/yaml": "2.8.*@dev",
"twig/twig": "1.*"
},
"require-dev": {
"fabpot/goutte": "1.0.*",
"phing/phing": "2.4.*",
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",
"phing/phing": "2.4.*",
"sami/sami": "1.*",
"squizlabs/php_codesniffer": "1.*",
"symfony/browser-kit": "2.3.*",
"symfony/debug": "2.3.*",
"symfony/dom-crawler": "2.3.*",
"symfony/filesystem": "2.3.*",
"symfony/finder": "2.3.*",
"symfony/http-foundation": "2.3.*",
"symfony/process": "2.3.*"
"squizlabs/php_codesniffer": "2.*",
"symfony/browser-kit": "2.8.*@dev",
"symfony/css-selector": "2.8.*@dev",
"symfony/debug": "2.8.*@dev",
"symfony/dom-crawler": "2.8.*@dev",
"symfony/http-foundation": "2.8.*@dev",
"symfony/process": "2.8.*@dev"
}
}

1148
phpBB/composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1 @@
# phpBB's config file (This line is needed because of the packager)

View File

@@ -0,0 +1,20 @@
parameters:
# Disable the usage of the super globals (_GET, _POST, _SERVER...)
core.disable_super_globals: true
# Datetime class to use
datetime.class: \phpbb\datetime
# Mimetype guesser priorities
mimetype.guesser.priority.lowest: -2
mimetype.guesser.priority.low: -1
mimetype.guesser.priority.default: 0
mimetype.guesser.priority.high: 1
mimetype.guesser.priority.highest: 2
# List of default password driver types
passwords.algorithms:
- passwords.driver.bcrypt_2y
- passwords.driver.bcrypt
- passwords.driver.salted_md5
- passwords.driver.phpass

View File

@@ -0,0 +1,169 @@
imports:
- { resource: services_attachment.yml }
- { resource: services_auth.yml }
- { resource: services_avatar.yml }
- { resource: services_captcha.yml }
- { resource: services_console.yml }
- { resource: services_content.yml }
- { resource: services_cron.yml }
- { resource: services_db.yml }
- { resource: services_event.yml }
- { resource: services_feed.yml }
- { resource: services_files.yml }
- { resource: services_filesystem.yml }
- { resource: services_help.yml }
- { resource: services_hook.yml }
- { resource: services_http.yml }
- { resource: services_language.yml }
- { resource: services_migrator.yml }
- { resource: services_mimetype_guesser.yml }
- { resource: services_module.yml }
- { resource: services_notification.yml }
- { resource: services_password.yml }
- { resource: services_php.yml }
- { resource: services_profilefield.yml }
- { resource: services_report.yml }
- { resource: services_routing.yml }
- { resource: services_text_formatter.yml }
- { resource: services_text_reparser.yml }
- { resource: services_twig.yml }
- { resource: services_user.yml }
- { resource: tables.yml }
- { resource: parameters.yml }
services:
cache:
class: phpbb\cache\service
arguments:
- @cache.driver
- @config
- @dbal.conn
- %core.root_path%
- %core.php_ext%
cache.driver:
class: %cache.driver.class%
class_loader:
class: phpbb\class_loader
arguments:
- phpbb\
- %core.root_path%includes/
- %core.php_ext%
calls:
- [register, []]
- [set_cache, [@cache.driver]]
class_loader.ext:
class: phpbb\class_loader
arguments:
- \
- %core.root_path%ext/
- %core.php_ext%
calls:
- [register, []]
- [set_cache, [@cache.driver]]
config:
class: phpbb\config\db
arguments:
- @dbal.conn
- @cache.driver
- %tables.config%
config.php:
synthetic: true
config_text:
class: phpbb\config\db_text
arguments:
- @dbal.conn
- %tables.config_text%
controller.helper:
class: phpbb\controller\helper
arguments:
- @template
- @user
- @config
- @symfony_request
- @request
- @routing.helper
controller.resolver:
class: phpbb\controller\resolver
arguments:
- @service_container
- %core.root_path%
- @template
ext.manager:
class: phpbb\extension\manager
arguments:
- @service_container
- @dbal.conn
- @config
- @filesystem
- %tables.ext%
- %core.root_path%
- %core.php_ext%
- @cache.driver
file_downloader:
class: phpbb\file_downloader
file_locator:
class: phpbb\routing\file_locator
arguments:
- @filesystem
- %core.root_path%
group_helper:
class: phpbb\group\helper
arguments:
- @language
log:
class: phpbb\log\log
arguments:
- @dbal.conn
- @user
- @auth
- @dispatcher
- %core.root_path%
- %core.adm_relative_path%
- %core.php_ext%
- %tables.log%
path_helper:
class: phpbb\path_helper
arguments:
- @symfony_request
- @filesystem
- @request
- %core.root_path%
- %core.php_ext%
- %core.adm_relative_path%
plupload:
class: phpbb\plupload\plupload
arguments:
- %core.root_path%
- @config
- @request
- @user
- @php_ini
- @mimetype.guesser
upload_imagesize:
class: FastImageSize\FastImageSize
version_helper:
class: phpbb\version_helper
scope: prototype
arguments:
- @cache
- @config
- @file_downloader
- @user

View File

@@ -0,0 +1,40 @@
services:
attachment.delete:
class: phpbb\attachment\delete
scope: prototype
arguments:
- @config
- @dbal.conn
- @dispatcher
- @filesystem
- @attachment.resync
- %core.root_path%
attachment.manager:
class: phpbb\attachment\manager
scope: prototype
arguments:
- @attachment.delete
- @attachment.resync
- @attachment.upload
attachment.resync:
class: phpbb\attachment\resync
scope: prototype
arguments:
- @dbal.conn
attachment.upload:
class: phpbb\attachment\upload
scope: prototype
arguments:
- @auth
- @cache
- @config
- @files.upload
- @language
- @mimetype.guesser
- @dispatcher
- @plupload
- @user
- %core.root_path%

View File

@@ -1,4 +1,9 @@
services:
# ----- Auth management -----
auth:
class: phpbb\auth\auth
# ----- Auth providers -----
auth.provider_collection:
class: phpbb\auth\provider_collection
arguments:
@@ -6,6 +11,7 @@ services:
- @config
tags:
- { name: service_collection, tag: auth.provider }
auth.provider.db:
class: phpbb\auth\provider\db
arguments:
@@ -19,6 +25,7 @@ services:
- %core.php_ext%
tags:
- { name: auth.provider }
auth.provider.apache:
class: phpbb\auth\provider\apache
arguments:
@@ -31,6 +38,7 @@ services:
- %core.php_ext%
tags:
- { name: auth.provider }
auth.provider.ldap:
class: phpbb\auth\provider\ldap
arguments:
@@ -40,6 +48,7 @@ services:
- @user
tags:
- { name: auth.provider }
auth.provider.oauth:
class: phpbb\auth\provider\oauth\oauth
arguments:
@@ -52,16 +61,20 @@ services:
- %tables.auth_provider_oauth_account_assoc%
- @auth.provider.oauth.service_collection
- %tables.users%
- @service_container
- %core.root_path%
- %core.php_ext%
tags:
- { name: auth.provider }
# ----- OAuth services providers -----
auth.provider.oauth.service_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: auth.provider.oauth.service }
auth.provider.oauth.service.bitly:
class: phpbb\auth\provider\oauth\service\bitly
arguments:
@@ -69,6 +82,7 @@ services:
- @request
tags:
- { name: auth.provider.oauth.service }
auth.provider.oauth.service.facebook:
class: phpbb\auth\provider\oauth\service\facebook
arguments:
@@ -76,6 +90,7 @@ services:
- @request
tags:
- { name: auth.provider.oauth.service }
auth.provider.oauth.service.google:
class: phpbb\auth\provider\oauth\service\google
arguments:

View File

@@ -1,8 +1,23 @@
services:
avatar.manager:
class: phpbb\avatar\manager
arguments:
- @config
- @avatar.driver_collection
# ----- Avatar drivers -----
avatar.driver_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: avatar.driver }
avatar.driver.gravatar:
class: phpbb\avatar\driver\gravatar
arguments:
- @config
- @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
@@ -16,6 +31,7 @@ services:
class: phpbb\avatar\driver\local
arguments:
- @config
- @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
@@ -29,6 +45,7 @@ services:
class: phpbb\avatar\driver\remote
arguments:
- @config
- @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
@@ -44,17 +61,12 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
- @filesystem
- @path_helper
- @mimetype.guesser
- @dispatcher
- @files.factory
- @cache.driver
calls:
- [set_name, [avatar.driver.upload]]
tags:
- { name: avatar.driver }
avatar.driver_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: avatar.driver }

View File

@@ -1,8 +1,3 @@
parameters:
tables.captcha_qa_questions: %core.table_prefix%captcha_questions
tables.captcha_qa_answers: %core.table_prefix%captcha_answers
tables.captcha_qa_confirm: %core.table_prefix%qa_confirm
services:
captcha.factory:
class: phpbb\captcha\factory
@@ -10,6 +5,8 @@ services:
- @service_container
- @captcha.plugins.service_collection
# ----- Captcha plugins -----
# Scope MUST be prototype for all the plugins to work.
captcha.plugins.service_collection:
class: phpbb\di\service_collection
arguments:
@@ -19,7 +16,7 @@ services:
core.captcha.plugins.gd:
class: phpbb\captcha\plugins\gd
scope: prototype # scope MUST be prototype for this to work!
scope: prototype
calls:
- [set_name, [core.captcha.plugins.gd]]
tags:
@@ -27,7 +24,7 @@ services:
core.captcha.plugins.gd_wave:
class: phpbb\captcha\plugins\gd_wave
scope: prototype # scope MUST be prototype for this to work!
scope: prototype
calls:
- [set_name, [core.captcha.plugins.gd_wave]]
tags:
@@ -35,7 +32,7 @@ services:
core.captcha.plugins.nogd:
class: phpbb\captcha\plugins\nogd
scope: prototype # scope MUST be prototype for this to work!
scope: prototype
calls:
- [set_name, [core.captcha.plugins.nogd]]
tags:
@@ -43,7 +40,7 @@ services:
core.captcha.plugins.qa:
class: phpbb\captcha\plugins\qa
scope: prototype # scope MUST be prototype for this to work!
scope: prototype
arguments:
- %tables.captcha_qa_questions%
- %tables.captcha_qa_answers%
@@ -55,7 +52,7 @@ services:
core.captcha.plugins.recaptcha:
class: phpbb\captcha\plugins\recaptcha
scope: prototype # scope MUST be prototype for this to work!
scope: prototype
calls:
- [set_name, [core.captcha.plugins.recaptcha]]
tags:

View File

@@ -1,4 +1,12 @@
services:
console.exception_subscriber:
class: phpbb\console\exception_subscriber
arguments:
- @language
- %debug.exceptions%
tags:
- { name: kernel.event_subscriber }
console.command_collection:
class: phpbb\di\service_collection
arguments:
@@ -75,15 +83,43 @@ services:
tags:
- { name: console.command }
console.command.db.migrate:
class: phpbb\console\command\db\migrate
console.command.db.list:
class: phpbb\console\command\db\list_command
arguments:
- @user
- @migrator
- @ext.manager
- @config
- @cache
tags:
- { name: console.command }
console.command.db.migrate:
class: phpbb\console\command\db\migrate
arguments:
- @user
- @language
- @migrator
- @ext.manager
- @config
- @cache
- @log
- @filesystem
- %core.root_path%
tags:
- { name: console.command }
console.command.db.revert:
class: phpbb\console\command\db\revert
arguments:
- @user
- @language
- @migrator
- @ext.manager
- @config
- @cache
- @filesystem
- %core.root_path%
tags:
- { name: console.command }
@@ -138,3 +174,47 @@ services:
- @dbal.conn
tags:
- { name: console.command }
console.command.reparser.list:
class: phpbb\console\command\reparser\list_all
arguments:
- @user
- @text_reparser_collection
tags:
- { name: console.command }
console.command.reparser.reparse:
class: phpbb\console\command\reparser\reparse
arguments:
- @user
- @text_reparser_collection
- @config_text
tags:
- { name: console.command }
console.command.thumbnail.delete:
class: phpbb\console\command\thumbnail\delete
arguments:
- @user
- @dbal.conn
- %core.root_path%
tags:
- { name: console.command }
console.command.thumbnail.generate:
class: phpbb\console\command\thumbnail\generate
arguments:
- @user
- @dbal.conn
- @cache
- %core.root_path%
- %core.php_ext%
tags:
- { name: console.command }
console.command.thumbnail.recreate:
class: phpbb\console\command\thumbnail\recreate
arguments:
- @user
tags:
- { name: console.command }

View File

@@ -0,0 +1,72 @@
services:
content.visibility:
class: phpbb\content_visibility
arguments:
- @auth
- @config
- @dispatcher
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
- %tables.forums%
- %tables.posts%
- %tables.topics%
- %tables.users%
groupposition.legend:
class: phpbb\groupposition\legend
arguments:
- @dbal.conn
- @user
groupposition.teampage:
class: phpbb\groupposition\teampage
arguments:
- @dbal.conn
- @user
- @cache.driver
message.form.admin:
class: phpbb\message\admin_form
arguments:
- @auth
- @config
- @config_text
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
message.form.topic:
class: phpbb\message\topic_form
arguments:
- @auth
- @config
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
message.form.user:
class: phpbb\message\user_form
arguments:
- @auth
- @config
- @dbal.conn
- @user
- %core.root_path%
- %core.php_ext%
pagination:
class: phpbb\pagination
arguments:
- @template
- @user
- @controller.helper
- @dispatcher
viewonline_helper:
class: phpbb\viewonline_helper
arguments:
- @filesystem

View File

@@ -1,4 +1,26 @@
services:
cron.manager:
class: phpbb\cron\manager
arguments:
- @cron.task_collection
- %core.root_path%
- %core.php_ext%
cron.lock_db:
class: phpbb\lock\db
arguments:
- cron_lock
- @config
- @dbal.conn
# ----- Cron tasks -----
cron.task_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: cron.task }
cron.task.core.prune_all_forums:
class: phpbb\cron\task\core\prune_all_forums
arguments:
@@ -98,6 +120,7 @@ services:
- @config
- @dbal.conn
- @user
- @dispatcher
calls:
- [set_name, [cron.task.core.tidy_search]]
tags:

View File

@@ -0,0 +1,81 @@
services:
dbal.conn:
class: phpbb\db\driver\factory
arguments:
- @service_container
dbal.conn.driver:
class: %dbal.driver.class%
calls:
- [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
# ----- DB Tools -----
dbal.tools.factory:
class: phpbb\db\tools\factory
dbal.tools:
class: phpbb\db\tools\tools_interface
factory: ["@dbal.tools.factory", get]
arguments:
- @dbal.conn.driver
# ----- DB Extractor -----
dbal.extractor.factory:
class: phpbb\db\extractor\factory
arguments:
- @dbal.conn.driver
- @service_container
dbal.extractor:
class: phpbb\db\extractor\extractor_interface
factory: ["@dbal.extractor.factory", get]
# ----- DB Extractors for different drivers -----
# Scope MUST be prototype for all the handlers to work correctly.
dbal.extractor.extractors.mssql_extractor:
class: phpbb\db\extractor\mssql_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
dbal.extractor.extractors.mysql_extractor:
class: phpbb\db\extractor\mysql_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
dbal.extractor.extractors.oracle_extractor:
class: phpbb\db\extractor\oracle_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
dbal.extractor.extractors.postgres_extractor:
class: phpbb\db\extractor\postgres_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
dbal.extractor.extractors.sqlite3_extractor:
class: phpbb\db\extractor\sqlite3_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver
dbal.extractor.extractors.sqlite_extractor:
class: phpbb\db\extractor\sqlite_extractor
scope: prototype
arguments:
- %core.root_path%
- @request
- @dbal.conn.driver

View File

@@ -0,0 +1,25 @@
services:
dispatcher:
class: phpbb\event\dispatcher
arguments:
- @service_container
kernel_exception_subscriber:
class: phpbb\event\kernel_exception_subscriber
arguments:
- @template
- @language
tags:
- { name: kernel.event_subscriber }
kernel_terminate_subscriber:
class: phpbb\event\kernel_terminate_subscriber
tags:
- { name: kernel.event_subscriber }
symfony_response_listener:
class: Symfony\Component\HttpKernel\EventListener\ResponseListener
arguments:
- UTF-8
tags:
- { name: kernel.event_subscriber }

View File

@@ -1,4 +1,18 @@
services:
phpbb.feed.controller:
class: phpbb\feed\controller\feed
arguments:
- @template.twig.environment
- @symfony_request
- @controller.helper
- @config
- @dbal.conn
- @service_container
- @feed.helper
- @user
- @auth
- %core.php_ext%
feed.helper:
class: phpbb\feed\helper
arguments:
@@ -7,13 +21,6 @@ services:
- %core.root_path%
- %core.php_ext%
feed.factory:
class: phpbb\feed\factory
arguments:
- @service_container
- @config
- @dbal.conn
feed.forum:
class: phpbb\feed\forum
scope: prototype

View File

@@ -0,0 +1,56 @@
services:
files.factory:
class: phpbb\files\factory
arguments:
- @service_container
files.filespec:
class: phpbb\files\filespec
scope: prototype
arguments:
- @filesystem
- @language
- @php_ini
- @upload_imagesize
- %core.root_path%
- @mimetype.guesser
- @plupload
files.upload:
class: phpbb\files\upload
scope: prototype
arguments:
- @filesystem
- @files.factory
- @language
- @php_ini
- @request
files.types.form:
class: phpbb\files\types\form
scope: prototype
arguments:
- @files.factory
- @language
- @php_ini
- @plupload
- @request
files.types.local:
class: phpbb\files\types\form
scope: prototype
arguments:
- @files.factory
- @language
- @php_ini
- @request
files.types.remote:
class: phpbb\files\types\remote
scope: prototype
arguments:
- @files.factory
- @language
- @php_ini
- @request
- %core.root_path%

View File

@@ -0,0 +1,3 @@
services:
filesystem:
class: phpbb\filesystem\filesystem

View File

@@ -0,0 +1,27 @@
services:
phpbb.help.manager:
class: phpbb\help\manager
arguments:
- @dispatcher
- @language
- @template
phpbb.help.controller.bbcode:
class: phpbb\help\controller\bbcode
arguments:
- @controller.helper
- @phpbb.help.manager
- @template
- @language
- %core.root_path%
- %core.php_ext%
phpbb.help.controller.faq:
class: phpbb\help\controller\faq
arguments:
- @controller.helper
- @phpbb.help.manager
- @template
- @language
- %core.root_path%
- %core.php_ext%

View File

@@ -0,0 +1,7 @@
services:
hook_finder:
class: phpbb\hook\finder
arguments:
- %core.root_path%
- %core.php_ext%
- @cache.driver

View File

@@ -0,0 +1,23 @@
services:
http_kernel:
class: Symfony\Component\HttpKernel\HttpKernel
arguments:
- @dispatcher
- @controller.resolver
- @request_stack
# WARNING: The Symfony request does not escape the input and should be used very carefully
# prefer the phpbb request (service @request) as possible
symfony_request:
class: phpbb\symfony_request
arguments:
- @request
request_stack:
class: Symfony\Component\HttpFoundation\RequestStack
request:
class: phpbb\request\request
arguments:
- null
- %core.disable_super_globals%

View File

@@ -0,0 +1,22 @@
services:
language.helper.language_file:
class: phpbb\language\language_file_helper
arguments:
- %core.root_path%
language:
class: phpbb\language\language
arguments:
- @language.loader
language.loader_abstract:
abstract: true
class: phpbb\language\language_file_loader
arguments:
- %core.root_path%
- %core.php_ext%
language.loader:
parent: language.loader_abstract
calls:
- [set_extension_manager, ["@ext.manager"]]

View File

@@ -1,7 +1,9 @@
services:
# ----- Migrator -----
migrator:
class: phpbb\db\migrator
arguments:
- @service_container
- @config
- @dbal.conn
- @dbal.tools
@@ -15,6 +17,7 @@ services:
migrator.helper:
class: phpbb\db\migration\helper
# ----- Migrator's tools -----
migrator.tool_collection:
class: phpbb\di\service_collection
arguments:
@@ -42,6 +45,7 @@ services:
- @dbal.conn
- @cache
- @user
- @module.manager
- %core.root_path%
- %core.php_ext%
- %tables.modules%

View File

@@ -1,11 +1,11 @@
parameters:
mimetype.guesser.priority.lowest: -2
mimetype.guesser.priority.low: -1
mimetype.guesser.priority.default: 0
mimetype.guesser.priority.high: 1
mimetype.guesser.priority.highest: 2
services:
mimetype.guesser_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: mimetype.guessers }
mimetype.fileinfo_mimetype_guesser:
class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser
tags:
@@ -30,13 +30,6 @@ services:
tags:
- { name: mimetype.guessers }
mimetype.guesser_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: mimetype.guessers }
mimetype.guesser:
class: phpbb\mimetype\guesser
arguments:

View File

@@ -0,0 +1,10 @@
services:
module.manager:
class: phpbb\module\module_manager
arguments:
- @cache.driver
- @dbal.conn
- @ext.manager
- %tables.modules%
- %core.root_path%
- %core.php_ext%

View File

@@ -0,0 +1,224 @@
services:
notification_manager:
class: phpbb\notification\manager
arguments:
- @notification.type_collection
- @notification.method_collection
- @service_container
- @user_loader
- @dispatcher
- @dbal.conn
- @cache
- @language
- @user
- %tables.notification_types%
- %tables.user_notifications%
# ----- Notification's types -----
# Scope MUST be prototype for all the plugins to work.
notification.type_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: notification.type }
notification.type.base:
abstract: true
arguments:
- @dbal.conn
- @language
- @user
- @auth
- %core.root_path%
- %core.php_ext%
- %tables.user_notifications%
notification.type.admin_activate_user:
class: phpbb\notification\type\admin_activate_user
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
tags:
- { name: notification.type }
notification.type.approve_post:
class: phpbb\notification\type\approve_post
scope: prototype
parent: notification.type.post
tags:
- { name: notification.type }
notification.type.approve_topic:
class: phpbb\notification\type\approve_topic
scope: prototype
parent: notification.type.topic
tags:
- { name: notification.type }
notification.type.bookmark:
class: phpbb\notification\type\bookmark
scope: prototype
parent: notification.type.post
tags:
- { name: notification.type }
notification.type.disapprove_post:
class: phpbb\notification\type\disapprove_post
scope: prototype
parent: notification.type.post
tags:
- { name: notification.type }
notification.type.disapprove_topic:
class: phpbb\notification\type\disapprove_topic
scope: prototype
parent: notification.type.topic
tags:
- { name: notification.type }
notification.type.group_request:
class: phpbb\notification\type\group_request
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
tags:
- { name: notification.type }
notification.type.group_request_approved:
class: phpbb\notification\type\group_request_approved
scope: prototype
parent: notification.type.base
tags:
- { name: notification.type }
notification.type.pm:
class: phpbb\notification\type\pm
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
tags:
- { name: notification.type }
notification.type.post:
class: phpbb\notification\type\post
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
tags:
- { name: notification.type }
notification.type.post_in_queue:
class: phpbb\notification\type\post_in_queue
scope: prototype
parent: notification.type.post
tags:
- { name: notification.type }
notification.type.quote:
class: phpbb\notification\type\quote
scope: prototype
parent: notification.type.post
calls:
- [set_utils, [@text_formatter.utils]]
tags:
- { name: notification.type }
notification.type.report_pm:
class: phpbb\notification\type\report_pm
scope: prototype
parent: notification.type.pm
tags:
- { name: notification.type }
notification.type.report_pm_closed:
class: phpbb\notification\type\report_pm_closed
scope: prototype
parent: notification.type.pm
tags:
- { name: notification.type }
notification.type.report_post:
class: phpbb\notification\type\report_post
scope: prototype
parent: notification.type.post
tags:
- { name: notification.type }
notification.type.report_post_closed:
class: phpbb\notification\type\report_post_closed
scope: prototype
parent: notification.type.post
tags:
- { name: notification.type }
notification.type.topic:
class: phpbb\notification\type\topic
scope: prototype
parent: notification.type.base
calls:
- [set_user_loader, [@user_loader]]
- [set_config, [@config]]
tags:
- { name: notification.type }
notification.type.topic_in_queue:
class: phpbb\notification\type\topic_in_queue
scope: prototype
parent: notification.type.topic
tags:
- { name: notification.type }
# ----- Notification's methods -----
# Scope MUST be prototype for all the plugins to work.
notification.method_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: notification.method }
notification.method.board:
class: phpbb\notification\method\board
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
- @dbal.conn
- @cache.driver
- @user
- @config
- %tables.notification_types%
- %tables.notifications%
tags:
- { name: notification.method }
notification.method.email:
class: phpbb\notification\method\email
scope: prototype
arguments:
- @user_loader
- @user
- @config
- %core.root_path%
- %core.php_ext%
tags:
- { name: notification.method }
notification.method.jabber:
class: phpbb\notification\method\jabber
scope: prototype
arguments:
- @user_loader
- @user
- @config
- %core.root_path%
- %core.php_ext%
tags:
- { name: notification.method }

View File

@@ -1,11 +1,29 @@
parameters:
passwords.algorithms:
- passwords.driver.bcrypt_2y
- passwords.driver.bcrypt
- passwords.driver.salted_md5
- passwords.driver.phpass
services:
# ----- Password management -----
passwords.manager:
class: phpbb\passwords\manager
arguments:
- @config
- @passwords.driver_collection
- @passwords.helper
- %passwords.algorithms%
passwords.helper:
class: phpbb\passwords\helper
passwords.driver_helper:
class: phpbb\passwords\driver\helper
arguments:
- @config
# ----- Password's drivers -----
passwords.driver_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: passwords.driver }
passwords.driver.bcrypt:
class: phpbb\passwords\driver\bcrypt
arguments:
@@ -83,6 +101,7 @@ services:
arguments:
- @request
- @passwords.driver.salted_md5
- @passwords.driver_helper
- %core.root_path%
- %core.php_ext%
tags:
@@ -103,26 +122,3 @@ services:
- @passwords.driver_helper
tags:
- { name: passwords.driver }
passwords.driver_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: passwords.driver }
passwords.driver_helper:
class: phpbb\passwords\driver\helper
arguments:
- @config
passwords.manager:
class: phpbb\passwords\manager
arguments:
- @config
- @passwords.driver_collection
- @passwords.helper
- %passwords.algorithms%
passwords.helper:
class: phpbb\passwords\helper

View File

@@ -0,0 +1,3 @@
services:
php_ini:
class: bantu\IniGetWrapper\IniGetWrapper

Some files were not shown because too many files have changed in this diff Show More