1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00

2103 Commits

Author SHA1 Message Date
Joas Schilling
f852630ef3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12072] Fix comment about NEW MEMBERS permission
2014-03-14 14:36:29 +01:00
Oliver Schramm
647f976c30 [ticket/12072] Fix comment about NEW MEMBERS permission
PHPBB3-12072
2014-03-14 14:33:56 +01:00
Joas Schilling
0aa23d203e Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
2014-03-14 14:04:30 +01:00
Joas Schilling
e6f492c7ac [ticket/12251] Enable displaying profile fields on memberlist, posts and pms
PHPBB3-12251
2014-03-06 12:02:11 +01:00
Joas Schilling
f0ac25f3c5 [ticket/12251] Deactivate outdated profile fields by default
PHPBB3-12251
2014-03-06 12:00:40 +01:00
Joas Schilling
d9c93337cc [ticket/12251] Sort IM profile fields alphabetically
PHPBB3-12251
2014-03-06 12:00:01 +01:00
Joas Schilling
240eeec71d [ticket/12236] Change order of profile fields for new installs
PHPBB3-12236
2014-03-05 22:40:54 +01:00
Joas Schilling
f2059f52f3 [ticket/12236] Move AOL Instant Messanger field to custom profile field
PHPBB3-12236
2014-03-05 22:13:22 +01:00
Joas Schilling
a1dab58f6d [ticket/12237] Regenerate db schema files
PHPBB3-12237
2014-03-05 21:47:11 +01:00
Joas Schilling
2e5106aae1 [ticket/12237] Convert yahoo messanger to custom profile field
PHPBB3-12237
2014-03-05 21:38:57 +01:00
Joas Schilling
83a7e632b9 [ticket/12235] Convert WLM to custom profile field
PHPBB3-12235
2014-03-04 10:19:08 +01:00
Joas Schilling
a3627a9ff7 [ticket/12187] Remove user_website field
PHPBB3-12187
2014-03-04 08:25:36 +01:00
Joas Schilling
5b1fbfb2f2 [ticket/12187] Remove user_website functionality
PHPBB3-12187
2014-03-03 20:01:19 +01:00
Joas Schilling
e750d71f84 [ticket/12187] Convert website field data to custom profile field
PHPBB3-12187
2014-03-03 12:38:55 +01:00
Joas Schilling
76409388af [ticket/12234] Replace ICQ with custom profile field
PHPBB3-12234
2014-02-28 15:24:35 +01:00
Joas Schilling
f2c208fa7f [ticket/12233] Update schema file
PHPBB3-12233
2014-02-28 15:13:46 +01:00
Joas Schilling
a823205403 [ticket/12233] Allow profile fields to be contact fields
Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages

PHPBB3-12233
2014-02-28 14:38:03 +01:00
Nathan Guse
2df2032b48 Merge pull request #2025 from marc1706/ticket/12183
[ticket/12183] Update user_newpasswd column in users table for passwords manager
2014-02-20 20:54:30 -06:00
Nathan Guse
6c8589775b [ticket/9871] Update version check file to use json format
PHPBB3-9871
2014-02-19 16:13:23 -06:00
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
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
995019a992 [ticket/12169] Add new option to display profile fields on memberlist
PHPBB3-12169
2014-02-10 16:28:21 +01:00
Joas Schilling
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
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields
PHPBB3-12115
2014-02-06 11:32:11 +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
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
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Joas Schilling
76708be47e [ticket/12154] Update schema files with lastest database schema
PHPBB3-12154
2014-02-02 22:05:58 +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
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
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
39ff387d36 [ticket/11201] Update schema files and unit test
PHPBB3-11201
2014-01-17 21:53:08 +01:00
Nathan Guse
405f883437 [ticket/11902] Use phpbb\php\ini class
PHPBB3-11902
2013-12-30 14:24:58 -06:00
Marc Alexander
382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords
Conflicts:
	phpBB/config/services.yml
2013-12-29 13:46:42 +01:00
Joas Schilling
d67341ea00 [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant 2013-11-19 01:37:31 +01:00
Joas Schilling
6ee05d369e [prep-release-3.1.0-a2] Update version to 3.1.0-a2 2013-11-19 01:18:21 +01:00
Cesar G
50896305fa [ticket/12008] The read_notification_last_gc config setting should be dynamic.
PHPBB3-12008
2013-11-14 01:05:53 -08:00
Joas Schilling
95348c8f6d [ticket/11927] Prefix function with phpbb_
PHPBB3-11927
2013-11-07 13:49:55 +01:00
Joas Schilling
7aa4d8fce2 [ticket/11927] Correctly add new files on update
Currently we ignore language and style files when the directory where they
go to do not exist. However in 3.1 we introduce some new sub directories:
* language/en/email/short/
* styles/prosilver/theme/en/
So we need to change our check to look whether the language or style exist,
rather then the parent directory.

PHPBB3-11927
2013-11-07 13:12:58 +01:00
Nils Adermann
158c998216 Merge pull request #1810 from nickvergessen/ticket/11031
Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
2013-11-02 07:20:15 -07:00
Joas Schilling
481d25d885 [ticket/11031] Convert user notification options with default settings
PHPBB3-11031
2013-11-02 13:30:29 +01:00
Joas Schilling
cb8cd50495 [ticket/11031] Correctly add groups to teampage
PHPBB3-11031
2013-11-02 13:25:46 +01:00
Andreas Fischer
02e9f6e284 [task/code-sniffer] Fix argument list spacing.
PHPBB3-11980
2013-10-29 23:38:05 +01:00
Joas Schilling
88f72bd411 [ticket/11031] Convert timezones to new 3.1 timezone
PHPBB3-11031
2013-10-28 21:54:43 +01:00
Joas Schilling
157de2d80d [ticket/11031] Fix missing variable lang_file from code conversion
PHPBB3-11031
2013-10-25 13:10:33 +02:00
Joas Schilling
19380a9b08 [ticket/11031] Correctly set topic and post visibility
PHPBB3-11031
2013-10-25 12:36:06 +02:00
Joas Schilling
e9f4be9052 [ticket/11031] Update extension group names after converting them
PHPBB3-11031
2013-10-25 12:09:09 +02:00
Joas Schilling
881ad935d5 [ticket/11031] Fix conversion of topic_replies to topic_posts
PHPBB3-11031
2013-10-23 21:13:45 +02:00
Joas Schilling
6dd4620609 [ticket/11031] Fix container construction and missing objects
PHPBB3-11031
2013-10-23 21:13:25 +02:00