Commit graph

20231 commits

Author SHA1 Message Date
Cesar G
637a5a5eea [ticket/10383] AJAXify poll voting
PHPBB3-10383
2013-10-06 21:48:36 -07:00
Dhruv
2adb8499a9 Merge remote-tracking branch 'prototech/ticket/11739' into develop
# By Cesar G
# Via Cesar G
* prototech/ticket/11739:
  [ticket/11739] Rename “Remember Me” login keys module
2013-10-07 00:42:56 +05:30
Dhruv
da1edb4578 [ticket/11888] Update default search backend in namespaces migration
PHPBB3-11888
2013-10-06 10:38:11 +05:30
Cesar G
be9b767019 [ticket/11739] Rename “Remember Me” login keys module
PHPBB3-11739
2013-10-05 21:38:20 -07:00
Cesar G
19178421cf [ticket/11893] Remove unnecessary <fieldset> causing a large font size
PHPBB3-11893
2013-10-05 21:22:09 -07:00
Cesar G
70c757a3a9 [ticket/11894] Fix typo in "Delete post" option
PHPBB3-11894
2013-10-05 20:59:07 -07:00
Dhruv
ed19176aaf [ticket/11888] Use \phpbb\search\fulltext_native as search backend config
If \ is missing, the default search backend shown in ACP is wrong.

PHPBB3-11888
2013-10-05 22:55:19 +05:30
Dhruv
2b959e3331 [ticket/11288] Handle +,- without preceeding whitespace characters
PHPBB3-11288
2013-10-05 21:09:52 +05:30
Dhruv
7a971f896d Merge branch 'ticket/11271' into ticket/11271-develop
# By erangamapa (7) and Dhruv (2)
* ticket/11271:
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.

Conflicts:
	phpBB/feed.php
2013-10-05 16:54:09 +05:30
Nathan Guse
874fcc940f [ticket/11885] Fix migrations error
PHPBB3-11885
2013-10-04 23:07:48 -05:00
David King
3f7f2548cc [ticket/11885] Use conditional in update_data()
PHPBB3-11885
2013-10-04 16:17:03 -07:00
David King
b79d811b3a [ticket/11885] Fix migration files for 3.0.12
PHPBB3-11885
2013-10-04 16:08:38 -07:00
David King
62ad0984c7 [ticket/11885] Add migration files for 3.0.12-RC2 and RC3 and 3.0.12
PHPBB3-11885
2013-10-04 15:57:42 -07:00
David King
82b9df543b Merge pull request #1742 from EXreaction/ticket/11840
Ticket/11840 Refactor the extension metadata class
2013-10-04 15:40:20 -07:00
Nathan Guse
efe130bcfc [ticket/11881] Limit to 500
PHPBB3-11881
2013-10-04 15:04:30 -05:00
Nathan Guse
cd7d29b90e [ticket/11881] Make sure user_timezone isn't converted twice
PHPBB3-11881
2013-10-04 15:04:08 -05:00
Nathan Guse
9653276ebc [ticket/11881] Better split the timezone conversion into chunks; add test
PHPBB3-11881
2013-10-04 12:10:27 -05:00
Dhruv
c73801242d [ticket/11271] Typecast forum and topic id to integer
PHPBB3-11271
2013-10-04 20:51:17 +05:30
Dhruv
e8c7f8134d Merge remote-tracking branch 'EXreaction/ticket/11883' into develop
# By Nathan (1) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11883:
  [ticket/11883] Only output the migration time, not total
  [ticket/11883] Report completed data step in migration as "Installing Data"
2013-10-04 20:40:30 +05:30
Nathan Guse
3259bd1196 [ticket/11883] Only output the migration time, not total
PHPBB3-11883
2013-10-04 09:23:54 -05:00
Nathan Guse
fdae60c146 Merge pull request #1739 from nickvergessen/ticket/11871
[ticket/11871] Allow backslash in classnames for Modules
2013-10-03 20:31:16 -07:00
Nathan Guse
b54d0f2da6 Merge pull request #1704 from dhruvgoel92/ticket/11344
[ticket/11344] Add migration to remove acp_style_components module in 3.1
2013-10-03 20:30:11 -07:00
Nathan Guse
31aebb355c Merge pull request #1654 from rechosen/ticket/11786
[ticket/11786] Fix various defects in PHPDoc in-code documentation
2013-10-03 20:22:41 -07:00
David King
80b21e8049 Merge pull request #1746 from EXreaction/ticket/11882
[ticket/11882] Incorrect dependency in signature module auth migration
2013-10-03 09:34:12 -07:00
David King
2683188206 Merge pull request #1726 from EXreaction/ticket/11850
Fix $user->page on pages through the controller
2013-10-03 09:25:11 -07:00
Dhruv
16d6dc2e71 [ticket/11344] Upgrade migration to namespaces
PHPBB3-11344
2013-10-03 21:09:02 +05:30
Dhruv
34040771be [ticket/11344] Fix url of license
PHPBB3-11344
2013-10-03 21:02:36 +05:30
Dhruv
b4682f3a72 [ticket/11344] Add migration to remove acp_style_components module in 3.1
PHPBB3-11344
2013-10-03 21:02:34 +05:30
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
Joas Schilling
2ab3ee7d67 [ticket/11871] Fallback to int ID of the module, when creating links
Firefox is currently unable to correctly copy a urlencoded \ so users will be
unable to post links to modules. However we can still fallback to the id
instead of the name, so we do that in this case.

PHPBB3-11871
2013-10-02 22:37:16 +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
3aba3235d5 [feature/passwords] Use passwords manager in phpBB hash functions
PHPBB3-11610
2013-10-02 15:43:10 +02:00
Andreas Fischer
8f2cebc0bb Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympus
* cyberalien/ticket/11879:
  [ticket/11879] Replace .live() with .on()
2013-10-02 15:00:26 +02:00
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
Vjacheslav Trushkin
a79d0e6758 [ticket/11879] Replace .live() with .on()
PHPBB3-11879
2013-10-02 11:12:41 +03: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
Nathan Guse
1440517b78 [ticket/11850] Need symfony request and filesystem setup globally for session
PHPBB3-11850
2013-09-30 18:44:02 -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
Nathan Guse
179f41475b Merge pull request #1735 from nickvergessen/ticket/11852
Ticket/11852 filesystem class must not depend on a web request
2013-09-30 16:21:02 -07:00
Andreas Fischer
787784e083 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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.
2013-09-28 15:02:59 +02:00
Andreas Fischer
02f9d179e5 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [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.
2013-09-28 15:02:44 +02: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