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

9677 commits

Author SHA1 Message Date
Joas Schilling
dd86615c63 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12895] Rename user style setting to resolve conflict with style param
 2014-08-02 13:56:30 +02:00
Joas Schilling
c991b1d587 Merge pull request #2782 from marc1706/ticket/12895 
[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
 2014-08-02 13:56:16 +02:00
Joas Schilling
e0f5a37d81 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12902] Remove duplicate entry in switch statement
 2014-08-02 13:46:22 +02:00
Joas Schilling
66f859d109 Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeus 
* ticket/JeroenDeDauw/12902:
  [ticket/12902] Remove duplicate entry in switch statement
 2014-08-02 13:46:13 +02:00
jeroendedauw
626234aece [ticket/12902] Remove duplicate entry in switch statement 
PHPBB3-12902
 2014-08-02 13:44:51 +02:00
Marc Alexander
69682372bb Merge branch 'develop-ascraeus' into develop 2014-08-01 23:31:55 +02:00
Marc Alexander
ce2c31d18a Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeus 2014-08-01 23:31:31 +02:00
Marc Alexander
fab25164a0 Merge branch 'develop-ascraeus' into develop 2014-08-01 23:28:30 +02:00
Marc Alexander
5b2e962934 Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeus 2014-08-01 23:27:55 +02:00
omniError
a7794b765c [ticket/12831] Optn to prevent setting HTTP headers 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
 2014-08-01 15:27:17 -05:00
Joas Schilling
76dbe95afc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11480] Header file
  [ticket/11480] Fix unit tests
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
 2014-08-01 22:24:06 +02:00
Joas Schilling
122898d221 Merge pull request #2350 from Nicofuma/ticket/11480 
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full

* Nicofuma/ticket/11480:
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
 2014-08-01 22:17:17 +02:00
brunoais
47bfe2999d [ticket/12801] Changed name change @since as requested 
Changed name to core.load_drafts_draft_list_result as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12801
 2014-08-01 11:12:29 +01:00
brunoais
25826fa587 [ticket/12880] Changed name change @since as requested 
Changed name to core.display_user_activity_modify_actives as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12880
 2014-08-01 11:09:26 +01:00
Tristan Darricau
702d567c69 Merge branch 'ticket/11480' into ticket/11480-ascraeus 
* ticket/11480:
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
 2014-07-30 21:01:05 +02:00
Tristan Darricau
8bdfda723c [ticket/11480] Move the test into get_folder() 
PHPBB3-11480
 2014-07-30 15:28:02 +02:00
Joas Schilling
c068da7353 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12492] Add support of special chars
 2014-07-30 15:01:27 +02:00
Joas Schilling
6d39a5b015 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12492] Add support of special chars
 2014-07-30 15:01:16 +02:00
Joas Schilling
9a3af2a052 Merge pull request #2425 from Zoddo/ticket/12492 
[ticket/12492] Add support of special chars

* Zoddo/ticket/12492:
  [ticket/12492] Add support of special chars
 2014-07-30 15:00:32 +02:00
Marc Alexander
98eeaacc36 [ticket/12895] Rename user style setting to resolve conflict with style param 
The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.

PHPBB3-12895
 2014-07-29 13:24:44 +02:00
Matt Friedman
ced76b5f4d [ticket/12841] Make config position default to after 
PHPBB3-12841
 2014-07-28 22:27:01 -05:00
Marc Alexander
1095086cde Merge branch 'develop-ascraeus' into develop 2014-07-28 16:45:21 +02:00
Marc Alexander
d8867bb40d Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeus 2014-07-28 16:44:37 +02:00
Joas Schilling
09d00afcc3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12884] Add core event to the function upload_attachment()
 2014-07-27 19:45:12 +02:00
Joas Schilling
e226c99474 Merge pull request #2769 from rxu/ticket/12884 
[ticket/12884] Add core event to the function upload_attachment()

* rxu/ticket/12884:
  [ticket/12884] Add core event to the function upload_attachment()
 2014-07-27 19:45:07 +02:00
Joas Schilling
fdb756e633 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12896] Add php event for admin notices
 2014-07-27 19:42:10 +02:00
Joas Schilling
64f2d778cd Merge branch 'ticket/forumhulp/12896' into develop-ascraeus 
* ticket/forumhulp/12896:
  [ticket/12896] Add php event for admin notices
 2014-07-27 19:41:56 +02:00
