mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-18 22:58:10 +01:00
Code Issues Releases Wiki Activity
19,159 Commits 17 Branches 190 Tags
Commit Graph

19159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
8087a76c36 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
 2013-12-04 15:57:25 +01:00
Joas Schilling
0e93c2516c Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympus 
* bantu/ticket/12056:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
 2013-12-04 15:56:03 +01:00
Andreas Fischer
e41cd384f5 [ticket/12056] Fix failure due to "Creating default object from empty value". 
PHPBB3-12056
 2013-12-04 13:22:47 +01:00
Joas Schilling
8b2d515736 Merge remote-tracking branch 'prototech/ticket/11672' into develop 
* prototech/ticket/11672:
  [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.
  [ticket/11672] Remove duplicate $request global.
  [ticket/11672] The json response call exits so the else is not necessary.
  [ticket/11672] Remove the messages for lock/unlock/change topic type.
  [ticket/11672] Clean up the logic in mcp_queue.php.
  [ticket/11672] Remove some messages that were missed in mcp_queue.php.
  [ticket/11672] Replace sprintf() usage with $user->lang().
  [ticket/11672] Removed unnecessary text from alerts.
 2013-12-03 21:10:25 +01:00
Joas Schilling
8f504b1ca5 Merge remote-tracking branch 'cyberalien/ticket/11969' into develop 
* cyberalien/ticket/11969:
  [ticket/11969] Change topic link to unread post in subsilver2
  [ticket/11969] Change topic link to unread post in prosilver
  [ticket/11969] New language strings for first and last post links
 2013-12-03 18:29:10 +01:00
Joas Schilling
8a6d01591b Merge remote-tracking branch 'vsephpbb/ticket/12014' into develop 
* vsephpbb/ticket/12014:
  [ticket/12014] Change event date in docs
  [ticket/12014] Fix version number in event docs
  [ticket/12014] Template Event index_body.html before forumlist
 2013-12-03 18:18:09 +01:00
Joas Schilling
a8e29f0804 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11699] Also exclude the phpBB/cache directory.
  [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
  [ticket/11699] Exclude build/new_version and build/old_versions from lint.
 2013-12-02 23:33:24 +01:00
Joas Schilling
1977a10efb Merge remote-tracking branch 'bantu/ticket/11699' into develop-olympus 
* bantu/ticket/11699:
  [ticket/11699] Also exclude the phpBB/cache directory.
  [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
  [ticket/11699] Exclude build/new_version and build/old_versions from lint.
 2013-12-02 23:32:39 +01:00
Joas Schilling
dfe7896a4d Merge remote-tracking branch 'bantu/ticket/12050' into develop 
* bantu/ticket/12050:
  [ticket/12050] Make phpbb_notification_submit_post_base abstract.
 2013-12-02 22:21:50 +01:00
Joas Schilling
9be443769a Merge remote-tracking branch 'prototech/ticket/11346' into develop 
* prototech/ticket/11346:
  [ticket/11346] Hide "Mark topics read" link when forum is empty.
 2013-12-02 21:30:07 +01:00
Joas Schilling
d4da154cda Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12048] Fix the regexp for language keys in custom bbcodes.
 2013-12-02 10:07:49 +01:00
Joas Schilling
be338864ef Merge remote-tracking branch 'prototech/ticket/12048' into develop-olympus 
* prototech/ticket/12048:
  [ticket/12048] Fix the regexp for language keys in custom bbcodes.
 2013-12-02 10:07:06 +01:00
Cesar G
eef1b586d5 [ticket/12048] Fix the regexp for language keys in custom bbcodes. 
PHPBB3-12048
 2013-12-02 00:53:42 -08:00
Cesar G
5ab5bd6bda [ticket/11346] Hide "Mark topics read" link when forum is empty. 
TOTAL_POSTS and TOTAL_USERS are not defined for viewforum.php.

PHPBB3-11346
 2013-12-01 17:16:31 -08:00
Andreas Fischer
0b55ab720c [ticket/12050] Make phpbb_notification_submit_post_base abstract. 
PHPBB3-12050
 2013-12-01 13:03:03 +01:00
Dhruv
d867bda6af Merge remote-tracking branch 'nickvergessen/ticket/12045' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12045:
  [ticket/12045] Only display group selection if there are groups
  [ticket/12045] Correctly close <span> before closing parent tag
  [ticket/12045] Correctly close <dd> with </dd>
 2013-11-30 17:21:40 +05:30
Dhruv
09b5499d87 Merge remote-tracking branch 'nickvergessen/ticket/12042' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12042:
  [ticket/12042] Replace B with a more meaningful key name
  [ticket/12042] Add all language strings from PLUpload 2.0 to the language file
 2013-11-30 14:14:17 +05:30
Andreas Fischer
981df153d2 [ticket/11699] Also exclude the phpBB/cache directory. 
PHPBB3-11699
 2013-11-29 14:02:50 +01:00
Andreas Fischer
0834a749e7 [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix. 
PHPBB3-11699
 2013-11-29 14:00:55 +01:00
Andreas Fischer
97b1d70a37 [ticket/11699] Exclude build/new_version and build/old_versions from lint. 
PHPBB3-11699
 2013-11-29 10:50:38 +01:00
Joas Schilling
5d69eddcf5 [ticket/12045] Only display group selection if there are groups 
Also fixed the empty option which is not allowed.

PHPBB3-12045
 2013-11-28 13:22:25 +01:00
Joas Schilling
d9c754a650 [ticket/12045] Correctly close <span> before closing parent tag 
PHPBB3-12045
 2013-11-28 13:17:38 +01:00
Joas Schilling
371cfa4bfc [ticket/12045] Correctly close <dd> with </dd> 
PHPBB3-12045
 2013-11-28 13:17:07 +01:00
Joas Schilling
f58add8d79 Merge remote-tracking branch 'prototech/ticket/11507' into develop 
* prototech/ticket/11507:
  [ticket/11507] Handle empty sets correctly.
  [ticket/11507] Allow group & unapproved post count options to be used alone.
  [ticket/11507] Fix the unapproved posts count query.
  [ticket/11507] Allow the posts awaiting approval value to be 0.
 2013-11-28 13:12:12 +01:00
Joas Schilling
13bed15363 Merge remote-tracking branch 'prototech/ticket/12040' into develop 
* prototech/ticket/12040:
  [ticket/12040] Prevent AJAX background animation flicker in ACP
 2013-11-28 12:20:56 +01:00
Joas Schilling
3585d167ad Merge remote-tracking branch 'prototech/ticket/11869' into develop 
* prototech/ticket/11869:
  [ticket/11869] Fix strict standards error when registering.
 2013-11-28 12:10:41 +01:00
Cesar G
7da4490402 [ticket/11507] Handle empty sets correctly. 
Using the last parameter in $db->sql_in_set() does not give the correct
behaviour expected here. The query should not be negated if the set is empty.

PHPBB3-11507
 2013-11-27 21:26:23 -08:00
Cesar G
ef2e5ca966 [ticket/11507] Allow group & unapproved post count options to be used alone. 
PHPBB3-11507
 2013-11-27 21:26:22 -08:00
Cesar G
c5656747d8 [ticket/11507] Fix the unapproved posts count query. 
Only unapproved posts should be counted.

PHPBB3-11507
 2013-11-27 21:26:22 -08:00
Cesar G
b41e2d335a [ticket/11507] Allow the posts awaiting approval value to be 0. 
PHPBB3-11507
 2013-11-27 21:26:18 -08:00
Cesar G
83b1278273 [ticket/11869] Fix strict standards error when registering. 
PHPBB3-11869
 2013-11-27 20:05:00 -08:00
Joas Schilling
f3d7823050 [ticket/12042] Replace B with a more meaningful key name 
PHPBB3-12042
 2013-11-27 18:54:51 +01:00
Joas Schilling
6a2d0c345c [ticket/12042] Add all language strings from PLUpload 2.0 to the language file 
PHPBB3-12042
 2013-11-27 18:09:38 +01:00
Joas Schilling
e3eb82cf7d Merge remote-tracking branch 'Marc/ticket/11914' into develop 
* Marc/ticket/11914:
  [ticket/11914] Add assets version to included plupload scripts
  [ticket/11914] Update plupload to 2.0.0
  [ticket/11914] Use unix line endings in plupload queue css file
 2013-11-27 15:18:39 +01:00
Cesar G
680f8eae50 [ticket/12040] Prevent AJAX background animation flicker in ACP 
PHPBB3-12040
 2013-11-26 10:18:53 -08:00
Joas Schilling
125e76f9aa Merge remote-tracking branch 'prototech/ticket/12036' into develop 
* prototech/ticket/12036:
  [ticket/12036] Re-add missing move up button to module management page.
 2013-11-26 14:52:32 +01:00
Joas Schilling
c49e7387d6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.

Conflicts:
	phpBB/adm/style/acp_inactive.html
 2013-11-26 11:33:17 +01:00
Joas Schilling
afb4585dd9 Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus 
* prototech/ticket/12037:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.
 2013-11-26 11:31:43 +01:00
Cesar G
e111d7bd13 [ticket/12037] Fix hard-coded text in acp_inactive.html. 
PHPBB3-12037
 2013-11-25 12:38:53 -08:00
Cesar G
95e380ec18 [ticket/12036] Re-add missing move up button to module management page. 
PHPBB3-12036
 2013-11-25 11:56:09 -08:00
Nils Adermann
0d0b2627f7 Merge pull request #1886 from nickvergessen/ticket/12027 
[Ticket/12027] List redis as service in .travis.yml
 2013-11-22 03:24:49 -08:00
Joas Schilling
a3df2cb454 [ticket/12027] List redis as service in .travis.yml 
PHPBB3-12027
 2013-11-22 10:26:05 +01:00
Nathan Guse
6e842f11fc Merge pull request #1884 from nickvergessen/ticket/12015-2 
[ticket/12015] Fix variable name and event version
 2013-11-21 14:56:05 -08:00
Joas Schilling
2a154d0a10 [ticket/12015] Fix variable name and event version 
PHPBB3-12015
 2013-11-21 23:42:40 +01:00
Matt Friedman
7f890ebed7 [ticket/12014] Change event date in docs 
PHPBB3-12014
 2013-11-21 14:31:43 -08:00
Nathan Guse
5220013f9d Merge pull request #1883 from s9e/ticket/12028 
[ticket/12028] Replace L_COLON with literal colon
 2013-11-21 14:24:56 -08:00
Nathan Guse
b64d94b6bc Merge pull request #1870 from nickvergessen/ticket/12015 
Ticket/12015 Enhance events in viewtopic to increase their usability
 2013-11-21 14:21:31 -08:00
s9e
263f213ffe [ticket/12028] Replace L_COLON with literal colon 
Replace L_COLON with literal colon in JavaScript context.

[ci skip]

PHPBB3-12028
 2013-11-21 23:20:16 +01:00
Joas Schilling
e9e667762b [ticket/12015] Fix english grammar 
PHPBB3-12015
 2013-11-21 23:18:29 +01:00
Nathan Guse
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005 
[ticket/12005] Remove code responsible for PM popup completely
 2013-11-21 14:01:23 -08:00