mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-18 06:32:01 +01:00
Code Issues Releases Wiki Activity
20,429 Commits 18 Branches 191 Tags
Commit Graph

20429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesar G
7c1ab5f79d [ticket/11959] Remove use of plurals and make it possible to use Oxford comma. 
PHPBB3-11959
 2014-03-19 03:08:34 -07:00
Cesar G
3da1f6d989 [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
285ad0f6fa [ticket/11959] Simplify how the users are trimmed. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
f0a85a90cc [ticket/11959] Add function to create a string list. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
7cc1a8d224 [ticket/11959] Add samples for the untrimmed strings. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
b32a66ca78 [ticket/11959] List the last user with "and" instead of a comma. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
126ee37f66 [ticket/11959] Use the plurals system for the untrimmed language strings. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
7e4b7a1542 [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
6a278248e5 [ticket/11959] Use plurals for the language strings. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Oliver Schramm
3ea1ee651c Merge branch 'nickvergessen/ticket/elsensee/10590' into ticket/10590 2014-03-18 19:22:37 +01:00
netdeamon
a8274ae137 [ticket/12198] Language issue in en/common.php 
Deleted lines as they are not needed anymore.

PHPBB3-12198
 2014-03-18 22:13:10 +05:30
Joas Schilling
1af7697143 Merge remote-tracking branch 'prototech/ticket/12160' into develop 
* prototech/ticket/12160:
  [ticket/12160] Use phpbb_check_installation_exists() in the other modules.
  [ticket/12160] Move phpbb_check_installation_exists() to functions_install.php
  [ticket/12160] Check if phpBB is installed before creating phpBB container.
  [ticket/12160] Add function to check if phpBB is installed.
 2014-03-18 11:00:43 +01:00
Joas Schilling
f0d9a008d3 [ticket/10590] Fix functional tests are post confirm message removal 
PHPBB3-10590
 2014-03-18 10:58:26 +01:00
Joas Schilling
96e5a04001 Merge remote-tracking branch 'rxu3/ticket/12278' into develop 
* rxu3/ticket/12278:
  [ticket/12278] Add mcp.php core event to allow to modify modules display option
 2014-03-18 00:25:57 +01:00
Andreas Fischer
c09d3f924b Merge remote-tracking branch 'VSEphpbb/ticket/12284' into develop 
* VSEphpbb/ticket/12284:
  [ticket/12284] Fix functional test for extension manager changes
 2014-03-17 23:10:35 +01:00
Matt Friedman
9d2381cf3d [ticket/12284] Fix functional test for extension manager changes 
PHPBB3-12284
 2014-03-17 13:23:42 -07:00
Andreas Fischer
4635c5917c Merge remote-tracking branch 'VSEphpbb/ticket/12284' into develop 
* VSEphpbb/ticket/12284:
  [ticket/12284] Improve readability of extension manager details
 2014-03-17 20:30:57 +01:00
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
Joas Schilling
6fba2c6778 Merge remote-tracking branch 'vsephpbb/ticket/7580' into develop 
* vsephpbb/ticket/7580:
  [ticket/7580] Add test for IF {VAR} is defined in templates
 2014-03-17 15:55:51 +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
8a48f6e267 [ticket/9040] Minor cleanup in the unit test file 
PHPBB3-9040
 2014-03-17 17:35:37 +05:30
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
lucifer4o
c4034ac79a [ticket/12276] Expand core.memberlist_view_profile 
Expand core.memberlist_view_profile to include zebra states

PHPBB3-12276
 2014-03-17 10:40:56 +02:00
Matt Friedman
d8c1c7fb9a [ticket/7580] Add test for IF {VAR} is defined in templates 
http://tracker.phpbb.com/browse/PHPBB3-7580
This test demonstrates that is possible to test if a
variable exists and then use it if it does, similar to
using isset(), but in template/twig syntax.
<!— IF {VAR} is defined —>{VAR}<!— ENDIF —>

PHPBB3-7580
 2014-03-16 20:38:50 -07:00
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
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
Oliver Schramm
4b2d7735b3 [ticket/7707] Add get_username_string() where possible 
PHPBB3-7707
 2014-03-16 00:11:12 +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