Joas Schilling
76d7d38dea
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11766] Hide edit, quote and delete buttons if topic is locked
Conflicts:
phpBB/viewtopic.php
2014-03-19 20:37:52 +01:00
Oliver Schramm
d71fd5d660
[ticket/11766] Hide edit, quote and delete buttons if topic is locked
...
But show quote button to guests if topic isn't locked
PHPBB3-11766
2014-03-19 20:23:56 +01:00
Matt Friedman
b0f34afb8b
[ticket/12285] Fix mult-lingual issues between extensions
...
PHPBB3-12285
2014-03-19 09:10:17 -07:00
geetakshi
51ff202820
[ticket/11357] Correcting invalid markup
...
PHPBB3-11357
2014-03-19 19:59:19 +05:30
geetakshi
18bed2ea47
[ticket/11360] Change second parameter in page_header function
...
PHPBB3-11360
2014-03-19 19:55:55 +05:30
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
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
6750e19214
[ticket/12286] Add section about plurals to the coding guidelines
...
PHPBB3-12286
2014-03-18 10:14:11 +01:00
Joas Schilling
244d783865
[ticket/12286] Classes must use the name space
...
PHPBB3-12286
2014-03-18 09:54:14 +01:00
Joas Schilling
218e04a1e4
[ticket/12286] Remove section about utf8_normalize_nfc()
...
The request class takes care of this
PHPBB3-12286
2014-03-18 09:36:40 +01:00
Joas Schilling
c68f7671d2
[ticket/12286] Use $request->variable() instead of request_var()
...
PHPBB3-12286
2014-03-18 09:36:02 +01:00
Joas Schilling
d275a7cf63
[ticket/12286] Function names should be prefixed with phpbb_
...
PHPBB3-12286
2014-03-18 09:26:59 +01:00
Joas Schilling
30eccacb1d
[ticket/12286] Add "Since" to template event docs
...
PHPBB3-12286
2014-03-18 09:21:30 +01:00
Joas Schilling
45857fe5c9
[ticket/12286] style.php and imagesets dont exist anymore
...
PHPBB3-12286
2014-03-18 09:18:41 +01:00
Joas Schilling
ac5a808ff3
[ticket/12286] Styles have a phpbb_version and a style_version in 3.1
...
PHPBB3-12286
2014-03-18 09:17:45 +01:00
Joas Schilling
37eea9fa41
[ticket/12286] Use UTF8 (c) in style.cfg samples
...
PHPBB3-12286
2014-03-18 09:10:01 +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
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
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 > 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
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
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