makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Nathan Guse 2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/10491] Install board once per test run.
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  ...

Conflicts:
	phpBB/includes/mcp/mcp_topic.php
2012-12-13 20:46:25 -06:00
..
adm [ticket/11093] acp_users_overview.html has a wrongly placed </dd> 2012-10-16 14:39:32 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop [ticket/11227] @return void -> @return null in develop-olympus. 2012-11-29 15:37:12 -05:00
docs [ticket/11227] @return void -> @return null in develop-olympus. 2012-11-29 15:37:12 -05:00
download [ticket/10633] Stop leaking filename of attachments when thumbnail is requested 2012-02-09 15:17:42 +01:00
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 2012-12-13 20:46:25 -06:00
install [ticket/10184] Query bots table to get the user_ids of the bots 2012-12-01 10:54:26 +01:00
language [ticket/11192] Add Tebibyte to get_formatted_filesize(). 2012-11-11 14:35:31 +01:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles [ticket/10841] Revert more whitespace changes. 2012-12-05 12:07:37 -05:00
.htaccess [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 2010-01-19 19:08:51 +00:00
common.php [ticket/10848] Move include up. 2012-10-17 22:35:36 -04:00
composer.json [ticket/11238] Set goutte version to 0.1.0. 2012-12-02 23:44:49 -05:00
composer.lock [ticket/11238] Set goutte version to 0.1.0. 2012-12-02 23:44:49 -05:00
cron.php [ticket/10046] Call flush() in cron.php 2011-03-12 14:56:47 +01:00
faq.php populate who is online only where required 2009-08-12 10:30:37 +00:00
feed.php Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympus 2011-08-26 05:59:13 -04:00
index.php [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition 2012-01-15 18:18:04 +08:00
mcp.php fix mcp sorting for pm_reports, and some minor language changes 2009-07-22 13:33:54 +00:00
memberlist.php Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympus 2012-04-03 20:57:24 -04:00
posting.php [ticket/10503] Debug error "Invalid arguments" when previewing edits 2011-11-28 10:35:43 +01:00
report.php [ticket/10266] Add "Return to forum" link after reporting a post 2011-07-14 02:52:05 +02:00
search.php [ticket/10943] displays searched query in search result 2012-08-11 02:26:46 +05:30
style.php [ticket/10399] Correctly encoding template component urls (3.0) 2011-12-04 11:43:55 +02:00
ucp.php [ticket/11158] Revert old fix in PHPBB3-10186. 2012-10-29 14:58:19 -04:00
viewforum.php [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). 2012-02-09 15:34:04 +01:00
viewonline.php Fix bug #46215 - Adjust viewonline filename regular expression to be less strict. 2009-06-09 15:52:03 +00:00
viewtopic.php [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). 2012-02-09 15:34:04 +01:00
web.config [ticket/10219] Remove invalid and invisible character from web.config. 2011-06-14 23:18:33 +02:00