mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00
Code Issues Releases Wiki Activity
24,686 Commits 18 Branches 192 Tags
Commit Graph

24686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
45d7e18f6b Merge pull request #3637 from callumacrae/ticket/13873 
[ticket/13873] Removed broken print stylesheet.
 2015-05-28 14:18:18 +02:00
Marc Alexander
ef39f3a9ab Merge pull request #3633 from nickvergessen/ticket/13872 
[ticket/13872] Allow template events to have a changed version
 2015-05-28 14:16:08 +02:00
Cesar G
f1e11414e8 Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.x 
* marc1706/ticket/12542:
  [ticket/12542] Use more specific CSS for drag-n-drop
  [ticket/12542] Do not use browser specific css for outline
  [ticket/12542] Properly check if textarea is undefined or null
  [ticket/12542] Use extended CSS for all browsers
  [ticket/12542] Rename javascript method and add doc block
  [ticket/12542] Add different outline colors for body & textarea
  [ticket/12542] Add initial drag-n-drop animation
 2015-05-28 13:36:15 +02:00
Marc Alexander
ba205a6bce [ticket/13875] Ignore cache, ext, and store folder in lint test 
PHPBB3-13875
 2015-05-28 13:35:32 +02:00
Nils Adermann
d589142c0b [ticket/13874] Add master to sami API docs 
PHPBB3-13874
 2015-05-28 13:19:52 +02:00
Joas Schilling
75dd91412b Merge pull request #3469 from brunoais/ticket/13672 
[ticket/13672] Allow changing the data from the user-submitted report

* brunoais/ticket/13672:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
 2015-05-28 12:58:58 +02:00
Joas Schilling
cf93c6503a Merge pull request #3468 from brunoais/ticket/13668 
[ticket/13668] Allow changing the query to obtain the user-submitted report

* brunoais/ticket/13668:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query
 2015-05-28 12:55:31 +02:00
Joas Schilling
b1d829c232 Merge pull request #3457 from brunoais/ticket/13661 
[ticket/13661] Add event to allow editing the queries used to get the logs

* brunoais/ticket/13661:
  [ticket/13661] BUMP version to 3.1.5-dev
  [ticket/13661] Brackets in their own line
  [ticket/13661] Re-Fixed  $log_type -> $log_time
  [ticket/13661] Wrong event @since version
  [ticket/13661] Removed superfluous whitespace
  [ticket/13661] bugfix: The conditional is the log_time, not log_type
  [ticket/13661] Fixed the "FROM" in the built query.
  [ticket/13661] Add event to allow editing the queries used to get the logs
  [ticket/13661] Transform queries to get logs and log count into built queries
 2015-05-28 12:52:19 +02:00
Callum Macrae
39cd228e06 [ticket/13873] Removed broken print stylesheet. 
PHPBB3-13873
 2015-05-28 12:46:19 +02:00
Marc Alexander
16deefa7f8 Merge pull request #3635 from nickvergessen/ticket/13808 
[ticket/13808] Fix version
 2015-05-28 12:40:29 +02:00
Joas Schilling
0daa999fd0 [ticket/13808] Fix version 
PHPBB3-13808
 2015-05-28 12:34:21 +02:00
Cesar G
30f256102f [ticket/13858] Make Plupload uploader available in the global namespace. 
PHPBB3-13858
 2015-05-28 12:25:43 +02:00
Joas Schilling
b00b504343 [ticket/13872] Allow template events to have a changed version 
PHPBB3-13872
 2015-05-28 12:23:24 +02:00
Cesar G
080690073a Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.x 
* Wolfsblvt/ticket/13787:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
 2015-05-28 11:16:22 +02:00
Joas Schilling
8fda16527e Merge pull request #3600 from dragosvr92/ticket/13808 
[ticket/13808] search_body_form_before
 2015-05-28 11:05:32 +02:00
Marc Alexander
abef078ab9 [ticket/12542] Use more specific CSS for drag-n-drop 
Otherwise the CSS gets overwritten by other CSS rules.

PHPBB3-12542
 2015-05-28 11:04:22 +02:00
Joas Schilling
7580798a5a Merge pull request #3435 from rxu/ticket/13648 
[ticket/13648] Allow extensions using custom bbcode validation methods
 2015-05-28 10:49:33 +02:00
Marc Alexander
cc134d5fed Merge pull request #3631 from rxu/ticket/13868 
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
 2015-05-28 10:42:40 +02:00
