makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 05:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
19585 commits 18 branches 192 tags 207 MiB
Commit graph

17155 commits

Author SHA1 Message Date
Nils Adermann
f8d6a07392 Merge pull request #1716 from marc1706/feature/passwords 
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
 2014-02-02 06:26:35 -08:00
Marc Alexander
b094c79996 [feature/passwords] Move combined hashing methods to manager 
This will get rid of the circular dependency between the passwords manager
and the passwords helper. The combined_hash_password() method was also
slightly changed to allow both the definitions of service names or prefixes
for the hash types.

PHPBB3-11610
 2014-02-02 14:57:43 +01:00
Joas Schilling
cb04252fbd Merge remote-tracking branch 'vsephpbb/ticket/12100' into develop 2014-02-02 14:48:14 +01:00
Marc Alexander
08a8bd8e6f [feature/passwords] Add support for passwords driver service name in hash() 
This will allow users to specify both the hash type by prefix and by its
service name.

PHPBB3-11610
 2014-02-02 14:13:21 +01:00
Marc Alexander
292961a277 [feature/passwords] Get rid of set_name/get_name methods for passwords drivers 
PHPBB3-11610
 2014-02-02 14:09:09 +01:00
Joas Schilling
5fff6fc169 Merge remote-tracking branch 'prototech/ticket/12135' into develop 2014-02-02 13:39:44 +01:00
Joas Schilling
fecca29328 Merge remote-tracking branch 'prototech/ticket/12124' into develop 2014-02-02 13:15:29 +01:00
Andreas Fischer
c25d4e8e43 Merge pull request #1959 from prototech/ticket/12131 
[ticket/12131] Remove invalid imageset var in viewtopic print view.

* prototech/ticket/12131:
  [ticket/12131] Remove invalid imageset var in viewtopic print view.
 2014-02-02 12:58:11 +01:00
Joas Schilling
85dfe868af Merge remote-tracking branch 'prototech/ticket/12123' into develop 2014-02-02 12:20:40 +01:00
Cesar G
d32b758428 [ticket/12124] IE8 does not support indexOf() for arrays. 
PHPBB3-12124
 2014-01-28 15:47:43 -08:00
Cesar G
53ef25e837 [ticket/12124] The textarea selector is failing in IE8 & 9. 
PHPBB3-12124
 2014-01-28 15:44:34 -08:00
Cesar G
a18dc8d1d6 [ticket/12124] Set attachment data to preserve AJAX delete functionality. 
PHPBB3-12124
 2014-01-28 15:42:53 -08:00
Matt Friedman
d3ce584dc7 [ticket/12100] Re-order arguments in template environment constructor 
PHPBB3-12100
 2014-01-27 20:38:15 -08:00
Matt Friedman
75c54f7f5e [ticket/12100] Ensure enabled extensions are fresh in Twig environment 
PHPBB3-12100
 2014-01-27 18:51:39 -08:00
Andreas Fischer
5553f33f3d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12119] Remove meta tags from view-print templates

Conflicts:
	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
	phpBB/styles/prosilver/template/viewtopic_print.html
 2014-01-27 20:48:28 +01:00
Marcus Vinicius
a32db45166 [ticket/12119] Remove meta tags from view-print templates 
PHPBB3-12119
 2014-01-27 16:42:39 -03:00
Cesar G
cd14eec8e5 [ticket/12135] Reduce verbosity in bbfontstyle() by using textarea var. 
PHPBB3-12135
 2014-01-26 18:25:48 -08:00
Cesar G
f6d338fd8b [ticket/12137] Fix spacing in smiley block. 
PHPBB3-12137
 2014-01-26 18:11:16 -08:00
Andreas Fischer
9b500538e3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
 2014-01-26 20:51:55 +01:00
Cesar G
525f1be319 [ticket/12131] Remove invalid imageset var in viewtopic print view. 
PHPBB3-12131
 2014-01-26 01:03:49 -08:00
Marcus Vinicius
cb7a0d6f2a [ticket/12118] Add noindex meta tag to subsilver2 view-print templates 
PHPBB3-12118
 2014-01-26 03:19:43 -03:00
