makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
19718 commits 18 branches 192 tags 206 MiB
Commit graph

17239 commits

Author SHA1 Message Date
Marc Alexander
f1c913f176 [ticket/12183] Move user_newpasswd, user_actkey below user_pass_convert 
PHPBB3-12183
 2014-02-17 16:28:36 +01:00
Marc Alexander
c864d06ac6 [ticket/12183] Add migration file for updating user_newpasswd column 
PHPBB3-12183
 2014-02-10 22:10:31 +01:00
Marc Alexander
5ce0bb7630 [ticket/12183] Update user_newpasswd column to length of 255 in schema files 
PHPBB3-12183
 2014-02-10 22:06:42 +01:00
Joas Schilling
b088bf864b Merge remote-tracking branch 'Marc/ticket/12170' into develop 
* Marc/ticket/12170:
  [ticket/12170] Test for 12170
  [ticket/12170] Assign schema keys in migration helper with data_depth 1
 2014-02-10 14:23:09 +01:00
Marc Alexander
e8f8dcf0ea [ticket/12170] Assign schema keys in migration helper with data_depth 1 
The migration helper currently drops any keys with schema changes that have
the data_depth 1. This change will correctly assign the keys to the steps
array without dropping the keys that might contain important info like the
actual table that should be created.

PHPBB3-12170
 2014-02-07 21:13:50 +01:00
Joas Schilling
4663ea7c82 [ticket/12115] Remove space from line ending 
PHPBB3-12115
 2014-02-06 14:18:30 +01:00
Joas Schilling
26640bad3d [ticket/12115] Add migration file to remove old user columns 
PHPBB3-12115
 2014-02-06 11:32:13 +01:00
Joas Schilling
190301021b [ticket/12115] Use base class to reduce duplicate code 
PHPBB3-12115
 2014-02-06 11:32:12 +01:00
Joas Schilling
c2cf294be5 [ticket/12115] Add a new migration for profilefield_interests 
With this we avoid missing to copy one, when the admin already created
a phpbb_* profile field.

PHPBB3-12115
 2014-02-06 11:32:12 +01:00
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields 
PHPBB3-12115
 2014-02-06 11:32:11 +01:00
Joas Schilling
0ad726768c [ticket/12115] Remove old language strings 
PHPBB3-12115
 2014-02-06 11:32:09 +01:00
Joas Schilling
8dab016a7b [ticket/12115] Add methods to interface 
PHPBB3-12115
 2014-02-06 11:32:09 +01:00
Joas Schilling
f97d268a79 [ticket/12115] Translate profile field name before displaying it in errors 
PHPBB3-12115
 2014-02-06 11:32:08 +01:00
Joas Schilling
38608bfa62 [ticket/12115] Remove occupation field from html files 
PHPBB3-12115
 2014-02-06 11:32:07 +01:00
Joas Schilling
7d04961919 [ticket/12115] Add language entries for the profile fields 
PHPBB3-12115
 2014-02-06 11:32:06 +01:00
Joas Schilling
3c640e57c5 [ticket/12115] Convert user occupation to a profile field 
PHPBB3-12115
 2014-02-06 11:32:06 +01:00
Joas Schilling
344baf9180 Merge branch 'prep-release-3.1.0-a3' into develop 2014-02-05 22:25:45 +01:00
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
Nils Adermann
32bc5d72e4 Merge pull request #1995 from EXreaction/ticket/11880 
Schema changes can take too long and cause a timeout
 2014-02-05 17:52:17 +01:00
Nathan Guse
be28445b66 [ticket/11880] migration helper file 
PHPBB3-11880
 2014-02-05 10:00:01 -06: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
Nathan Guse
38eb6b0e13 [ticket/11880] Move get_schema_steps function to a migrator helper class 
PHPBB3-11880
 2014-02-05 09:57:36 -06: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
2c878ead31 [ticket/11880] Break up schema changes in the migrator 
PHPBB3-11880
 2014-02-03 15:07:57 -06: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