makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
20346 commits 18 branches 192 tags 207 MiB
Commit graph

20346 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nathan Guse
5f70518987 Merge pull request #2136 from Elsensee/ticket/11071 
[ticket/11071] Add fallback if requested style don't exist
 2014-03-16 14:09:46 -05:00
Oliver Schramm
e2835d66cd [ticket/10590] Remove confirmation page after posting 
PHPBB3-10590
 2014-03-16 17:54:58 +01:00
Nathan Guse
69c195687f Merge pull request #2144 from nickvergessen/travis/disable-redis 
[travis/disable-redis] Disable redis on travis until its fixed again
 2014-03-16 11:06:26 -05:00
Joas Schilling
ada37226bf [ticket/12281] Disable redis on travis until its fixed again 
/home/travis/build/phpbb/phpbb/redis/redis.c:6141:34:
error: unknown type name ‘tsrm_ls’
make: *** [redis.lo] Error 1

The command "sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ];
then travis/setup-php-extensions.sh; fi"" failed
and exited with 2 during install.

PHPBB3-12281
 2014-03-16 16:36: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
325931a56b Merge branch 'prep-release-3.1.0-b1' into develop 
* prep-release-3.1.0-b1:
  [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev
  [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1
  [prep-release-3.1.0-b1] Prepare Changelog
  [prep-release-3.1.0-b1] Add migration for 3.1.0-b1
  [prep-release-3.1.0-b1] Update version to 3.1.0-b1
 2014-03-15 17:32:48 +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
2d987d36c1 Merge remote-tracking branch 'maelsoucaze/develop' into develop 
* maelsoucaze/develop:
  [ticket/12272] Fix hardcoded colons in subforums.
  [ticket/12272] Fix hardcoded colons in subforums.
 2014-03-15 15:17: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
c743e28b94 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12247] Makes static usernames work
  [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()

Conflicts:
	phpBB/includes/mcp/mcp_queue.php
 2014-03-14 13:59:46 +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
a6b274e8ab Merge pull request #11 from nickvergessen/ticket/exreaction/12202 
[ticket/12202] Use an array in the data provider instead of exploding manually
 2014-03-14 07:29:22 -05:00
Joas Schilling
1f8ab1c196 [ticket/12202] Use an array in the data provider instead of exploding manually 
PHPBB3-12202
 2014-03-14 13:18:30 +01:00
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
Nathan Guse
23289c89a1 [ticket/9871] Fix test name 
PHPBB3-9871
 2014-03-14 07:02:25 -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
Joas Schilling
7821cf0257 [ticket/12241] Update event name and version match our guidelines 
PHPBB3-12241
 2014-03-14 12:43:15 +01:00
Joas Schilling
973f5aa8c5 [ticket/12268] Move class out of extension namespace and rename it 
PHPBB3-12268
 2014-03-14 11:08:25 +01:00