1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 15:17:16 +01:00

879 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
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
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
Joas Schilling
39ff387d36 [ticket/11201] Update schema files and unit test
PHPBB3-11201
2014-01-17 21:53:08 +01: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
3bb93ab2d3 [develop] Update version to 3.1.0-a2-dev 2013-10-15 22:46:02 +02:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
Marc Alexander
0f64843ac8 [feature/passwords] Use VCHAR_UNI instead of VCHAR_CI for user_passwords
PHPBB3-11610
2013-10-13 12:06:02 +02:00
Marc Alexander
841dd6b19f [feature/passwords] Modify forum_password column type for new hash types
PHPBB3-11610
2013-10-13 12:05:55 +02:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
2013-10-11 17:40:16 +02:00
Dhruv
659236a32f Merge remote-tracking branch 'nickvergessen/ticket/11906' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11906:
  [ticket/11906] Fix namespace issues in prune_notifications
  [ticket/11906] Add notification purge cron to cron tasks
  [ticket/11906] Add missing configs from notifications cron to schema_data.sql
2013-10-11 17:57:16 +05:30
Joas Schilling
698a2236a5 [ticket/11867] Schema files are not created by create_schema_files.php
PHPBB3-11867
2013-10-11 11:59:28 +02:00
Joas Schilling
287400cdf8 [ticket/11906] Add missing configs from notifications cron to schema_data.sql
PHPBB3-11906
2013-10-11 11:47:42 +02:00
Andreas Fischer
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
2013-10-10 23:26:03 +02:00
Dhruv
ed19176aaf [ticket/11888] Use \phpbb\search\fulltext_native as search backend config
If \ is missing, the default search backend shown in ACP is wrong.

PHPBB3-11888
2013-10-05 22:55:19 +05:30
Marc Alexander
663b4b2eb7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/develop/create_schema_files.php
2013-09-27 10:47:10 +02:00
Nils Adermann
1f9f96926f [ticket/11700] No need to escape \ in SQL string
PHPBB3-11700
2013-09-19 20:31:00 +02:00
Nils Adermann
f205c4fad4 [ticket/11700] Change search backend db entry to namespaces
PHPBB3-11700
2013-09-19 17:03:05 +02:00
Marc Alexander
dae4327cfc [feature/passwords] Add schema changes for new hash types
PHPBB3-11610
2013-09-14 13:53:14 +02:00
Joas Schilling
958f3e9503 Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
2013-09-06 20:35:54 -04:00
David King
010da72f64 [ticket/11824] Add option for mod_rewrite
PHPBB3-11824
2013-09-03 16:57:27 -07:00