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

23612 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tristan Darricau
469790146c Merge pull request #2854 from bantu/ticket/12954 
[ticket/12954] Correctly setup PATH_INFO on Travis CI.

* bantu/ticket/12954:
  [ticket/12954] Correctly setup PATH_INFO on Travis CI.
 2014-08-10 00:12:58 +02:00
omniError
8989f6f878 [ticket/12831] reimplemented headers as array 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
 2014-08-09 14:40:18 -05:00
Dhruv
e12969d2c7 Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12742] Add sorting back to bookmark notification list of users
  [ticket/12742] Add sort options for notification types requiring sorting
  [ticket/12742] Remove unneeded sort of users
  [ticket/12742] Replace authenticated with authorised
  [ticket/12742] Add check for empty $users and add method to fitting methods
  [ticket/12742] Add method for getting authenticated recipients
 2014-08-09 20:03:17 +02:00
Dhruv Goel
d066240e27 Merge pull request #2840 from marc1706/ticket/12742 
[ticket/12742] Put duplicated code into one method in notifications base
 2014-08-09 20:01:59 +02:00
brunoais
602b932a23 [ticket/12928] Update to RC4 
PHPBB3-12928
 2014-08-09 18:18:19 +01:00
Geolim4
db0815f680 [ticket/12671] Possibility to use NOT LIKE expression 
PHPBB3-12671
 2014-08-09 19:11:21 +02:00
Geolim4
39defd0b6b [ticket/12953] Page title not updated when notifications are marked as read 
PHPBB3-12953
 2014-08-09 18:56:36 +02:00
Marc Alexander
026a1fc3dd Merge branch 'develop-ascraeus' into develop 2014-08-09 18:47:59 +02:00
Marc Alexander
59398020b6 Merge pull request #2848 from bantu/ticket/12948 
[ticket/12948] Remove no longer needed opcache workaround. Travis has 5.5.15
 2014-08-09 18:47:41 +02:00
Andreas Fischer
23ca9cd81d [ticket/12954] Correctly setup PATH_INFO on Travis CI. 
PHPBB3-12954
 2014-08-09 18:33:48 +02:00
Andreas Fischer
076d4ddd7f [ticket/12941] Fix remaining Sami complaints. 
PHPBB3-12941
 2014-08-09 18:08:49 +02:00
Tristan Darricau
04c084ead8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
 2014-08-09 17:50:54 +02:00
Marc Alexander
496b804a0f [ticket/12742] Add sorting back to bookmark notification list of users 
PHPBB3-12742
 2014-08-09 17:48:59 +02:00
Marc Alexander
57d94b7bb4 [ticket/12742] Add sort options for notification types requiring sorting 
PHPBB3-12742
 2014-08-09 17:43:28 +02:00
Tristan Darricau
86f94f922c Merge pull request #2624 from dhruvgoel92/ticket/12718 
[ticket/12718] Use remove_topic_from_statistic() for delete_topic

* dhruvgoel92/ticket/12718:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
 2014-08-09 17:33:44 +02:00
Callum Macrae
07f8edcc26 [ticket/12951] Added editorconfig 
PHPBB3-12951
 2014-08-09 17:33:23 +02:00
Marc Alexander
9f87341046 [ticket/12949] Check if mime_content_type is actually callable 
PHPBB3-12949
 2014-08-09 17:21:19 +02:00
Dhruv
dd8adb5d6e [ticket/11528] Revert Mink changes 
PHPBB3-11528
 2014-08-09 17:18:33 +02:00
Nils Adermann
f33be87d03 Merge remote-tracking branch 'github-nicofuma/ticket/11649' into develop 
* github-nicofuma/ticket/11649:
  [ticket/11649] Fix coding style
  [ticket/11649] Expose Twig through the container
 2014-08-09 17:17:57 +02:00
rxu
917cd4dec7 [ticket/12943] Add core.phpbb_generate_debug_output core event 
Add core.phpbb_generate_debug_output core event to allow extensions
outputting additional debug info.

PHPBB3-12943
 2014-08-09 23:02:36 +08:00
Andreas Fischer
12caf2f03d [ticket/12938] Remove the 'Download all attachments' feature. 
PHPBB3-12938
 2014-08-09 16:33:59 +02:00
Tristan Darricau
827510a418 [ticket/11649] Fix coding style 
PHPBB3-11649
 2014-08-09 16:14:58 +02:00
Tristan Darricau
192b8e2568 [ticket/11649] Expose Twig through the container 
PHPBB3-11649
 2014-08-09 16:13:22 +02:00
Nils Adermann
73bd77809e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12693] Don't try to check the composer.phar file
 2014-08-09 16:11:44 +02:00
Nils Adermann
02801dee7c Merge remote-tracking branch 'github-nicofuma/ticket/12693' into develop-ascraeus 
* github-nicofuma/ticket/12693:
  [ticket/12693] Don't try to check the composer.phar file
 2014-08-09 16:11:34 +02:00