mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
11,339 Commits 17 Branches 190 Tags
Commit Graph

11339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleg Pudeyev
f5de11438c [ticket/11162] Use empty($queries). 
PHPBB3-11162
 2012-12-05 10:47:26 -05:00
Oleg Pudeyev
fe87d441ee [ticket/11162] Review comments fixed. 
PHPBB3-11162
 2012-12-05 10:44:36 -05:00
Oleg Pudeyev
16966f52d3 [ticket/11162] Reformat. 
PHPBB3-11162
 2012-12-05 10:41:08 -05:00
Oleg Pudeyev
94ebc57078 [ticket/11162] Newlines to LF. 
PHPBB3-11162
 2012-12-05 10:40:42 -05:00
Oleg Pudeyev
1a411c5658 [ticket/11162] Use correct functions. 
PHPBB3-11162
 2012-12-05 00:11:14 -05:00
Oleg Pudeyev
6872104aa9 [ticket/11162] Account for notify_status. 
PHPBB3-11162
 2012-12-05 00:07:01 -05:00
Oleg Pudeyev
efe122b032 [ticket/11162] This test really only works for bookmarks. 
PHPBB3-11162
 2012-12-04 23:40:30 -05:00
Oleg Pudeyev
58951ef105 [ticket/11162] The test is not at all trivial. 
PHPBB3-11162
 2012-12-04 23:37:57 -05:00
Oleg Pudeyev
abca64b1df [ticket/11162] Add includes. 
PHPBB3-11162
 2012-12-04 23:37:14 -05:00
Oleg Pudeyev
0f96b1aad3 [ticket/11162] Move to a separate file to avoid blowing out functions.php. 
PHPBB3-11162
 2012-12-04 23:35:34 -05:00
Oleg Pudeyev
2fc43e6ed7 [ticket/11162] No whitespace changes in olympus. 
PHPBB3-11162
 2012-12-01 23:11:14 -05:00
Oleg Pudeyev
05053dacd3 [ticket/11162] Fix inaccurately copy pasted comment. 
PHPBB3-11162
 2012-12-01 23:09:32 -05:00
