Commit graph

20568 commits

Author SHA1 Message Date
Joas Schilling
84b91beed1 Merge remote-tracking branch 'rxu/ticket/12289' into develop-ascraeus
* rxu/ticket/12289:
  [ticket/12289] Add viewtopic template events for posts specific custom notices
2014-03-22 21:35:38 +01:00
Matt Friedman
b87fc1e56c [ticket/11230] Update cache driver dock blocks
PHPBB3-12230
2014-03-22 08:23:18 -07:00
rxu
4bb898a061 [ticket/12289] Add viewtopic template events for posts specific custom notices
These events allow extensions to add own posts specific notices-alike info.

PHPBB3-12289
2014-03-22 22:45:05 +08:00
Joas Schilling
13eb0ec5b9 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page

Conflicts:
	phpBB/adm/style/acp_users_overview.html
2014-03-22 15:13:41 +01:00
Joas Schilling
5197e5afe3 Merge remote-tracking branch 'geetakshi/ticket/12035' into develop-olympus
* geetakshi/ticket/12035:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page
2014-03-22 15:07:01 +01:00
Joas Schilling
4de099d969 Merge remote-tracking branch 'vsephpbb/ticket/11904' into develop-ascraeus
* vsephpbb/ticket/11904:
  [ticket/11904] Update explanation for what Allow CDN does
2014-03-22 15:01:11 +01:00
Joas Schilling
b191c1c5a6 Merge remote-tracking branch 'geetakshi/ticket/11357' into develop-ascraeus
* geetakshi/ticket/11357:
  [ticket/11357] Correcting invalid markup
2014-03-22 14:15:09 +01:00
Joas Schilling
4e58a03c20 Merge remote-tracking branch 'vsephpbb/ticket/12292' into develop-ascraeus
* vsephpbb/ticket/12292:
  [ticket/12292] Improve style details page
2014-03-22 13:22:13 +01:00
Andreas Fischer
3654ba4a35 Merge pull request #2169 from bantu/ticket/12293
[ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php eve...

* bantu/ticket/12293:
  [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php events.
2014-03-22 02:38:42 +01:00
Forumhulp.com
4051ab689f [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php events.
PHPBB3-12293
2014-03-22 02:07:39 +01:00
Joas Schilling
d7c2c9d472 [ticket/12286] Add note that goto should not be used
PHPBB3-12286
2014-03-21 17:04:58 +01:00
Matt Friedman
e4f6d9bc90 [ticket/12292] Improve style details page
http://tracker.phpbb.com/browse/PHPBB3-12292
Gave style details page a proper heading and back button.
Also removed a few obsolete code leftovers in the style
and CSS.

PHPBB3-12292
2014-03-20 18:11:45 -07:00
geetakshi
5afb06102b [ticket/11360] Avoiding online list where not required
PHPBB3-11360
2014-03-20 17:15:43 +05:30
geetakshi
663eb74cf3 [ticket/12035] Correcting the condition
PHPBB3-12035
2014-03-20 14:17:03 +05:30
Matt Friedman
60e5757fa1 [ticket/11230] Use inheritdoc in docblocks in cache drivers
http://tracker.phpbb.com/browse/PHPBB3-11230

PHPBB3-11230
2014-03-19 20:31:55 -07:00
Dhruv Goel
7f5d8becad Merge pull request #2137 from geetakshi/ticket/8309
[ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
2014-03-20 03:44:39 +05:30
geetakshi
5316c32b10 [ticket/12035] Adding necessary conditions
PHPBB3-12035
2014-03-20 03:36:53 +05:30
Joas Schilling
82c8986aed Merge remote-tracking branch 'vsephpbb/ticket/12285' into develop
* vsephpbb/ticket/12285:
  [ticket/12285] Fix mult-lingual issues between extensions
2014-03-19 21:48:29 +01:00
Joas Schilling
997ad65062 Merge remote-tracking branch 'Elsensee/ticket/11169' into develop
* Elsensee/ticket/11169:
  [ticket/11169] Skip migration if "Users" category has been deleted
  [ticket/11169] Move module 'prune users' to users category
2014-03-19 21:35:08 +01:00
Dhruv Goel
03f6ad544f Merge pull request #2145 from Elsensee/ticket/10590
[ticket/10590] Remove confirmation page after posting
2014-03-20 01:50:17 +05:30
geetakshi
9a3011c2dd [ticket/8309] Changing $last_activity to $last_active
PHPBB3-8309
2014-03-20 01:48:52 +05:30
Oliver Schramm
dd7e8c8d1d [ticket/11169] Skip migration if "Users" category has been deleted
or the module has already been moved to that category

PHPBB3-11169
2014-03-19 21:16:25 +01:00
Joas Schilling
2d1e6975b4 Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into develop
* netdeamon/ticket/12198-Language-issue:
  [ticket/12198] Language issue in en/common.php
2014-03-19 21:07:15 +01:00
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
Joas Schilling
bdab6dede0 Merge remote-tracking branch 'Elsensee/ticket/11766' into develop-olympus
* Elsensee/ticket/11766:
  [ticket/11766] Hide edit, quote and delete buttons if topic is locked
2014-03-19 20:34:22 +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
2a822931c6 [ticket/11959] Add unit tests.
PHPBB3-11959
2014-03-19 03:08:34 -07:00
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
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