rxu
33239183ae [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions 
PHPBB3-13868
 2015-05-27 02:15:12 +07:00
alf007
6025c40cab Merge pull request #1 from phpbb/develop-ascraeus 
Develop ascraeus
 2015-05-25 00:14:48 +02:00
Marc Alexander
622d5b2643 [ticket/12542] Do not use browser specific css for outline 
Also, the CSS selector for the drag'n'drop was simplified to only use the
class.

PHPBB3-12542
 2015-05-23 10:51:04 +02:00
Marc Alexander
5ca77df084 Merge pull request #3624 from VSEphpbb/ticket/13861 
[ticket/13861] Fix undefined variables in style update migration
 2015-05-22 11:49:07 +02:00
Matt Friedman
67502c0d22 [ticket/13861] Fix undefined variables in style update migration 
PHPBB3-13861
 2015-05-21 15:23:17 -07:00
Marc Alexander
b7a89187b5 [ticket/12542] Properly check if textarea is undefined or null 
PHPBB3-12542
 2015-05-20 15:47:26 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Tristan Darricau
1d2a127144 Merge pull request #3619 from javiexin/ticket/13852 
[ticket/13852] Consistent tab navigation when login in
 2015-05-19 09:43:29 +02:00
javiexin
cb12a065df [ticket/13852] Consistent tab navigation when login in 
Added tabindex attribute to input elements in index_body.html to make
tab navigation consistent with that of login_body.html.

PHPBB3-13852
 2015-05-18 19:38:48 +02:00
Nicofuma
309a6b9313 Merge pull request #3601 from nickvergessen/ticket/13827 
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
 2015-05-17 20:01:18 +02:00
Joas Schilling
e52bc2d022 Merge pull request #3606 from Nicofuma/ticket/13838 
[ticket/13838] Check braces for control structures
 2015-05-16 13:39:45 +02:00
Oliver Schramm
1c0c9c1bca Merge pull request #3563 from rxu/ticket/13791 
[ticket/13791] Add more post buttons template events to viewtopic_body.html
 2015-05-15 17:52:44 +02:00
Marc Alexander
dcb36d572d Merge pull request #3607 from Nicofuma/ticket/13830 
[ticket/13830] Fix unsused used statements and catch blocks
 2015-05-14 18:14:26 +02:00
Joas Schilling
502214bf06 [ticket/13827] Use JsonResponse instead of our hacky json_response with exit() 
PHPBB3-13827
 2015-05-14 17:13:47 +02:00
Nicofuma
3bc2b54128 [ticket/13830] Fix unsused used statements and catch blocks 
PHPBB3-13830
 2015-05-14 16:02:05 +02:00
Marc Alexander
d004a1c6b8 Merge pull request #3540 from RMcGirr83/ticket/13699 
[ticket/13699] Add event before and after forum title in viewforum
 2015-05-14 15:56:05 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style 
PHPBB3-13838
 2015-05-14 15:43:44 +02:00
Nicofuma
e4b30c474b [ticket/13838] Check braces for control structures 
PHPBB3-13838
 2015-05-14 15:40:52 +02:00
Marc Alexander
4527789e50 Merge pull request #3605 from Nicofuma/ticket/13830 
[ticket/13830] Check class used in catch statements
 2015-05-14 12:53:29 +02:00
Nicofuma
084aa56777 [ticket/13830] Check class used in catch statements 
PHPBB3-13830
 2015-05-10 21:13:36 +02:00
Joas Schilling
66279e1a57 [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX 
PHPBB3-13827
 2015-05-09 20:48:14 +02:00
dragosvr92
345c25c367 [ticket/13808] search_body_form_before 
Extensions may be designed to add secondary search options,
such as Google search in the search_body.html.
There are no events in the searchbody, so this should be merged.

PHPBB3-13808
 2015-05-09 16:41:18 +03:00
brunoais
4119be5a3d [ticket/13672] Removed bogus sting concatenation 
PHPBB3-13672
 2015-05-08 10:43:48 +01:00
brunoais
d4fb3996d3 [ticket/13668] Removed bogus sting concatenation 
PHPBB3-13668
 2015-05-08 10:41:42 +01:00
Marc Alexander
b3b7f8e925 Merge pull request #3530 from VSEphpbb/ticket/13753 
[ticket/13753] Add template events to forum category row headers
 2015-05-08 11:19:53 +02:00
Marc Alexander
7f5f5c216b Merge pull request #3529 from rxu/ticket/13752 
[ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
 2015-05-08 11:16:40 +02:00
Marc Alexander
d741ab57a8 Merge pull request #3526 from rxu/ticket/13750 
[ticket/13750] Add core event to allow modifying navlinks text
 2015-05-08 11:14:17 +02:00
Marc Alexander
7a478b27dd Merge pull request #3459 from brunoais/ticket/13664 
[ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
 2015-05-08 11:07:50 +02:00
Marc Alexander
4fc6e7dbc7 Merge pull request #3598 from VSEphpbb/ticket/13822 
[ticket/13822] Correctly display softdelete and post detail perms
 2015-05-08 10:59:40 +02:00
Matt Friedman
350786c969 [ticket/13822] Correctly display softdelete and post detail perms 
PHPBB3-13822
 2015-05-07 21:10:16 -07:00
Marc Alexander
1e28748c0c Merge pull request #3455 from brunoais/ticket/13660 
[ticket/13660] Allow changing the query for total reports in mcp_front
 2015-05-08 00:17:10 +02:00
rxu
aa1b427e45 [ticket/13648] Allow extensions using custom bbcode validation methods 
PHPBB3-13648
 2015-05-07 22:01:10 +07:00