makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 08:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
23481 commits 18 branches 192 tags 206 MiB
Commit graph

23481 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dhruv Goel
e0d377bca7 Merge pull request #2866 from bantu/ticket/12964 
[ticket/12964] Correct use of undefined $row variable.
 2014-08-10 18:36:25 +02:00
Marc Alexander
06be2ff67d Merge branch 'develop-ascraeus' into develop 2014-08-10 18:07:11 +02:00
Marc Alexander
bc9b813ce7 Merge pull request #2864 from rxu/ticket/12931 
[ticket/12931] Fix general error on user registration
 2014-08-10 18:06:55 +02:00
Marc Alexander
db9bf6da33 Merge branch 'develop-ascraeus' into develop 2014-08-10 17:00:41 +02:00
Marc Alexander
2a5eca0391 Merge pull request #2714 from prototech/ticket/12809 
[ticket/12809] Fix select button and dropdown list items in RTL.
 2014-08-10 17:00:19 +02:00
Callum Macrae
7df97601a3 [ticket/12951] Made editorconfig file comments better 
PHPBB3-12951
 2014-08-10 15:55:02 +02:00
Andreas Fischer
f471eeda33 [ticket/12964] Correct use of undefined $row variable. 
PHPBB3-12964
 2014-08-10 15:54:56 +02:00
rxu
838d4dc2c6 [ticket/12931] Fix general error on user registration 
Fix "Illegal use of $_SERVER" general error on user registration
when $config['server_name'] is not set.

PHPBB3-12931
 2014-08-10 21:31:08 +08: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
Dhruv
58a863dbad Merge branch 'develop-ascraeus' into develop 
# By omniError
# Via Dhruv Goel (1) and omniError (1)
* develop-ascraeus:
  [ticket/12831] fix CS
  [ticket/12831] simplified code, upd event block
  [ticket/12831] reimplemented headers as array
  [ticket/12831] Optn to prevent setting HTTP headers
 2014-08-10 15:06:45 +02:00
Dhruv Goel
472fe9fe60 Merge pull request #2730 from omniError/ticket/12831 
[ticket/12831] Allow events in page_header functions to prevent the setting of HTTP headers
 2014-08-10 15:05:28 +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
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
Marc Alexander
f0852dcf1a [ticket/12932] Remove set_datetime_class method from user class 
PHPBB3-12932
 2014-08-10 14:06:19 +02:00
Nils Adermann
f067aa92eb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12950] Force the installer to use language=en
 2014-08-10 14:00:09 +02:00
Nils Adermann
252ddd71d0 Merge remote-tracking branch 'github-dhruvgoel92/ticket/12950' into develop-ascraeus 
* github-dhruvgoel92/ticket/12950:
  [ticket/12950] Force the installer to use language=en
 2014-08-10 13:59:59 +02:00
Dhruv
0244a9b6a4 [ticket/12950] Force the installer to use language=en 
PHPBB3-12950
 2014-08-10 13:49:42 +02:00
Marc Alexander
8d99b4afe1 [ticket/12932] Fix tests and calls to create_datetime 
PHPBB3-12932
 2014-08-10 13:43:04 +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
9572cc0ccc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12943] Add core.phpbb_generate_debug_output core event
 2014-08-10 13:23:15 +02:00
Joas Schilling
707568c496 Merge pull request #2846 from rxu/ticket/12943 
[ticket/12943] Add core.phpbb_generate_debug_output core event

* rxu/ticket/12943:
  [ticket/12943] Add core.phpbb_generate_debug_output core event
 2014-08-10 13:19:56 +02:00
Joas Schilling
3432257c1c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12953] Page title not updated when notifications are marked as read
 2014-08-10 13:16:15 +02:00
Joas Schilling
7ae2ceb5cf Merge pull request #2855 from Geolim4/ticket/12953 
[ticket/12953] Page title not updated when notifications are marked as read

* Geolim4/ticket/12953:
  [ticket/12953] Page title not updated when notifications are marked as read
 2014-08-10 13:13:55 +02:00
Cesar G
4056b84f60 Merge remote-tracking branch 'nickvergessen/ticket/12958' into develop 
* nickvergessen/ticket/12958:
  [ticket/12958] Remove more references of subsilver2
  [ticket/12958] Remove subsilver2 for phpBB 3.2
 2014-08-10 13:08:15 +02:00
Joas Schilling
9e0c234979 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
 2014-08-10 12:22:35 +02:00
Joas Schilling
1f6b9628e7 Merge pull request #2852 from bantu/ticket/12938 
[ticket/12938] Remove the 'Download all attachments' feature.

* bantu/ticket/12938:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
 2014-08-10 12:22:22 +02:00
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2 
PHPBB3-12958
 2014-08-10 12:17:03 +02:00
Joas Schilling
8c40574049 [ticket/12958] Remove subsilver2 for phpBB 3.2 
PHPBB3-12958
 2014-08-10 12:05:28 +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
omniError
71d39ab7d5 [ticket/12831] fix CS 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
 2014-08-09 20:24:03 -05: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
omniError
7e4c3fde01 [ticket/12831] simplified code, upd event block 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
 2014-08-09 18:48:26 -05: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
Dhruv Goel
5c93735557 Merge pull request #2851 from marc1706/ticket/12949 
[ticket/12949] Check if mime_content_type is actually callable
 2014-08-10 01:29:59 +02:00
Andreas Fischer
74c3579693 [ticket/12938] Remove functional tests for 'Download all attachments'. 
PHPBB3-12938
 2014-08-10 01:27:28 +02:00
Tristan Darricau
59b5ab4866 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
 2014-08-10 01:02:38 +02:00
Tristan Darricau
b000d10ef8 Merge pull request #2849 from bantu/ticket/12941 
[ticket/12941] Check for Sami parse errors on Travis CI.

* bantu/ticket/12941:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
 2014-08-10 01:02:27 +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
Tristan Darricau
1c98b46625 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11528] Revert Mink changes
 2014-08-10 00:56:30 +02:00
Tristan Darricau
6a8413f064 Merge pull request #2691 from dhruvgoel92/ticket/11528 
[ticket/11528] Revert all mink changes in functional tests

* dhruvgoel92/ticket/11528:
  [ticket/11528] Revert Mink changes
 2014-08-10 00:28:01 +02:00
Tristan Darricau
761f5a771d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12954] Correctly setup PATH_INFO on Travis CI.
 2014-08-10 00:13:55 +02:00