phpbb/phpBB
Andreas Fischer f4c5e8f12d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
2014-06-24 20:59:11 +02:00
..
adm [ticket/12750] Center installation page copyright text. 2014-06-24 01:48:31 -07:00
assets Merge pull request #2514 from prototech/ticket/12553 2014-06-20 10:37:30 +02:00
bin [ticket/12655] Run the shell when --shell is used 2014-06-04 14:46:40 +02:00
cache [ticket/11700] Add back accidently deleted file in cache dir 2013-09-17 16:18:04 +02:00
config [ticket/12730] Add Google+ profile field type 2014-06-21 03:29:31 +05:30
develop [ticket/12763] Do not regenerate the *_schema.sql files 2014-06-23 21:39:34 +02:00
docs Merge pull request #2640 from dhruvgoel92/ticket/12532 2014-06-23 20:05:01 +02:00
download [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
ext [ticket/11163] Add ext/index.htm 2014-05-15 14:11:11 +02:00
files
images
includes Merge branch 'develop-ascraeus' into develop 2014-06-24 20:59:11 +02:00
install [ticket/12750] Center installation page copyright text. 2014-06-24 01:48:31 -07:00
language Merge branch 'develop-olympus' into develop-ascraeus 2014-06-24 20:59:11 +02:00
phpbb [ticket/12762] Make ext.php optional for extensions 2014-06-23 19:39:19 +02:00
store
styles Merge remote-tracking branch 'PayBas/ticket/12562' into develop-ascraeus 2014-06-23 20:57:31 -07:00
.htaccess Merge branch 'develop-olympus' into develop-ascraeus 2014-05-03 00:37:28 +02:00
app.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
common.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
composer.json [ticket/11528] Add behat/mink and mink-goutte-driver as dependency 2014-06-23 01:26:02 +05:30
composer.lock [ticket/11528] Add behat/mink and mink-goutte-driver as dependency 2014-06-23 01:26:02 +05:30
cron.php Merge pull request #2523 from bantu/ticket/12597 2014-05-30 22:52:01 +02:00
faq.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
feed.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
index.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
mcp.php [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global 2014-06-23 22:58:41 +02:00
memberlist.php [ticket/12612] Prefix _sort_last_active() with phpbb_ 2014-06-23 22:38:58 +02:00
posting.php [ticket/12612] Prefix upload_popup() with phpbb_ 2014-06-23 22:49:00 +02:00
report.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
search.php [ticket/12758] Add @changed to doc block 2014-06-22 10:23:41 +02:00
ucp.php [ticket/12612] Move function from ucp.php to functions_user.php 2014-06-18 16:57:13 +02:00
viewforum.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
viewonline.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
viewtopic.php [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread 2014-06-09 13:54:43 -07:00
web.config