Forumhulp.com
5dcf56c98d [ticket/12896] Add php event for admin notices 
PHPBB3-12896
 2014-07-27 19:35:07 +02:00
Joas Schilling
75aef80104 [ticket/12891] Replace template loops with 1 loop to reduce generation time 
PHPBB3-12891
 2014-07-25 13:27:49 +02:00
Matt Friedman
056584680b [ticket/12841] prefix function name with phpbb_ 
PHPBB3-12841
 2014-07-24 07:44:35 -07:00
Dhruv
f93559d013 Merge branch 'develop-ascraeus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12887] Fix Typo: offest -> offset
 2014-07-24 19:03:20 +05:30
brunoais
a0feced63e [ticket/12877] core.mcp_mcp_front_reports_listing_query_before 
Adding core.mcp_mcp_front_reports_listing_query_before

PHPBB3-12877
 2014-07-23 07:20:20 +01:00
Andreas Fischer
b5c847c2ef [ticket/12887] Fix Typo: offest -> offset 
PHPBB3-12887
 2014-07-23 01:27:42 +02:00
rxu
9485f59c61 [ticket/12884] Add core event to the function upload_attachment() 
Add core event to the function upload_attachment()
in functions_posting.php to provide ability for extensions
to perform additional actions on uploaded files, like resizing etc.

PHPBB3-12884
 2014-07-23 00:31:15 +08:00
Joas Schilling
cf88a6453c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
 2014-07-21 22:40:55 +02:00
brunoais
51feab9ed6 [ticket/12800] removed superfulous tab character 
PHPBB3-12800
 2014-07-20 10:05:50 +01:00
brunoais
49a1d845fe [ticket/12800] Missing $phpbb_dispatcher as a global 
PHPBB3-12800
 2014-07-20 09:24:26 +01:00
brunoais
acaa1fe59c [ticket/12801] missing $phpbb_dispatcher as a global 
PHPBB3-12801
 2014-07-20 09:19:23 +01:00
rxu
7b91b66b87 [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation 
To make it consistent with another config.php constants,
PHPBB_DISPLAY_LOAD_TIME is to be put in config.php during installation as well.

PHPBB3-12871
 2014-07-19 14:09:22 +08:00
Oliver Schramm
bef207e9b7 [ticket/10729] Update *_delete_user when user being deleted 
PHPBB3-10729
 2014-07-18 00:19:21 +02:00
Oliver Schramm
1e0775a3da Merge branch 'ticket/10729' into ticket/10729-2 
Conflicts:
	phpBB/includes/functions_user.php
 2014-07-18 00:17:20 +02:00
Oliver Schramm
da6b378e64 [ticket/10729] Update message_edit_user when user being deleted 
PHPBB3-10729
 2014-07-18 00:11:51 +02:00
Oliver Schramm
53f597b6d0 [ticket/10729] Update post_edit_user when user being deleted 
PHPBB3-10729
 2014-07-17 16:28:32 +02:00
PayBas
8d8e0aae68 [ticket/12838] Update RC2 to RC3 
PHPBB3-12838
 2014-07-16 22:05:28 +02:00
Joas Schilling
ab237e16d3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12828] Add ucp_prefs.php common core event
 2014-07-16 16:18:01 +02:00
Joas Schilling
cd5fbd52c2 Merge pull request #2709 from rxu/ticket/12828 
[ticket/12828] Add ucp_prefs.php common core event

* rxu/ticket/12828:
  [ticket/12828] Add ucp_prefs.php common core event
 2014-07-16 16:15:30 +02:00
Andreas Fischer
29cd7f8aec Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12854] Don't show contact page link if board emails are disabled
 2014-07-15 23:19:52 +02:00
Oliver Schramm
021adcc14f [ticket/12854] Don't show contact page link if board emails are disabled 
PHPBB3-12854
 2014-07-15 22:19:56 +02:00
Tristan Darricau
519e64205a [ticket/12847] Allow the extensions to say if they can be enabled 
PHPBB3-12847
 2014-07-13 18:09:34 +02:00
rxu
fe02caa8e0 [ticket/12828] Add ucp_prefs.php common core event 
Add common core event at the bottom of the includes/ucp/ucp_prefs.php
to allow additional actions (like template variable assignments etc.)
before the page load.

PHPBB3-12828
 2014-07-13 21:34:24 +08:00