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

1480 Commits

Author SHA1 Message Date
Andreas Fischer
5f4726e607 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13003] Add missing language keys
 2014-08-22 11:59:26 +02:00
Andreas Fischer
d2ed2c4e1e Merge pull request #2899 from Skouat/ticket/13003 
[ticket/13003] Add missing language keys

* Skouat/ticket/13003:
  [ticket/13003] Add missing language keys
 2014-08-22 11:59:26 +02:00
Marc Alexander
2544d8f9d9 Merge branch 'develop-ascraeus' into develop 2014-08-21 20:50:05 +02:00
Mario Skouat
923a818e37 [ticket/13003] Add missing language keys 
PHPBB3-13003
 2014-08-21 19:37:03 +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
Andreas Fischer
f3076cf444 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
 2014-08-16 09:50:51 +02:00
Tristan Darricau
e31aafb393 [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth 
PHPBB3-12975
 2014-08-12 23:12:57 +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
Nils Adermann
837ed8b6e1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
 2014-08-11 17:38:29 +02:00
Nils Adermann
bad90dafbf Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus 
* github-marc1706/ticket/12822:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes
 2014-08-11 17:37:56 +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
756aa68b34 [ticket/11854] Don't override get service name in nogd 
PHPBB3-11854
 2014-08-11 08:04:14 +02:00
Tristan Darricau
fa2ac1f271 [ticket/11854] Use a set_name method instead of overriding get_service_name 
PHPBB3-11854
 2014-08-11 01:16:58 +02:00
Tristan Darricau
76633544ee [ticket/11854] Change the error message in reCaptcha 
PHPBB3-11854
 2014-08-11 01:16:55 +02:00
Tristan Darricau
fc4b1090cc [ticket/11854] Fix comments 
PHPBB3-11854
 2014-08-11 01:16:50 +02:00
Tristan Darricau
351a6dcad2 [ticket/11854] Base the migration on rc2 
PHPBB3-11854
 2014-08-11 01:16:46 +02:00
Tristan Darricau
2cbcf4bcbf [ticket/11854] Fix the factory in \phpbb\auth\provider\db 
PHPBB3-11854
 2014-08-11 01:16:42 +02:00
Tristan Darricau
036a61a904 [ticket/11854] Remove unused globals 
PHPBB3-11854
 2014-08-11 01:16:38 +02:00
Tristan Darricau
e889b8f931 [ticket/11854] Remove constants and use DI for QA tables 
PHPBB3-11854
 2014-08-11 01:16:35 +02:00
Tristan Darricau
02f3b74e8a [ticket/11854] Fix coding style 
PHPBB3-11854
 2014-08-11 01:16:30 +02:00
Tristan Darricau
b91abf1a0b [ticket/11854] Rename captchas.factory service to captcha.factory 
PHPBB3-11854
 2014-08-11 01:16:22 +02:00
Tristan Darricau
d73d606f11 [ticket/11854] Fix various comments 
PHPBB3-11854
 2014-08-11 01:16:18 +02:00
Tristan Darricau
577f9ac7e4 [ticket/11854] Split phpbb\captcha\gd.php 
PHPBB3-11854
 2014-08-11 01:16:15 +02:00
Tristan Darricau
99b7d18ab2 [ticket/11854] Migrate all old php4 constructor 
PHPBB3-11854
 2014-08-11 01:16:10 +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
Tristan Darricau
160ff7b912 [ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins 
PHPBB3-11854
 2014-08-11 01:15:49 +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
f0852dcf1a [ticket/12932] Remove set_datetime_class method from user class 
PHPBB3-12932
 2014-08-10 14:06:19 +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
bf25e31735 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12794] Properly validate google+ field against valid character set
 2014-08-10 13:39:04 +02:00
Joas Schilling
7cc9f216e7 Merge pull request #2836 from marc1706/ticket/12794 
[ticket/12794] Properly validate google+ field against valid character set

* marc1706/ticket/12794:
  [ticket/12794] Properly validate google+ field against valid character set
 2014-08-10 13:38:48 +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
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2 
PHPBB3-12958
 2014-08-10 12:17:03 +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
Nils Adermann
df9f35cce6 Merge remote-tracking branch 'github-nicofuma/ticket/8064' into develop-ascraeus 
* github-nicofuma/ticket/8064:
  [ticket/8064] Change the collation of topic_first_poster_name
 2014-08-10 11:54:52 +02:00
Marc Alexander
3450b793e7 Merge pull request #2859 from Nicofuma/ticket/12957 
[ticket/12957] Update the constructions of the template engine
 2014-08-10 10:23:28 +02:00
Tristan Darricau
143c1ba8d1 [ticket/12957] Removed unused use 
PHPBB3-12957
 2014-08-10 04:01:47 +02:00
Tristan Darricau
e7e6d45789 [ticket/12957] Update the constructions of the template engine 
PHPBB3-12957
 2014-08-10 03:32:27 +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
Dhruv
ab2878b37b Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12949] Check if mime_content_type is actually callable
 2014-08-10 01:30:58 +02:00