mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 02:59:29 +02:00
Code Issues Releases Wiki Activity
30,430 Commits 18 Branches 192 Tags
Commit Graph

3709 Commits

Author SHA1 Message Date
Marc Alexander
663b4b2eb7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords 
Conflicts:
	phpBB/develop/create_schema_files.php
 2013-09-27 10:47:10 +02:00
Joas Schilling
213e7563ad [ticket/11852] Add class file 
PHPBB3-11852
 2013-09-27 00:08:54 +02:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes 
PHPBB3-11852
 2013-09-26 15:34:44 +02:00
Joas Schilling
e8303bc319 Merge remote-tracking branch 'EXreaction/ticket/11816-2' into develop 
* EXreaction/ticket/11816-2:
  [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
 2013-09-26 10:59:14 +02:00
Joas Schilling
07186656c8 [ticket/11691] Fix table names and arguments/docs 
PHPBB3-11691
 2013-09-26 01:16:37 +02:00
Joas Schilling
8aa9f1d3ab [ticket/11691] Move purge code into new function 
PHPBB3-11691
 2013-09-26 01:14:36 +02:00
Joas Schilling
3b7abb98e1 [ticket/11691] Fix typo in comment 
PHPBB3-11691
 2013-09-26 01:14:34 +02:00
Joas Schilling
eace91af20 [ticket/11691] Add order by to the query 
PHPBB3-11691
 2013-09-26 01:14:33 +02:00
Joas Schilling
e7c43dbb67 [ticket/11691] Fix some minor comments 
PHPBB3-11691
 2013-09-26 01:14:32 +02:00
Joas Schilling
a7cf62decf [ticket/11691] Fix some more problems with softdelete update 
* wrong order of arguments on sql_query_limit
* avoid "BIGINT UNSIGNED value is out of range" errors
* increase limit for the loop

PHPBB3-11691
 2013-09-26 01:14:31 +02:00
Joas Schilling
f8d6f0ef08 [ticket/11691] Change detection of effectively_installed() 
When start is set for a migration, it is not yet effectively installed.
So we just continue doing it...

PHPBB3-11691
 2013-09-26 01:14:29 +02:00
Joas Schilling
29c84be40a [ticket/11691] Stagger user notification reconversion even more 
PHPBB3-11691
 2013-09-26 01:14:29 +02:00
Joas Schilling
a7af736b97 [ticket/11691] Stagger the convertion of soft delete updates 
PHPBB3-11691
 2013-09-26 01:09:17 +02:00
Joas Schilling
03639c081c [ticket/11866] Update some occurances of phpbb_db_ to new Namespace 
PHPBB3-11866
 2013-09-26 00:42:04 +02:00
Nils Adermann
645bd127dd [ticket/11700] Undo migrations migration, as not an issue for new installs 
PHPBB3-11700
 2013-09-25 16:20:26 +02:00
Nils Adermann
cbc458e476 [ticket/11700] Update migrations table for namespaces 
PHPBB3-11700
 2013-09-25 16:09:14 +02:00
Nils Adermann
9373c0db96 [ticket/11700] Only replace phpbb_search in strings that match 
PHPBB3-11700
 2013-09-25 14:40:12 +02:00
Nils Adermann
3a478cb3e2 [ticket/11700] Use spaces, not tabs 
PHPBB3-11700
 2013-09-25 14:36:50 +02:00
Nils Adermann
86147b46a4 [ticket/11700] Return class names with leading backslash in finder 
PHPBB3-11700
 2013-09-25 13:15:34 +02:00
Joas Schilling
ed55626165 [ticket/11700] Fix unresolvable condition in migration 
PHPBB3-11700
 2013-09-25 10:01:44 +02:00
rechosen
e45b69ee09 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786 2013-09-23 18:08:29 +02:00
Marc Alexander
01512104b5 [feature/passwords] Use dependency injection for passwords driver helper 
The passwords driver helper is now injected into the driver base instead
of being manually loaded.

PHPBB3-11610
 2013-09-22 22:53:10 +02:00
Marc Alexander
f5eb0d744e [feature/passwords] Use dependency injection for helper 
This will now be used instead of manually loading the passwords helper
instance in the passwords manager.

PHPBB3-11610
 2013-09-22 21:17:30 +02:00
Marc Alexander
1970c69c8c [feature/passwords] Rename migrations file to passwords 
Also removed the effectively_installed() check that is not needed according
to EXreaction.

PHPBB3-11610
 2013-09-20 19:37:05 +02:00
Marc Alexander
a00854c406 [feature/passwords] Do not pass phpbb_container to passwords manager 
PHPBB3-11610
 2013-09-20 17:31:32 +02:00
Nathan Guse
9152455d70 [ticket/11816] Fix multiple parenthesis as well before $VARs in templates 
PHPBB3-11816
 2013-09-19 12:40:53 -05:00
Nils Adermann
fe36375a36 [ticket/11700] Fix extension loading with namespaces 
class loader now expects all classes to be prefixed with a backslash
when resolving paths

PHPBB3-11700
 2013-09-19 18:29:08 +02:00
Nils Adermann
f205c4fad4 [ticket/11700] Change search backend db entry to namespaces 
PHPBB3-11700
 2013-09-19 17:03:05 +02:00
Nils Adermann
40ea7422b1 [ticket/11700] Correctly load avatar templates for namespaced drivers 
PHPBB3-11700
 2013-09-19 16:21:38 +02:00
Nils Adermann
15413f43e4 [ticket/11700] Correctly handle avatar drivers with namespaces 
PHPBB3-11700
 2013-09-19 15:45:35 +02:00
Nils Adermann
06e7c84235 [ticket/11700] Fix some more incorrectly changed comments 
PHPBB3-11700
 2013-09-19 15:27:03 +02:00
Nathan Guse
9c535da528 [ticket/11850] page_name contains controller request rather than query string 
Fixing tests

PHPBB3-11850
 2013-09-17 22:00:06 -05:00
Nils Adermann
1adcbccc09 [ticket/11700] Replace some leftover phpbb_filesystem uses 
PHPBB3-11700
 2013-09-17 18:56:47 +02:00
Nathan Guse
f4317bc864 [ticket/11850] Fix $user->page on pages through the controller 
PHPBB3-11850
 2013-09-17 11:44:42 -05:00
Nils Adermann
1d7f8f8193 [ticket/11700] Get functional tests running after develop merge 
PHPBB3-11700
 2013-09-17 18:10:58 +02:00
Nils Adermann
9d8ac2b0ce [ticket/11700] Fix unit tests after develop merge 
PHPBB3-11700
 2013-09-17 17:12:41 +02:00
Nils Adermann
f039a3308a Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 
* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
 2013-09-17 16:56:50 +02:00
Nils Adermann
c4b53490ad [ticket/11700] Correctly load extensions with nonprefixed namespaces 
PHPBB3-11700
 2013-09-17 16:15:44 +02:00
Nils Adermann
d12f358855 [ticket/11700] Correctly convert old acm type to namespaced class name 
PHPBB3-11700
 2013-09-16 17:33:56 +02:00
Nils Adermann
77ffd5c6ba [ticket/11700] Use underscores in avatar driver template file names 
PHPBB3-11700
 2013-09-16 06:44:16 +02:00
Nils Adermann
570b83b046 [ticket/11700] namespacify phpbb_permissions class 
PHPBB3-11700
 2013-09-16 06:30:50 +02:00
Nils Adermann
6e6681fa59 [ticket/11700] Load avatar explanations correctly from namespaces 
PHPBB3-11700
 2013-09-16 05:58:40 +02:00
Nils Adermann
fcd36ddd1f [ticket/11700] Correctly generate lang key from avatar driver class 
PHPBB3-11700
 2013-09-16 05:36:21 +02:00
Nils Adermann
d905358e2b [ticket/11700] Fix leftover backslashes in comments 
PHPBB3-11700
 2013-09-16 05:20:27 +02:00
Nils Adermann
390dc86344 [ticket/11700] And some last comments with backslashes 
PHPBB3-11700
 2013-09-16 05:00:18 +02:00
Nils Adermann
d626ebaf1e [ticket/11700] Fix a few more comments 
PHPBB3-11700
 2013-09-16 04:45:58 +02:00
Nils Adermann
acea8f5c0a [ticket/11700] The word "them" in a comment is not a class 
PHPBB3-11700
 2013-09-16 03:51:42 +02:00
Nils Adermann
3860b37741 [ticket/11700] Actually "one" in comments is not a class 
PHPBB3-11700
 2013-09-16 03:50:47 +02:00
Nils Adermann
1fa673bded [ticket/11700] Fix authentication acp after develop merge 
PHPBB3-11700
 2013-09-16 03:22:13 +02:00
Nils Adermann
09cfa01d58 [ticket/11700] Fix installation after develop merge 
PHPBB3-11700
 2013-09-16 03:14:39 +02:00