mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 08:25:42 +02:00
Code Issues Releases Wiki Activity
23,960 Commits 18 Branches 192 Tags
Commit Graph

393 Commits

Author SHA1 Message Date
Nils Adermann
b354afdeb4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
 2014-10-06 02:08:39 +02:00
Joas Schilling
3d9b257597 [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'" 
Caused by the solution of PHPBB3-12990

PHPBB3-13033
 2014-10-02 16:04:33 +02:00
Joas Schilling
dceb334a0c Merge branch 'develop-ascraeus' into develop 2014-10-01 10:34:42 +02:00
Matt Friedman
1ee4894271 [ticket/13121] Fix migration file 
PHPBB3-13121
 2014-10-01 00:29:45 -07:00
Matt Friedman
65539df39a [ticket/13121] Remove cache mode from style management module 
https://tracker.phpbb.com/browse/PHPBB3-13121

PHPBB3-13121
 2014-10-01 00:03:54 -07:00
Nils Adermann
e64c1b463e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
 2014-09-30 14:00:25 +02:00
Joas Schilling
bc24c78e06 [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql 
Unintended change from 95ab4b3e931521ce3c56068478311f0c04f713cc

PHPBB3-13117
 2014-09-29 20:48:47 +02:00
Joas Schilling
cb92b4668e Merge branch 'develop-ascraeus' into develop 2014-09-24 12:26:21 +02:00
Joas Schilling
f3fef8934e Merge pull request #2954 from rxu/ticket/13055 
[ticket/13055] Fix string profile fields validation to support unicode
 2014-09-24 12:25:57 +02:00
Joas Schilling
e23d2e7b20 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Prepare Changelog
  [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-09-20 09:55:56 +02:00
Joas Schilling
221f4a4a8c [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 2014-09-19 19:04:21 +02:00
rxu
dc65058c20 [ticket/13055] Add string profile fields validation options to support unicode 
PHPBB3-13055
 2014-09-18 08:19:08 +08:00
Joas Schilling
45a4cf7ac5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
 2014-09-17 21:25:20 +02:00
Joas Schilling
7729ae4ad0 [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..." 
This reverts commit 46a9fe93d797bf7d56fd9b1e204f3c0459270122.

PHPBB3-13064
 2014-09-17 21:24:33 +02:00
Joas Schilling
bf6ecccd25 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13064] Validate the migrations provided to migrator::set_migrations()
 2014-09-17 19:59:47 +02:00
Tristan Darricau
46a9fe93d7 [ticket/13064] Validate the migrations provided to migrator::set_migrations() 
PHPBB3-13064
 2014-09-14 00:56:41 +02:00
Marc Alexander
80a1314ebb Merge branch 'develop-ascraeus' into develop 2014-08-28 21:18:41 +02:00
n-aleha
bcc1b7aec9 [ticket/11909] Remove unused function load_migrations 
Remove unused function load_migrations from \phpbb\db\migrator

PHPBB3-11909
 2014-08-26 02:56:47 +03:00
Marc Alexander
c2f19239a1 Merge branch 'develop-ascraeus' into develop 2014-08-24 00:20:51 +02:00
Tristan Darricau
1a41632af8 [ticket/12990] Disable all the notifications types which are not in the core 
PHPBB3-12990
 2014-08-23 23:39:46 +02:00
Marc Alexander
2544d8f9d9 Merge branch 'develop-ascraeus' into develop 2014-08-21 20:50:05 +02:00
Tristan Darricau
afb9d0a3d7 [ticket/12990] Use {$var} instead of ${var} 
PHPBB3-12990
 2014-08-21 16:04:46 +02:00
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
Tristan Darricau
71f78fb8c6 [ticket/12990] Use protected instead of private 
PHPBB3-12990
 2014-08-17 23:03:44 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types 
PHPBB3-12990
 2014-08-16 21:46:03 +02:00
Joas Schilling
483b40dfa3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3

Conflicts:
	phpBB/styles/subsilver2/style.cfg
 2014-08-12 10:17:47 +02:00
Joas Schilling
7367ab6e15 [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 2014-08-11 19:32:54 +02:00
Marc Alexander
f09db1a7b4 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/config/services.yml
 2014-08-11 12:23:21 +02:00
Tristan Darricau
351a6dcad2 [ticket/11854] Base the migration on rc2 
PHPBB3-11854
 2014-08-11 01:16:46 +02:00
Tristan Darricau
6e4991093a [ticket/11854] Fix migration 
PHPBB3-11854
 2014-08-11 01:16:02 +02:00
Tristan Darricau
a1d5ad8a37 [ticket/11854] Add missing dot in the migration file 
PHPBB3-11854
 2014-08-11 01:15:58 +02:00
Tristan Darricau
dd88022a70 [ticket/11854] Add a migration to update the captcha_plugin setting 
PHPBB3-11854
 2014-08-11 01:15:54 +02:00
Joas Schilling
d998efcf54 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
 2014-08-10 15:24:43 +02:00
Joas Schilling
54b0ebc410 Merge pull request #2862 from marc1706/ticket/12932 
[ticket/12932] Add method for allowing override of \phpbb\datetime class

* marc1706/ticket/12932:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding
 2014-08-10 15:23:15 +02:00
Andreas Fischer
0be6d17ae1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12956] Ensure the contact columns have been added before using them
 2014-08-10 14:16:01 +02:00
Andreas Fischer
547c8a6d8b Merge pull request #2858 from nickvergessen/ticket/12956 
[ticket/12956] Ensure the contact columns have been added before using t...

* nickvergessen/ticket/12956:
  [ticket/12956] Ensure the contact columns have been added before using them
 2014-08-10 14:16:01 +02:00
Marc Alexander
a57a96cbdd [ticket/12932] Add method for getting the datetime class and allow overriding 
An extension can now override the datetime class by overwriting the
datetime.class parameter in their own yml file.

PHPBB3-12932
 2014-08-10 13:41:08 +02:00
Joas Schilling
489aba31c7 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
 2014-08-10 13:35:37 +02:00
Joas Schilling
b3ca955fb5 Merge pull request #2837 from Geolim4/ticket/12671 
Ticket/12671 Possibility to use NOT LIKE expression

* Geolim4/ticket/12671:
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
 2014-08-10 13:35:27 +02:00
Nils Adermann
43bef1b5e4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/8064] Change the collation of topic_first_poster_name
 2014-08-10 11:55:08 +02:00
Joas Schilling
2c7e81bd33 [ticket/12956] Ensure the contact columns have been added before using them 
PHPBB3-12956
 2014-08-10 02:23:28 +02:00
Tristan Darricau
990e64105f [ticket/8064] Change the collation of topic_first_poster_name 
PHPBB3-8064
 2014-08-10 00:58:22 +02:00
Geolim4
db0815f680 [ticket/12671] Possibility to use NOT LIKE expression 
PHPBB3-12671
 2014-08-09 19:11:21 +02:00
Nils Adermann
1f7ada8e3d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
 2014-08-09 15:41:01 +02:00
Nils Adermann
56ca276dcf Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into develop-ascraeus 
* github-nickvergessen/ticket/12710:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
 2014-08-09 15:40:46 +02:00
Joas Schilling
f87831aee5 [ticket/12710] Fix missing closing bracket 
PHPBB3-12710
 2014-08-09 15:04:49 +02:00
Geolim4
635cde218c [ticket/12671] Possibility to use NOT LIKE expression 
PHPBB3-12671
 2014-08-09 15:04:39 +02:00
Joas Schilling
0806c74084 [ticket/12710] Prefix column so it does not start with a number 
PHPBB3-12710
 2014-08-09 14:42:31 +02:00
Joas Schilling
ef9360d285 [ticket/12710] Pass the original column data to the create function 
PHPBB3-12710
 2014-08-09 14:42:28 +02:00
Joas Schilling
37a1874782 [ticket/12710] Fix foreach generation 
PHPBB3-12710
 2014-08-09 14:41:25 +02:00