mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
20,228 Commits 17 Branches 190 Tags
Commit Graph

17642 Commits

Author SHA1 Message Date
Matt Friedman
e46e3111e2 [ticket/12284] Improve readability of extension manager details 
Use span tags like the rest of the ACP does, instead of P tags.
There is no semantic need to use P tags here. These are not
paragraphs.

PHPBB3-12284
 2014-03-17 12:10:18 -07:00
geetakshi
66ed9881df [ticket/8309] Removing key with similar function to avoid redundancy 
PHPBB3-8309
 2014-03-17 21:08:03 +05:30
rxu
378cfd6e16 [ticket/12278] Add mcp.php core event to allow to modify modules display option 
This event allows extensions to set display option for custom MCP modules
for extensions which add custom MCP modules
and some of them should be displayed conditionally.

PHPBB3-12278
 2014-03-17 23:28:51 +08:00
Joas Schilling
772dd0def6 Merge remote-tracking branch 'rxu3/ticket/12279' into develop 
* rxu3/ticket/12279:
  [ticket/12279] Add memberlist_view.html template event to add custom info
 2014-03-17 15:58:33 +01:00
rxu
1e1a54882c [ticket/12279] Add memberlist_view.html template event to add custom info 
Template event to ddd custom content
to the user profile view after the main content.

PHPBB3-12279
 2014-03-17 21:01:16 +08:00
Joas Schilling
ee754dfab1 Merge remote-tracking branch 'dragooon/ticket/9040' into develop 
* dragooon/ticket/9040:
  [ticket/9040] Minor cleanup in the unit test file
  [ticket/9040] Count HTML entities as single in custom profile fields
 2014-03-17 13:33:23 +01:00
Shitiz Garg
403ab49716 [ticket/9040] Count HTML entities as single in custom profile fields 
Currently when an user adds a HTML entity to a custom profile field, the length
gets incremented by 4 since the code reads &gt; instead of <. However, the
length is presentational and not DB storage so it should be treated as a
single character even if it takes four lengths in the DB by being stored as
a HTML entity.

Work around this by decoding html entities before counting. Also, added unit
tests for string field type

PHPBB3-9040
 2014-03-17 17:35:30 +05:30
Joas Schilling
ec25eba444 Merge branch 'ticket/12269' of github.com:netdeamon/phpbb into develop 
# By netdeamon
# Via netdeamon
* 'ticket/12269' of github.com:netdeamon/phpbb:
  [ticket/12269] Delete folder mods in language
 2014-03-17 10:18:37 +01:00
netdeamon
85147eb987 [ticket/12269] Delete folder mods in language 
Deleted mods folder in phpbb/language/en/.

PHPBB3-12269
 2014-03-17 14:26:08 +05:30
Matt Friedman
3845a560b6 [ticket/11904] Update explanation for what Allow CDN does 
PHPBB3-11904
 2014-03-16 15:55:58 -07:00
Joas Schilling
f9438bcbf7 Merge branch 'ticket/11239' of github.com:geetakshi/phpbb into develop 
# By geetakshi
# Via geetakshi
* 'ticket/11239' of github.com:geetakshi/phpbb:
  [ticket/11239] Removing hard-coded, language specific possessive
  [ticket/11239] Including username before Overview title
 2014-03-16 23:30:54 +01:00
Joas Schilling
cdbc1e8a5c Merge remote-tracking branch 'vsephpbb/ticket/12274' into develop 
* vsephpbb/ticket/12274:
  [ticket/12274] Add core.js to the install footer
  [ticket/12274] Fix broke/missing jQuery asset paths in update script
  [ticket/12274] Load correct T_TEMPLATE_PATH during update
 2014-03-16 23:05:24 +01:00
geetakshi
418034af0e [ticket/12035] Adding link to user posts to ACP page 
Adding link of posts behind displayed number of posts of the user

PHPBB3-12035
 2014-03-17 00:52:11 +05:30
Oliver Schramm
e2835d66cd [ticket/10590] Remove confirmation page after posting 
PHPBB3-10590
 2014-03-16 17:54:58 +01:00
Matt Friedman
a29ad78da6 [ticket/12274] Add core.js to the install footer 
Required so phpbb var is defined, as it is used in admin.js.

PHPBB3-12274
 2014-03-16 07:56:26 -07:00
Matt Friedman
81ceefd889 [ticket/12274] Fix broke/missing jQuery asset paths in update script 
PHPBB3-12274
 2014-03-16 07:22:24 -07:00
geetakshi
4d191f254d [ticket/11239] Removing hard-coded, language specific possessive 
PHPBB3-11239
 2014-03-16 15:36:47 +05:30
geetakshi
6a1967514d [ticket/8309] Moving key to get keys in alphabetical order 
PHPBB3-8309
 2014-03-16 14:27:34 +05:30
Matt Friedman
fd6836ca8a [ticket/12274] Load correct T_TEMPLATE_PATH during update 
PHPBB3-12274
 2014-03-15 20:44:56 -07:00
Oliver Schramm
fac814f8e7 [ticket/11169] Move module 'prune users' to users category 
PHPBB3-11169
 2014-03-16 02:53:01 +01:00
geetakshi
0bf758f00f [ticket/8309] Rename $last_visit to $last_activity 
PHPBB3-8309
 2014-03-16 03:37:21 +05:30