Oleg Pudeyev
69225bd0a6 [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. 
PHPBB3-11162
 2012-12-01 23:09:31 -05:00
Oleg Pudeyev
c2c105df9f [ticket/11162] Clarify that only the two tables actually work. 
PHPBB3-11162
 2012-12-01 23:09:31 -05:00
Oleg Pudeyev
2e947334e5 [ticket/11162] Uncomment transactions. 
PHPBB3-11162
 2012-12-01 23:09:31 -05:00
Oleg Pudeyev
d0338531cb [ticket/11162] An implementation that actually works. 
PHPBB3-11162
 2012-12-01 23:09:29 -05:00
Andreas Fischer
ac9c4d7d59 [ticket/11162] Make count function upper case. 
PHPBB3-11162
 2012-11-11 17:49:21 +01:00
Andreas Fischer
7d0cc15b92 [ticket/11162] Rename count variable name to remaining_rows. 
PHPBB3-11162
 2012-11-11 17:48:59 +01:00
Andreas Fischer
b0812c43fa [ticket/11162] Use integer casting instead of SQL escape. 
PHPBB3-11162
 2012-11-11 17:40:58 +01:00
Oleg Pudeyev
fd6ee50e06 [ticket/11162] Extract existing behavior into a function and add a test. 
PHPBB3-11162
 2012-11-02 16:05:53 -04:00
Andreas Fischer
88b100d818 Merge remote-tracking branch 'p/ticket/11158' into develop-olympus 
* p/ticket/11158:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
 2012-10-29 15:13:33 -04:00
Oleg Pudeyev
5f5d395c62 [ticket/11158] Require acl_u_sig for ucp signature module. 
PHPBB3-11158
 2012-10-29 14:58:25 -04:00
Oleg Pudeyev
88bd7292f1 [ticket/11158] Revert old fix in PHPBB3-10186. 
Revert "[ticket/10186] UCP signature panel displays when not authed
for signatures"

This reverts commit f6fa52540c0fb20d79b4d59cb08c49484d9f3116.

PHPBB3-10186
PHPBB3-11158
 2012-10-29 14:58:19 -04:00
Andreas Fischer
c84268d2f9 Merge remote-tracking branch 'p/ticket/10848' into develop-olympus 
* p/ticket/10848:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.
 2012-10-18 16:26:54 +02:00
Oleg Pudeyev
b283df8241 [ticket/10848] Move include up. 
PHPBB3-10848
 2012-10-17 22:35:36 -04:00
Oleg Pudeyev
bd44088757 Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus 
* Senky/ticket/10568:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
 2012-10-17 22:10:49 -04:00
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix. 
PHPBB3-10848
 2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly. 
PHPBB3-10848
 2012-10-17 15:08:09 -04:00
Oleg Pudeyev
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus 
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
 2012-10-16 21:20:58 -04:00
Oleg Pudeyev
bef3f9c7e7 Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus 
* Senky/ticket/10967:
  [ticket/10967] adding $root_path to posting_get_topic_icons
 2012-10-16 20:30:45 -04:00
Andreas Fischer
0348950ff1 Merge branch 'ticket/russellwwest/11093' into develop-olympus 
* ticket/russellwwest/11093:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
 2012-10-16 14:40:10 +02:00
westr
d376348acf [ticket/11093] acp_users_overview.html has a wrongly placed </dd> 
Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
 2012-10-16 14:39:32 +02:00
Senky
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons 
PHPBB3-10967
 2012-10-11 20:38:24 +02:00
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus 
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
 2012-10-10 00:22:17 -04:00
Oleg Pudeyev
a7893ab299 Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus 
* bantu/ticket/11131:
  [ticket/11131] Correctly use indefinite article for "warning".
 2012-10-09 17:42:23 -04:00
Andreas Fischer
281afb8bd6 Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympus 
* mvinny/ticket/11135:
  [ticket/11135] Full replacement of credit link to https
 2012-10-06 06:12:45 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https 
PHPBB3-11135
 2012-10-05 21:18:59 -03:00
Andreas Fischer
8428b53087 Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympus 
* Senky/ticket/11112:
  [ticket/11112] updating links to phpbb.com to use SSL
 2012-10-02 17:01:21 +02:00
Andreas Fischer
dbeace22c8 [ticket/11131] Correctly use indefinite article for "warning". 
PHPBB3-11131
 2012-10-02 14:58:20 +02:00
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL 
PHPBB3-11112
 2012-10-01 15:38:16 +02:00
Andreas Fischer
27bef015d6 Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympus 
* nickvergessen/ticket/11122:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
 2012-09-29 00:25:00 +02:00
Joas Schilling
f7a6169184 [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors 
PHPBB3-11122
 2012-09-27 13:22:43 +02:00
Andreas Fischer
888aa47b0e Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympus 
* Fyorl/ticket/11045:
  [ticket/11045] Removed file conflict tests for compress class
  [ticket/11045] Replaced __DIR__ with dirname(__FILE__)
  [ticket/11045] Opening brace on its own line
  [ticket/11045] Explicitely check for zlib and bz2
  [ticket/11045] Added tests for file conflicts
  [ticket/11045] Added unit tests for the compress class
 2012-09-14 00:46:04 +02:00
Fyorl
ce7cffcf9e [ticket/11045] Removed file conflict tests for compress class 
PHPBB3-11045
 2012-09-11 09:42:29 +01:00
Nils Adermann
3bd19077dc Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus 
* github-imkingdavid/task/functional:
  [task/functional] Fixed DEBUG_TEST related issues
  [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
  [task/functional] Added posting tests (reply and new topic)
 2012-09-01 17:06:41 +02:00
David King
4dd1bbc587 [task/functional] Fixed DEBUG_TEST related issues 
PHPBB3-10758
 2012-09-01 10:53:01 -04:00
David King
7dfe26dd78 [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST 
PHPBB3-10758
 2012-09-01 10:37:44 -04:00
David King
7cffebbd49 [task/functional] Added posting tests (reply and new topic) 
PHPBB-10758
 2012-09-01 10:37:03 -04:00
Nils Adermann
0ba2bfffe2 Merge remote-tracking branch 'github-imkingdavid/ticket/10873' into develop-olympus 
* github-imkingdavid/ticket/10873:
  [ticket/10873] Change language for notice about undelivered, deleted PM.
 2012-09-01 16:11:42 +02:00
Fyorl
1520130b27 [ticket/11045] Replaced __DIR__ with dirname(__FILE__) 
PHPBB3-11045
 2012-09-01 09:45:11 +08:00