mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
19,684 Commits 17 Branches 190 Tags
Commit Graph

17218 Commits

Author SHA1 Message Date
Joas Schilling
bf93e20afb [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development 2014-02-05 22:23:33 +01:00
Joas Schilling
11d5f49adb [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 2014-02-05 16:58:05 +01:00
Joas Schilling
36c41d8848 [prep-release-3.1.0-a3] Prepare Changelog 2014-02-05 16:55:21 +01:00
Joas Schilling
7f70a73634 [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 2014-02-05 16:55:21 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Cesar G
32ddbf374f [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php 
PHPBB3-12163
 2014-02-04 07:15:15 -08:00
Marc Alexander
6f92996d98 [ticket/12159] Fix codesniffer complaints due to profilefields and passwords 
The two PRs regarding profilefields and passwords manager that were recently
merged caused a few codesniffer complaints that are fixed by these changes.

PHPBB3-12159
 2014-02-03 22:25:43 +01:00
Nathan Guse
ad2d1fcbcb Merge pull request #1942 from nickvergessen/ticket/11996 
[ticket/11996] Add explanation how to correctly remove and update an extension
 2014-02-03 11:49:24 -08:00
Joas Schilling
c7f6cccdf1 [ticket/11996] Remove note until we really do disable the board 
PHPBB3-11996
 2014-02-03 20:48:01 +01:00
Marc Alexander
2c9e6f196b [ticket/12156] Add missing passwords manager to oauth 
PHPBB3-12156
 2014-02-03 18:08:13 +01:00
Joas Schilling
76708be47e [ticket/12154] Update schema files with lastest database schema 
PHPBB3-12154
 2014-02-02 22:05:58 +01:00
Andreas Fischer
bc98118f92 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12146] Added a missing # to inline css-style of <span>

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html
 2014-02-02 17:20:07 +01:00
Crizz0
88fad5856a [ticket/12146] Added a missing # to inline css-style of <span> 
PHPBB3-12146
 2014-02-02 16:44:52 +01:00
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
Joas Schilling
a59d6e94a5 [ticket/11201] Remove empty calls section from .yml 
PHPBB3-11201
 2014-02-02 16:32:20 +01:00
Joas Schilling
cbad102f88 [ticket/11201] Split template file into multiple files 
PHPBB3-11201
 2014-02-02 16:20:02 +01:00
Joas Schilling
cacd43bfbd [ticket/11201] Remove dependency from types on the manager 
PHPBB3-11201
 2014-02-02 16:13:04 +01:00
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
7bcbdfc1b1 [ticket/11201] Rename profilefields class to manager 
PHPBB3-11201
 2014-02-02 12:53:29 +01:00
Joas Schilling
514a59ffa7 [ticket/11201] Fix parameter description 
PHPBB3-11201
 2014-02-02 12:39:21 +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
12932e8113 [ticket/11201] Use !== null, its faster 
PHPBB3-11201
 2014-01-20 00:15:06 +01:00