Dhruv 7a971f896d Merge branch 'ticket/11271' into ticket/11271-develop ...

# By erangamapa (7) and Dhruv (2)
* ticket/11271:
  [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-10-05 16:54:09 +05:30

..

auth

[ticket/11700] Fix some more incorrectly changed comments

2013-09-19 15:27:03 +02:00

avatar

[ticket/11700] Correctly load avatar templates for namespaced drivers

2013-09-19 16:21:38 +02:00

cache

[ticket/11700] Fix installation after develop merge

2013-09-16 03:14:39 +02:00

config

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

controller

[ticket/11700] Fix extension loading with namespaces

2013-09-19 18:29:08 +02:00

cron

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

db

Merge remote-tracking branch 'EXreaction/ticket/11883' into develop

2013-10-04 20:40:30 +05:30

di

[ticket/11700] Correctly convert old acm type to namespaced class name

2013-09-16 17:33:56 +02:00

event

[ticket/11700] Fix extension loading with namespaces

2013-09-19 18:29:08 +02:00

extension

[ticket/11700] Use spaces, not tabs

2013-09-25 14:36:50 +02:00

feed

Merge branch 'ticket/11271' into ticket/11271-develop

2013-10-05 16:54:09 +05:30

groupposition

[ticket/11700] Fix some more incorrectly changed comments

2013-09-19 15:27:03 +02:00

hook

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

lock

…

log

[ticket/11700] Fix tests after merging new develop code

2013-09-16 02:41:03 +02:00

notification

Merge pull request #1654 from rechosen/ticket/11786

2013-10-03 20:22:41 -07:00

php

…

request

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

search

[ticket/11700] Fix some more incorrectly changed comments

2013-09-19 15:27:03 +02:00

template

[ticket/11852] Split filesystem and path_helper into 2 classes

2013-09-26 15:34:44 +02:00

tree

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

class_loader.php

[ticket/11700] Fix extension loading with namespaces

2013-09-19 18:29:08 +02:00

content_visibility.php

Merge pull request #1654 from rechosen/ticket/11786

2013-10-03 20:22:41 -07:00

datetime.php

[ticket/11700] Fix a few more comments

2013-09-16 04:45:58 +02:00

error_collector.php

…

filesystem.php

[ticket/11852] Split filesystem and path_helper into 2 classes

2013-09-26 15:34:44 +02:00

json_response.php

…

path_helper.php

[ticket/11852] Add class file

2013-09-27 00:08:54 +02:00

permissions.php

[ticket/11700] namespacify phpbb_permissions class

2013-09-16 06:30:50 +02:00

session.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850

2013-09-30 18:24:46 -05:00

symfony_request.php

[ticket/11700] Fix unit tests after develop merge

2013-09-17 17:12:41 +02:00

user_loader.php

…

user.php

[ticket/11700] And some last comments with backslashes

2013-09-16 05:00:18 +02:00