Commit graph

19351 commits

Author SHA1 Message Date
Dhruv
99d312da2a Merge branch 'ticket/11271' into ticket/11271-develop
* ticket/11271:
  [ticket/11271] Make path conversion more precise

Conflicts:
	phpBB/feed.php
2013-12-27 03:43:22 +05:30
Dhruv
1aa27f400c [ticket/11271] Make path conversion more precise
PHPBB3-11271
2013-12-27 03:31:28 +05:30
Dhruv
657ddf8309 [ticket/11271] limit absolute path conversion to attachment links only
PHPBB3-11271
2013-12-27 01:33:54 +05:30
Dhruv
fd9366daf5 Merge branch 'ticket/11271' into ticket/11271-develop
* ticket/11271:
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.

Conflicts:
	phpBB/feed.php
2013-12-27 01:33:32 +05:30
Dhruv
a71625ca76 [ticket/11271] Add docblock of feed_generate_content( )
PHPBB3-11271
2013-12-27 00:38:42 +05:30
Dhruv
80c05e861b Merge branch 'develop' into ticket/11271-develop
# By Vjacheslav Trushkin (148) and others
# Via Joas Schilling (50) and others
* develop: (635 commits)
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  ...
2013-12-27 00:28:38 +05:30
Dhruv
f7c764986f [ticket/11271] Fix tabs and use !empty( ) instead of count( )
PHPBB3-11271
2013-12-27 00:22:29 +05:30
Dhruv
6611329d83 [ticket/11271] Remove unnecessary inclusion of functions_display
PHPBB3-11271
2013-12-27 00:22:28 +05:30
Dhruv
3bae72d164 [ticket/11271] Typecast forum and topic id to integer
PHPBB3-11271
2013-12-27 00:22:27 +05:30
Dhruv
dc37f3a0e3 [ticket/11271] Use absolute path for displaying inline attachments in feeds
PHPBB3-11271
2013-12-27 00:22:26 +05:30
erangamapa
62263c13d4 [ticket/11271] Changed executable bit.
Changed executable bit value from 755 to 644.

PHPBB3-11271
2013-12-27 00:22:25 +05:30
erangamapa
08d69de933 [ticket/11271] Formatting code and removing null assignment.
Formatted code and replaced null assignment with empty array
assignment to attachments parameter in method 'feed_generate_content'.

PHPBB3-11271
2013-12-27 00:22:24 +05:30
erangamapa
cca4067694 [ticket/11271] Removing unnecessary database object
Removed unnecessary global database object from 'feed_generate_content'
Method.

PHPBB3-11271
2013-12-27 00:22:22 +05:30
erangamapa
8586171187 [ticket/11271] Separated attachment fetching query
Removed external query used to fetch related attachments.
Added attachments fetching method with database query to
post based feed.

PHPBB3-11271
2013-12-27 00:22:21 +05:30
erangamapa
91a14a9e63 [ticket/11271] Fetched feed attachments before loop.
Fetched feed attachments before looping through feed items and
send them to method 'feed_generate_content' for each feed item.

PHPBB3-11271
2013-12-27 00:22:20 +05:30
erangamapa
a41e2ca380 [ticket/11271] Removed in-line attachment comments properly.
Added a new regex to remove in-line attachment comments.

PHPBB3-11271
2013-12-27 00:22:19 +05:30
erangamapa
5bf4726195 [ticket/11271] Displaying in-line attached images in ATOM feed.
In-line attached images are not displaying as they are not parsing.
Included 'parse_attachments' column name for data fetching queries
in feed.php. Checked weather feeds have in-line attachments and
parsed them by using parse_attachments() method.

PHPBB3-11271
2013-12-27 00:22:18 +05:30
Dhruv
1bb175ce77 [ticket/11271] Add the inline images html to content
PHPBB3-11271
2013-12-25 04:58:41 +05:30
Dhruv
e2f72539e1 [ticket/11271] Use class variable $db instead of global
PHPBB3-11271
2013-12-25 04:58:28 +05:30
Dhruv
f9c7f0fc19 Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/feature/pagination-class:
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
2013-12-25 00:54:07 +05:30
Andreas Fischer
02336d9a69 Merge pull request #1940 from prototech/ticket/12079
[ticket/12079] Add default value to $multibyte in request.untrimmed_varible().