geetakshi
8c4604a78e [ticket/8309] Renaming "Last visit" to "Last activity" 
PHPBB3-8309
 2014-03-16 03:32:08 +05:30
Oliver Schramm
df0ac9876c [ticket/11071] Add fallback if requested style don't exist 
PHPBB3-11071
 2014-03-15 22:00:48 +01:00
geetakshi
7647b51d5d [ticket/11239] Including username before Overview title 
Adding username to the page title to avoid confusion while managing
multiple users in ACP

PHPBB3-11239
 2014-03-16 02:12:50 +05:30
Joas Schilling
584d7b5823 [ticket/12268] Do not use substr but just compare the character 
PHPBB3-12268
 2014-03-15 21:00:16 +01:00
Joas Schilling
9be5405e5b [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev 2014-03-15 17:32:07 +01:00
Joas Schilling
873b5686a1 [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1 2014-03-15 16:05:12 +01:00
Joas Schilling
f9c27ccd52 [prep-release-3.1.0-b1] Prepare Changelog 2014-03-15 15:37:22 +01:00
Joas Schilling
6159c3c738 [prep-release-3.1.0-b1] Add migration for 3.1.0-b1 2014-03-15 15:37:22 +01:00
Joas Schilling
407e0dbd8b [prep-release-3.1.0-b1] Update version to 3.1.0-b1 2014-03-15 15:37:21 +01:00
Andreas Fischer
aee4534d71 Merge pull request #2111 from nickvergessen/ticket/12262 
[ticket/12262] Fix event exporter

* nickvergessen/ticket/12262:
  [ticket/12262] Do not use inline assignments
  [ticket/12262] Do not use getExtension()
  [ticket/12262] Fix location list for acp events with "Locations:"
  [ticket/12262] Also find vars array when it's defined in the trigger_event()
 2014-03-15 15:34:55 +01:00
Joas Schilling
87292f534e [ticket/12262] Do not use inline assignments 
PHPBB3-12262
 2014-03-15 15:14:00 +01:00
Joas Schilling
2071abda1f [ticket/12262] Do not use getExtension() 
The method is php 5.3.6+ only.

PHPBB3-12262
 2014-03-15 15:13:59 +01:00
Maël Soucaze
23b7671617 [ticket/12272] Fix hardcoded colons in subforums. 
In subforums list, under the parent forum description, there are two
harcoded colons instead of {L_COLON}.

PHPBB3-12272
 2014-03-15 14:32:26 +01:00
Maël Soucaze
e1278320a2 [ticket/12272] Fix hardcoded colons in subforums. 
In subforums list, under the parent forum description, there are two
harcoded colons instead of {L_COLON}.

PHPBB3-12272
 2014-03-15 14:25:11 +01:00
Dhruv Goel
eafba554fd Merge pull request #2128 from nickvergessen/ticket/12271 
[ticket/12271] Decouple dropdown header and footer from #notifications_list
 2014-03-14 22:24:42 +05:30
Joas Schilling
d9037965c8 [ticket/12271] Decouple dropdown header and footer from #notifications_list 
PHPBB3-12271
 2014-03-14 17:10:20 +01:00
Joas Schilling
f852630ef3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12072] Fix comment about NEW MEMBERS permission
 2014-03-14 14:36:29 +01:00
Joas Schilling
c1b48bdd01 Merge remote-tracking branch 'Elsensee/ticket/12072' into develop-olympus 
* Elsensee/ticket/12072:
  [ticket/12072] Fix comment about NEW MEMBERS permission
 2014-03-14 14:35:56 +01:00
Oliver Schramm
647f976c30 [ticket/12072] Fix comment about NEW MEMBERS permission 
PHPBB3-12072
 2014-03-14 14:33:56 +01:00
Joas Schilling
bfe872d1b7 Merge remote-tracking branch 'vsephpbb/ticket/11429' into develop 
* vsephpbb/ticket/11429:
  [ticket/11429] Increment asset version on Ext enable
 2014-03-14 14:25:50 +01:00
Joas Schilling
0aa23d203e Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop 
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
 2014-03-14 14:04:30 +01:00
Joas Schilling
bdce7abc84 Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympus 
* marcosbc/ticket/12247:
  [ticket/12247] Makes static usernames work
  [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
 2014-03-14 13:58:17 +01:00
Joas Schilling
7b08a483fd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data

Conflicts:
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-03-14 13:55:53 +01:00
Joas Schilling
943e4e35ee Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympus 
* exreaction/ticket/12202:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data
 2014-03-14 13:53:55 +01:00
Dhruv Goel
287c2b95ee Merge pull request #2126 from nickvergessen/ticket/forumhulp/12241 
[ticket/12241] Event to add and/or modify acp_board configurations
 2014-03-14 18:00:14 +05:30
Nathan Guse
60d2c1f400 [ticket/9871] Can set current version to use instead of the phpBB version 
PHPBB3-9871
 2014-03-14 07:07:26 -05:00
Nathan Guse
0c40cd5f13 [ticket/9871] Fix indentation on comment 
PHPBB3-9871
 2014-03-14 07:03:37 -05:00
Joas Schilling
dc0bcdf8a0 [ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.php 
PHPBB3-12268
 2014-03-14 12:54:28 +01:00
Joas Schilling
56318fb5c4 [ticket/12241] Add @var for the arguments 
PHPBB3-12241
 2014-03-14 12:49:04 +01:00