mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 05:55:15 +02:00
Code Issues Releases Wiki Activity
25,905 Commits 18 Branches 192 Tags
Commit Graph

25905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesar G
2271f6a9da Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13878] Display background images when printing topic in webkit
 2015-05-28 15:35:04 +02:00
Cesar G
182312010b Merge remote-tracking branch 'marc1706/ticket/13878' into 3.1.x 
* marc1706/ticket/13878:
  [ticket/13878] Display background images when printing topic in webkit
 2015-05-28 15:34:43 +02:00
Marc Alexander
3ec3dfcf3a [ticket/13878] Display background images when printing topic in webkit 
PHPBB3-13878
 2015-05-28 14:58:46 +02:00
Marc Alexander
f5037761f0 Merge branch '3.1.x' 2015-05-28 14:18:20 +02:00
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
615761fdf1 Merge branch '3.1.x' 2015-05-28 14:16:11 +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
a8ec353a4f Merge branch '3.1.x' 
* 3.1.x:
  [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:31 +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
Joas Schilling
f6d7ea425f Merge branch '3.1.x' 
* 3.1.x:
  [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:59:04 +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
7278356936 Merge branch '3.1.x' 
* 3.1.x:
  [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

Conflicts:
	phpBB/includes/mcp/mcp_reports.php
 2015-05-28 12:56:26 +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
021a2aeb82 Merge branch '3.1.x' 
* 3.1.x:
  [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:36 +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
0f689e3cad Merge pull request #3636 from nickvergessen/ticket/13808-master 
Ticket/13808 master

Conflicts:
	phpBB/docs/events.md
 2015-05-28 12:44:33 +02:00
Marc Alexander
cdc86b3540 Merge branch '3.1.x' 
Conflicts:
	phpBB/docs/events.md
 2015-05-28 12:42:56 +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
5bf48bddf8 Merge branch 'ticket/13808' into ticket/13808-master 
* ticket/13808:
  [ticket/13808] Fix version

Conflicts:
	phpBB/docs/events.md
 2015-05-28 12:35:25 +02:00
Joas Schilling
0daa999fd0 [ticket/13808] Fix version 
PHPBB3-13808
 2015-05-28 12:34:21 +02:00
Marc Alexander
d917e0140f Merge pull request #3632 from prototech/ticket/13871 
Fix call to undefined member function when running database_update.php
 2015-05-28 12:34:16 +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
0f040225d6 [ticket/13871] Fix call to undefined member function on non-object error. 
PHPBB3-13871
 2015-05-28 11:53:35 +02:00
Cesar G
30d39687de Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
 2015-05-28 11:17:20 +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
c5b2822cf5 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13808] search_body_form_before

Conflicts:
	phpBB/styles/subsilver2/template/search_body.html
 2015-05-28 11:09:24 +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
95b3b4605a Merge branch '3.1.x' 2015-05-28 10:49:45 +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
2ee9baa3d0 Merge branch '3.1.x' 2015-05-28 10:42:43 +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
Andreas Fischer
e62eafb77b Merge pull request #3627 from imkingdavid/ticket/13769 
[ticket/13769] Move environment check in phpbbcli.php lower

* imkingdavid/ticket/13769:
  [ticket/13769] Move environment check lower in phpbbcli.php
 2015-05-26 20:44:26 +02:00
David King
06d31abda9 [ticket/13769] Move environment check lower in phpbbcli.php 
PHPBB3-13769
 2015-05-23 17:26:52 -04: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
6337407192 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/db/migration/data/v310/style_update_p1.php
 2015-05-22 11:51:25 +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
Marc Alexander
466b710235 Merge pull request #3608 from Nicofuma/ticket/13829 
[ticket/13829] Don't fail if the cache isn't writeable
 2015-05-20 10:53:16 +02:00
Marc Alexander
023f15f5fe Merge pull request #3621 from Nicofuma/ticket/13849 
[ticket/13849] Fix development environment
 2015-05-20 09:32:10 +02:00
Nicofuma
c5493c2bb8 Merge pull request #3586 from s9e/ticket/13680 
[ticket/13680] Updated quote notifications
 2015-05-20 00:38:49 +02:00
Nicofuma
fda5a83b6d Merge pull request #3569 from s9e/ticket/13641 
[ticket/13641] Proper parsing of custom BBCode for inline code
 2015-05-20 00:21:59 +02:00
Nicofuma
b5b7f455b1 Merge pull request #3572 from s9e/ticket/8419 
[ticket/8419] Custom tag eats up space character
 2015-05-20 00:10:12 +02:00
Nicofuma
15bec23770 Merge pull request #3578 from s9e/ticket/13801 
[ticket/13801] Remove user dependency from text_formatter.s9e.parser
 2015-05-20 00:02:41 +02:00
Nicofuma
9ccc7f4d65 Merge pull request #3597 from s9e/ticket/13614 
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
 2015-05-19 23:53:27 +02:00
Nicofuma
5e6c026527 Merge pull request #3617 from s9e/ticket/11530 
[ticket/11530] Remove extra quotes when depth limit is exceeded
 2015-05-19 23:35:58 +02:00
Nicofuma
b9ff0bbba4 [ticket/13849] Fix tests 
PHPBB3-13849
 2015-05-19 23:11:14 +02:00