Marc Alexander
7006db7a2d
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
...
Conflicts:
phpBB/includes/functions.php
2013-10-03 10:04:59 +02:00
Nathan
621e6c93ed
[ticket/11883] Report completed data step in migration as "Installing Data"
...
PHPBB3-11883
2013-10-02 14:27:46 -05:00
Nathan
ee89ede59f
[ticket/11881] Timezone migration can take a long time
...
PHPBB3-11881
2013-10-02 14:23:01 -05:00
Nathan
5bd7f1bd36
[ticket/11882] If dependency is incorrect/unfulfillable, throw an error
...
PHPBB3-11882
2013-10-02 14:21:50 -05:00
Nathan
cab84dd9c5
[ticket/11882] Incorrect dependency in signature module auth migration
...
PHPBB3-11882
2013-10-02 14:18:32 -05:00
Dhruv
49ce2c13b2
Merge remote-tracking branch 'nickvergessen/ticket/11691' into develop
...
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11691:
[ticket/11691] Fix conversion test
[ticket/11691] Fix table names and arguments/docs
[ticket/11691] Move purge code into new function
[ticket/11691] Fix typo in comment
[ticket/11691] Add order by to the query
[ticket/11691] Fix some minor comments
[ticket/11691] Fix some more problems with softdelete update
[ticket/11691] Change detection of effectively_installed()
[ticket/11691] Stagger user notification reconversion even more
[ticket/11691] Stagger the convertion of soft delete updates
2013-10-02 20:46:11 +05:30
Marc Alexander
afb7d2e616
[feature/passwords] Rename manager methods to check() and hash()
...
These method names are more straightforward than the previous ones.
PHPBB3-11610
2013-10-02 13:30:36 +02:00
Marc Alexander
356f3eef07
[feature/passwords] Inject passwords manager into auth providers
...
The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().
PHPBB3-11610
2013-10-02 13:28:38 +02:00
Nathan Guse
9503b4d529
[ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modules
...
PHPBB3-11878
2013-10-02 00:12:29 -05:00
Marc Alexander
61e4c0f251
[feature/passwords] Do not hash passwords longer than 4096 bytes
...
PHPBB3-11610
2013-10-01 17:38:52 +02:00
Nathan Guse
e905a46b8c
[ticket/11840] Fix regex
...
PHPBB3-11840
2013-09-30 21:18:20 -05:00
MichaelC
fd022123c0
[task/composer-compatibility] Minor changes that will break extension BC
...
PHPBB3-11840
2013-10-01 00:35:36 +01:00
Nathan Guse
a6df011a10
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850
...
# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
[ticket/11876] Replace MD5 with SHA256.
[ticket/11876] Move checksum generation from build PHP files to phing build.xml
[develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
[prep-release-3.0.12] Update changelog for 3.0.12 release.
[ticket/11873] Add unit test for large password input.
[ticket/11873] Do not hash very large passwords in order to safe resources.
[ticket/11862] Correct var names in user_delete() events due to prune-users
[develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
[prep-release-3.0.12] Bumping version number for 3.0.12 final.
[ticket/11852] Add class file
[ticket/11852] Move tests to folder with new class name
[ticket/11852] Split filesystem and path_helper into 2 classes
[ticket/11868] Add @depends to test
[ticket/11868] Add functional test for registration
[ticket/11868] Replace phpbb_request_interface references
[ticket/11866] Only single backslash in .md files
[ticket/11866] Remove outdated and broken develop script
[ticket/11866] More namespaces
[ticket/11866] Update some occurances of phpbb_db_ to new Namespace
[ticket/11865] Convert old class name to namespaced version
...
Conflicts:
tests/security/extract_current_page_test.php
tests/session/testable_facade.php
2013-09-30 18:24:46 -05:00
Marc Alexander
3ebff0a960
[feature/passwords] Pass config via service container to driver helper
...
This will get rid of the global $config in the driver helper
PHPBB3-11610
2013-09-28 12:42:11 +02:00
Marc Alexander
de087d537e
[feature/passwords] A few more corrections in methods due to namespacing
...
PHPBB3-11610
2013-09-28 12:41:02 +02:00
Joas Schilling
e0adb15074
[ticket/11871] Allow backslash in classnames for Modules
...
PHPBB3-11871
2013-09-27 18:14:58 +02:00
Marc Alexander
5bc5e4716c
[feature/passwords] More changes due to namespacing
...
PHPBB3-11610
2013-09-27 16:58:06 +02:00
Marc Alexander
3f63b9b470
[feature/passwords] Modify passwords files for namespacing changes
...
PHPBB3-11610
2013-09-27 11:16:47 +02:00
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