Cesar G
ff9e16950b [ticket/12123] Add soft delete to phpbb/permissions.php. 
PHPBB3-12123
 2014-01-25 16:22:01 -08:00
Cesar G
10149933bd [ticket/12124] Remove double bang. 
PHPBB3-12124
 2014-01-25 15:26:37 -08:00
Cesar G
a8a349670a [ticket/12124] Revert to basic uploader if the html5 runtime is not supported. 
PHPBB3-12124
 2014-01-24 04:37:29 -08:00
Cesar G
8620f1e619 [ticket/12125] Specify nth-child selectors separately - IE8 does not like them 
PHPBB3-12125
 2014-01-24 04:30:14 -08:00
Cesar G
4c102322c1 Merge branch 'develop-olympus' into develop 2014-01-23 14:13:34 -08:00
Joas Schilling
42e4566fe4 [ticket/12120] Restore alphabetic order 
PHPBB3-12120
 2014-01-23 22:59:42 +01:00
Joas Schilling
a672d983c9 [ticket/12120] Add prototech to authors 
PHPBB3-12120
 2014-01-23 22:59:33 +01:00
Nathan Guse
5b452ffe27 [ticket/11950] Fix prior commit 
PHPBB3-11950
 2014-01-22 10:43:29 -06:00
Suhaib Khan
88bd88b612 Adding 'forgot password' link to index page 
PHPBB3-11950

Signed-off-by: Suhaib Khan <suhebjerk@gmail.com>
 2014-01-22 12:42:33 +05:30
Joas Schilling
45ab32bf61 Merge remote-tracking branch 'EXreaction/ticket/11902' into develop 
* EXreaction/ticket/11902:
  [ticket/11902] Use phpbb\php\ini class
  [ticket/11902] Prevent errors if set_time_limit disabled
  [ticket/11902] Set max execution time to 0 in db update
 2014-01-18 21:42:30 +01:00
Joas Schilling
dea91108fe Merge remote-tracking branch 'EXreaction/ticket/12006' into develop 
* EXreaction/ticket/12006:
  [ticket/12006] global $phpbb_dispatcher;
  [ticket/12006] Missing a space
  [ticket/12006] Add module_auth event
  [ticket/12006] Test for ext module auth
  [ticket/12006] Add extension enabled check token to module auth
  [ticket/12006] Cleanup the module auth function token replacement code
 2014-01-18 21:20:01 +01:00
Nathan Guse
ab41396707 Merge pull request #1866 from prototech/ticket/11915 
[ticket/11915] Improve Plupload integration
 2014-01-17 19:28:31 -08:00
Cesar G
ebc2d1dd1b [ticket/11915] Pass the data to the template instead of scraping HTML for it. 
PHPBB3-11915
 2014-01-17 19:25:12 -08:00
Cesar G
9a21dec1b6 [ticket/11915] Replace inline onclick event for inserting attachment bbcodes. 
PHPBB3-11915
 2014-01-17 19:25:11 -08:00
Cesar G
702efc8496 [ticket/11915] Remove files that are no longer used. 
PHPBB3-11915
 2014-01-17 19:25:11 -08:00
Cesar G
c1cca8aff4 [ticket/11915] Hide attachments table when removing last failed file. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
628323a80a [ticket/11915] Remove unused language string. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
020b7a31bf [ticket/11915] Make the user aware of the drag-and-drop zone. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
8b351104ed [ticket/11915] Check if trigger_error() was called after sending chunk. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
a70f08513d [ticket/11915] Fix spacing and ensure that strings are translated. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
f858ec1f56 [ticket/11915] Fix various problems with responsive design. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
9c1cacae42 [ticket/11915] Provide the URL to the attachment when it's uploaded. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
708622a0bb [ticket/11915] Do not display the "Place inline" button when JS is disabled. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
6837b724a3 [ticket/11915] Do not allow more files to be added if queue is already running 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
1272c9272e [ticket/11915] Remove unnecessary JS file and include others using INCLUDEJS. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
508b43c197 [ticket/11915] Update the inline attachment bbcode indices on every upload. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
688ca7fade [ticket/11915] Add the new uploader. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
2719a18f7f [ticket/11915] Make it possible to display trigger_error() messages to user. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
0ea110292b [ticket/11915] Provide some additional info about limits to the uploader. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00