makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 10:48:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Nathan Guse b8bb16f8e7 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 
* remotes/upstream/develop-olympus:
  [ticket/11831] getAttribute was replaced with attr
  [ticket/11831] Update fabpot/goutte to 1.0.*

Conflicts:
	phpBB/composer.lock
2013-09-13 15:56:28 -05:00
..
adm [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-06 20:35:54 -04:00
assets/javascript Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop 2013-06-06 14:07:27 -05:00
cache
config Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
develop [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ 2013-09-03 19:44:07 +05:30
docs Merge branch 'develop-olympus' into develop 2013-09-10 02:53:33 +02:00
download [ticket/11802] replace $browser with $user->browser 2013-08-20 04:14:20 +05:30
files
images
includes Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
install Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
language Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
phpbb Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
store
styles [ticket/11836] Fix subsilver fatal error 2013-09-13 16:34:52 -04:00
.htaccess [ticket/11215] Remove unnecessary comment 2013-09-02 15:34:14 -07:00
app.php [ticket/11215] Correct paths when path info is used for controller access 2013-07-06 23:20:21 -04:00
common.php Merge branch 'develop' into ticket/11215 2013-08-31 13:37:11 -07:00
composer.json Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 2013-09-13 15:56:28 -05:00
composer.lock Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 2013-09-13 15:56:28 -05:00
cron.php [ticket/11189] Replace DEBUG_EXTRA with DEBUG 2012-11-10 10:45:02 -06:00
faq.php
feed.php [ticket/11481] Move prepended slash from calls into function 2013-06-06 20:35:38 +02:00
index.php [ticket/11103] Instantiate $phpbb_notifications as needed 2012-12-13 19:19:40 -06:00
mcp.php [ticket/9657] Use the service instead of the static class 2013-07-11 14:24:07 +02:00
memberlist.php Merge remote-tracking branch 'brunoais/ticket/11656' into develop 2013-07-24 22:14:52 +02:00
posting.php Merge branch 'develop-olympus' into develop 2013-09-02 12:31:27 +02:00
report.php [ticket/11763] Add missing variable when reporting a PM to avoid SQL Error 2013-08-03 17:30:28 +02:00
search.php Merge pull request #1640 from brunoais/ticket/11637 2013-09-12 19:30:43 -07:00
ucp.php [feature/oauth] Forgot to have login_link be "in login" in ucp 2013-08-05 17:35:44 -04:00
viewforum.php [ticket/11749] PHP Events for viewforum.php 2013-07-27 10:45:40 -07:00
viewonline.php [ticket/11259] adm_relative_path -> phpbb_adm_relative_path 2012-12-09 19:29:51 -06:00
viewtopic.php [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php 2013-09-06 15:04:52 +02:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00