* prototech/ticket/12079:
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
2013-12-21 19:24:21 +01:00
Nils Adermann
9f7985d725 Merge pull request #1932 from ptarjan/patch-1
Try running unit tests on HHVM
2013-12-20 07:15:32 -08:00
Joas Schilling
558f3cd21c Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop
* vsephpbb/ticket/12060: (37 commits)
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  [ticket/12060] Rename event in message parser to modify_format_display_text_after
  [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
  [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
  [ticket/12060] Use separate template event for acp user signature posting buttons
  [ticket/12060] Rename event from append to after in acp_bbcodes.html
  [ticket/12060] Correctly label alpha versions in event docblocks
  [ticket/12060] Fix u_action comments in docblocks
  [ticket/12060] Change @since in event docblocks
  [ticket/12060] Update the docblock comments in acp core events
  [ticket/12060] Refactor u_action in the events that use it
  [ticket/12060] Use $sql_ary instead of $sql
  [ticket/12060] Update docblock for core event due to addition of another var
  [ticket/12060] Remove re-tabbing of html from subsilver2 files
  [ticket/12060] Add $update_this_message var to the core event
  [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
  ...
2013-12-20 16:11:02 +01:00
Cesar G
cd98dba0b9 [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
PHPBB3-12079
2013-12-19 19:09:40 -08:00
Joas Schilling
cb8b2bab5f [ticket/11849] Fix more function calls
PHPBB3-11849
2013-12-18 18:39:11 +01:00
Joas Schilling
edd183b53a [ticket/11849] Update more MCP calls to pagination class
PHPBB3-11849
2013-12-18 18:39:01 +01:00
Joas Schilling
8652589469 [ticket/11849] Update some ACP modules with new pagination
PHPBB3-11849
2013-12-18 18:36:47 +01:00
Joas Schilling
e4950ced92 [ticket/11849] Update rest of the UCP modules
PHPBB3-11849
2013-12-18 18:36:08 +01:00
Joas Schilling
a5b55e5ab4 [ticket/11849] Update UCP notifications and pm folder
PHPBB3-11849
2013-12-18 18:35:59 +01:00
Joas Schilling
dfe0526979 [ticket/11849] Update search and memberlist
PHPBB3-11849
2013-12-18 18:35:47 +01:00
Joas Schilling
59a24f6423 [ticket/11849] Update pagination in viewonline.php
PHPBB3-11849
2013-12-18 18:35:40 +01:00
Joas Schilling
a836a107ca [ticket/11849] Remove old pagination test
PHPBB3-11849
2013-12-18 18:35:32 +01:00
Joas Schilling
4f4512cbac [ticket/11849] Update pagination code in viewtopic.php
PHPBB3-11849
2013-12-18 18:35:25 +01:00
Joas Schilling
725c512468 [ticket/11849] Replace pagination in viewforum.php with class
PHPBB3-11849
2013-12-18 18:35:16 +01:00
Joas Schilling
fcfa1a35cc [ticket/11849] Add service definition
PHPBB3-11849
2013-12-18 18:35:07 +01:00
Joas Schilling
a485184434 [ticket/11849] Remove pagination functions
The functions where changed in 3.1 anyway, so we can just delete them

PHPBB3-11849
2013-12-18 18:34:58 +01:00
Joas Schilling
ed16fbd5b7 [ticket/11849] Test validate_start and on_page
PHPBB3-11849
2013-12-18 18:34:49 +01:00
Joas Schilling
268afe20f4 [ticket/11849] Move pagination code to class
PHPBB3-11849
2013-12-18 18:34:13 +01:00
Matt Friedman
121f2394ff [ticket/12060] A little less verbose cleanup of event docblocks
PHPBB3-12060
2013-12-17 18:55:59 -08:00
Matt Friedman
4665e3df21 [ticket/12060] Further clarifying new event docblocks as much as possible
PHPBB3-12060
2013-12-16 23:54:55 -08:00
Matt Friedman
01c4235f00 [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
PHPBB3-12060
2013-12-16 15:33:44 -08:00
Matt Friedman
df9e782fa4 [ticket/12060] Remove whitespaces
PHPBB3-12060
2013-12-16 15:31:44 -08:00
Matt Friedman
6b178c758e [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
PHPBB3-12060
2013-12-16 15:31:25 -08:00
Joas Schilling
e3e34add7f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10023] Make password change notification more noticeable
2013-12-16 10:25:45 +01:00
Joas Schilling
89fd73c18d Merge remote-tracking branch 'Elsensee/ticket/10023' into develop-olympus
* Elsensee/ticket/10023:
  [ticket/10023] Make password change notification more noticeable
2013-12-16 10:25:21 +01:00
Joas Schilling
4a73ce0933 Merge remote-tracking branch 'prototech/ticket/12009' into develop
* prototech/ticket/12009:
  [ticket/12009] Prevent user from enabling invalid extension through direct URL
  [ticket/12009] Update functional test to check for invalid extensions.
  [ticket/12009] Fix functional tests.
  [ticket/12009] Move valid extensions in tests to correct dir structure.
  [ticket/12009] Do not allow incorrectly structured extensions to be installed.
2013-12-16 10:18:56 +01:00
Joas Schilling
8da2f349fe Merge remote-tracking branch 'vsephpbb/ticket/12054' into develop
* vsephpbb/ticket/12054:
  [ticket/12054] Re-word event documentation
  [ticket/12054] Reword descriptions and resort events alphabetically
  [ticket/12054] Update index_body_linklist_before/after template events
2013-12-16 10:08:19 +01:00
Matt Friedman
b13f64b5a9 [ticket/12054] Re-word event documentation
PHPBB3-12054
2013-12-14 12:59:52 -08:00
Paul Tarjan
f495f937e9 HHVM is failing for now
Lets at least keep running it so we remember to fix it
2013-12-13 18:11:49 -08:00
Matt Friedman
f045458679 [ticket/12060] Rename event in message parser to modify_format_display_text_after
PHPBB3-12060
2013-12-13 17:00:06 -08:00