phpbb/phpBB/includes
Nils Adermann 38af79dd30 Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
2014-02-02 16:34:55 +01:00
..
acp Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop 2014-02-02 16:34:55 +01:00
captcha [task/code-sniffer] Replace spaces with tabs. 2013-10-30 13:37:29 +01:00
db Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop 2014-02-02 16:34:55 +01:00
diff [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
hooks [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp Merge pull request #1889 from prototech/ticket/11963 2013-12-30 11:04:43 -08:00
questionnaire Merge remote-tracking branch 'upstream/develop' into ticket/11015 2012-12-06 21:49:24 -05:00
ucp Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop 2014-02-02 16:34:55 +01:00
utf [ticket/10847] fixing all misspelled "dependant" to "dependent" 2012-04-30 21:55:24 +02:00
.htaccess [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
bbcode.php Merge branch 'develop-olympus' into develop 2013-12-02 10:07:49 +01:00
constants.php [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant 2013-11-19 01:37:31 +01:00
functions.php Merge pull request #1716 from marc1706/feature/passwords 2014-02-02 06:26:35 -08:00
functions_acp.php [ticket/10910] Do not add size when its 1 (default) 2013-11-22 15:52:59 +01:00
functions_admin.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_compatibility.php [feature/avatars] Use deprecated for compatibility function 2013-02-03 23:06:30 +01:00
functions_compress.php [ticket/11981] Fix code sniffer complaints 2013-10-28 23:05:46 +01:00
functions_container.php [ticket/11866] More namespaces 2013-09-26 00:58:37 +02:00
functions_content.php Merge remote-tracking branch 'brunoais/ticket/11663' into develop 2013-11-02 16:26:29 +01:00
functions_convert.php [ticket/12005] Remove PM popup from converter 2013-11-08 21:57:05 +01:00
functions_database_helper.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_display.php Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop 2013-12-20 16:11:02 +01:00
functions_download.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_install.php [ticket/12023] Correctly compare the size of the array in ignore_new_files 2013-11-19 00:23:49 +01:00
functions_jabber.php Merge branch 'develop-olympus' into develop 2013-07-12 10:37:52 -05:00
functions_messenger.php [ticket/11981] Fix code sniffer complaints 2013-10-28 23:05:46 +01:00
functions_module.php [ticket/12006] global $phpbb_dispatcher; 2014-01-17 20:26:59 -06:00
functions_posting.php [ticket/11915] Provide the attachment file size to the template. 2014-01-17 19:20:36 -08:00
functions_privmsgs.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
functions_transfer.php [ticket/12077] Fix another strict standards error. 2013-12-19 19:36:49 -08:00
functions_upload.php [feature/plupload/integration] Integration of Plupload 2013-10-11 17:40:16 +02:00
functions_url_matcher.php [ticket/11948] Allow resource importing for routing 2013-10-21 21:52:48 +02:00
functions_user.php [ticket/11201] Rename profilefields class to manager 2014-02-02 12:53:29 +01:00
index.htm
message_parser.php [ticket/11915] Provide the URL to the attachment when it's uploaded. 2014-01-17 19:20:36 -08:00
sphinxapi.php [ticket/11248] Convert line endings to LF - develop edition. 2012-12-07 21:57:33 -05:00
startup.php [ticket/10893] Update the usage of Composer 2012-05-13 13:05:20 -04:00