75fa467b7b
Merge remote-tracking branch 'bantu/ticket/12180' into develop
...
* bantu/ticket/12180:
[ticket/12180] Add "Each file MUST end with exactly one newline character" rule
2014-02-12 22:12:30 +01:00
30fbaab8de
[ticket/12184] Fix undefined variable tpl_fields in profile field manager
...
PHPBB3-12184
2014-02-11 19:17:24 +01:00
5550f0fa87
[ticket/12169] Split mode==headline into it's own function
...
PHPBB3-12169
2014-02-10 19:04:10 +01:00
995019a992
[ticket/12169] Add new option to display profile fields on memberlist
...
PHPBB3-12169
2014-02-10 16:28:21 +01:00
3c46aeb005
[ticket/12169] Allow displaying profile fields on memberlist
...
We can not sort by profile field values atm. And also I'm not sure
whether this is possible at all.
PHPBB3-12169
2014-02-10 15:58:55 +01:00
1e86f71133
[ticket/12180] Add "Each file MUST end with exactly one newline character" rule
...
PHPBB3-12180
2014-02-10 15:01:50 +01:00
6bee91c429
[ticket/12169] Convert user_from to profile field location
...
Missing changes on memberlist view due to missing functionality
PHPBB3-12169
2014-02-10 14:38:43 +01:00
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
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
4663ea7c82
[ticket/12115] Remove space from line ending
...
PHPBB3-12115
2014-02-06 14:18:30 +01:00
26640bad3d
[ticket/12115] Add migration file to remove old user columns
...
PHPBB3-12115
2014-02-06 11:32:13 +01:00
190301021b
[ticket/12115] Use base class to reduce duplicate code
...
PHPBB3-12115
2014-02-06 11:32:12 +01:00
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
bbada27ee9
[ticket/12115] Also port user interests to profile fields
...
PHPBB3-12115
2014-02-06 11:32:11 +01:00
8dab016a7b
[ticket/12115] Add methods to interface
...
PHPBB3-12115
2014-02-06 11:32:09 +01:00
f97d268a79
[ticket/12115] Translate profile field name before displaying it in errors
...
PHPBB3-12115
2014-02-06 11:32:08 +01:00
3c640e57c5
[ticket/12115] Convert user occupation to a profile field
...
PHPBB3-12115
2014-02-06 11:32:06 +01:00
344baf9180
Merge branch 'prep-release-3.1.0-a3' into develop
2014-02-05 22:25:45 +01:00
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
be28445b66
[ticket/11880] migration helper file
...
PHPBB3-11880
2014-02-05 10:00:01 -06:00
38eb6b0e13
[ticket/11880] Move get_schema_steps function to a migrator helper class
...
PHPBB3-11880
2014-02-05 09:57:36 -06:00
7f70a73634
[prep-release-3.1.0-a3] Add migration for 3.1.0-a3
2014-02-05 16:55:21 +01:00
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
2c878ead31
[ticket/11880] Break up schema changes in the migrator
...
PHPBB3-11880
2014-02-03 15:07:57 -06:00
2c9e6f196b
[ticket/12156] Add missing passwords manager to oauth
...
PHPBB3-12156
2014-02-03 18:08:13 +01:00
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
cbad102f88
[ticket/11201] Split template file into multiple files
...
PHPBB3-11201
2014-02-02 16:20:02 +01:00
cacd43bfbd
[ticket/11201] Remove dependency from types on the manager
...
PHPBB3-11201
2014-02-02 16:13:04 +01:00
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
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
cb04252fbd
Merge remote-tracking branch 'vsephpbb/ticket/12100' into develop
2014-02-02 14:48:14 +01:00
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
292961a277
[feature/passwords] Get rid of set_name/get_name methods for passwords drivers
...
PHPBB3-11610
2014-02-02 14:09:09 +01:00
7bcbdfc1b1
[ticket/11201] Rename profilefields class to manager
...
PHPBB3-11201
2014-02-02 12:53:29 +01:00
514a59ffa7
[ticket/11201] Fix parameter description
...
PHPBB3-11201
2014-02-02 12:39:21 +01:00
d3ce584dc7
[ticket/12100] Re-order arguments in template environment constructor
...
PHPBB3-12100
2014-01-27 20:38:15 -08:00
75c54f7f5e
[ticket/12100] Ensure enabled extensions are fresh in Twig environment
...
PHPBB3-12100
2014-01-27 18:51:39 -08:00
ff9e16950b
[ticket/12123] Add soft delete to phpbb/permissions.php.
...
PHPBB3-12123
2014-01-25 16:22:01 -08:00
430a0c1c21
[ticket/11201] Also translate profile fields in UCP and ACP
...
PHPBB3-11201
2014-01-19 17:58:12 +01:00
4213b93cde
[ticket/11201] Add parameters and variables to profile field class
...
PHPBB3-11201
2014-01-19 15:00:26 +01:00
ec8fd57f28
[ticket/11201] Add commas on last array entry
...
PHPBB3-11201
2014-01-19 14:55:47 +01:00
0ce98d7eac
[ticket/11201] Allow translation of profile field name and explanation
...
PHPBB3-11201
2014-01-19 14:52:51 +01:00
f40f774b2e
[ticket/11201] Fix some variable names
...
PHPBB3-11201
2014-01-18 13:28:17 +01:00
197e026699
[ticket/11201] Add a method to return the translated full name of the type
...
PHPBB3-11201
2014-01-18 13:16:18 +01:00
df85364baa
[ticket/11201] Remove db depending code from field class
...
sql_build_array() should already take care of that
PHPBB3-11201
2014-01-18 13:01:29 +01:00
b1bed49eae
[ticket/11201] Add variables to classes and add constructor doc blocks
...
PHPBB3-11201
2014-01-18 12:53:41 +01:00
7fac238398
[ticket/11201] Update copyright in class file
...
PHPBB3-11201
2014-01-18 12:47:19 +01:00
7a8818fbc6
[ticket/11201] Add visibility and remove unused variable
...
PHPBB3-11201
2014-01-18 12:46:48 +01:00
1c884d07eb
[ticket/11201] Add some commas at the last array entry
...
PHPBB3-11201
2014-01-18 12:44:24 +01:00
876e5e5fbb
[ticket/11201] Cast some variables to integer
...
PHPBB3-11201
2014-01-18 12:40:12 +01:00
