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

25744 commits

Author SHA1 Message Date
Marc Alexander
6a73188e6a Merge branch '3.1.x' into 3.2.x 2016-06-13 22:08:17 +02:00
Tobi Schäfer
cff2895599 [ticket/14626] Event core.make_jumpbox_modify_tpl_ary 
PHPBB3-14626
 2016-06-13 21:11:54 +02:00
Tobi Schäfer
516670225d [ticket/14626] Event core.make_jumpbox_modify_tpl_ary 
https://tracker.phpbb.com/browse/PHPBB3-14626

PHPBB3-14626
 2016-06-13 21:10:13 +02:00
Tobi Schäfer
256730c76a [ticket/14626] Event core.make_jumpbox_modify_tpl_ary 
PHPBB3-14626
 2016-06-13 21:10:13 +02:00
Richard McGirr
e9cbb45435 [ticket/14672] Change event name add to events.md 
PHPBB3-14672
 2016-06-13 06:26:55 -04:00
Richard McGirr
2a53831124 [ticket/14672] Add template event after topic title 
PHPBB3-14672
 2016-06-12 10:37:49 -04:00
Jakub Senko
7dc1af25bc [ticket/14654] Change Imagemagick to ImageMagick 
PHPBB3-14654
 2016-06-11 21:32:16 +02:00
Andreas Fischer
83682fe4cf Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14291] Do not update filesize if displaying thumbnail
 2016-06-11 13:45:58 +02:00
Andreas Fischer
cddf80c2e6 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14291] Do not update filesize if displaying thumbnail
 2016-06-11 13:45:48 +02:00
Andreas Fischer
d316927225 Merge pull request #4345 from marc1706/ticket/14291 
[ticket/14291] Do not update filesize if displaying thumbnail

* marc1706/ticket/14291:
  [ticket/14291] Do not update filesize if displaying thumbnail
 2016-06-11 13:45:27 +02:00
Crizzo
25ae8876b6 [ticket/14620] Adds section update from 3.0/3.1 to 3.2 
PHPBB3-14620
 2016-06-08 22:06:01 +02:00
Crizzo
797565dfa7 [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2date 
PHPBB3-14620
 2016-06-08 21:45:52 +02:00
Marc Alexander
cf2b96def7 Merge pull request #4346 from lavigor/ticket/14661 
[ticket/14661] Fix a typo in twig.php
 2016-06-08 20:47:14 +02:00
Marc Alexander
34d44d58c3 Merge branch '3.2.x' 2016-06-08 20:32:30 +02:00
Marc Alexander
a9beed3ad0 Merge branch '3.1.x' into 3.2.x 2016-06-08 20:32:28 +02:00
Crizzo
800b7be873 [ticket/14620] Updates section 4.i. Full package to 3.2.0 
PHPBB3-14620
 2016-06-08 20:29:17 +02:00
Marc Alexander
a90d8fa8d4 [ticket/14665] Remove invalid syntax in report_id_auto_increment migration 
PHPBB3-14665
 2016-06-08 08:38:55 +02:00
lavigor
b2141fd1a8 [ticket/14664] Fix PHPDoc comment in cron manager 
PHPBB3-14664
 2016-06-07 23:40:31 +03:00
Jakub Senko
4cf666f0bc [ticket/14631] Load truncate_string() if needed 
PHPBB3-14631
 2016-06-07 19:39:15 +02:00
lavigor
ff8b5058e0 [ticket/14661] Fix a typo in twig.php 
PHPBB3-14661
 2016-06-05 13:40:40 +03:00
Marc Alexander
1bf58c654a Merge branch '3.2.x' 2016-06-04 16:16:22 +02:00
Marc Alexander
82649b37e4 Merge pull request #4302 from cyberalien/ticket/14612 
[ticket/14612] Fix incorrect class for fieldset in mcp_approve.html
 2016-06-04 16:15:48 +02:00
Richard McGirr
08acf2acba [ticket/14630] Rename core event 
PHPBB3-14630
 2016-06-02 05:18:14 -04:00
Marc Alexander
401e78c5b0 Merge branch '3.2.x' 2016-05-31 21:43:21 +02:00
Marc Alexander
4fdbd6217d Merge branch '3.1.x' into 3.2.x 2016-05-31 21:43:19 +02:00
Marc Alexander
72248cab45 [ticket/14291] Do not update filesize if displaying thumbnail 
PHPBB3-14291
 2016-05-30 20:05:45 +02:00
Jakub Senko
33d1d19f97 [ticket/14586] Add OAuth1 support 
PHPBB3-14586
 2016-05-30 13:02:49 +02:00
Jakub Senko
73073ac8c3 [ticket/14643] Offer latest backup to restore by default 
PHPBB3-14643
 2016-05-29 17:28:33 +02:00
Jakub Senko
9961aefa38 [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions 
PHPBB3-14652
 2016-05-29 11:42:32 +02:00
Jakub Senko
6350798e97 [ticket/14506] Add mcp_move_before template event 
PHPBB3-14506
 2016-05-29 11:41:54 +02:00
Marc Alexander
b465df321c Merge branch '3.2.x' 2016-05-28 09:59:55 +02:00
Marc Alexander
50227dbc75 Merge branch '3.1.x' into 3.2.x 2016-05-28 09:59:50 +02:00
Marc Alexander
0a512b2695 Merge pull request #4173 from lavigor/ticket/14466 
[ticket/14466] Add an event to cron.php
 2016-05-28 09:59:47 +02:00
Marc Alexander
57733f84e5 Merge branch '3.2.x' 2016-05-27 22:14:00 +02:00
Marc Alexander
80db259ab9 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/phpbb/notification/manager.php
 2016-05-27 22:13:35 +02:00
Marc Alexander
51d80174b1 Merge branch '3.2.x' 2016-05-27 21:10:51 +02:00
Marc Alexander
9bea18b5db Merge pull request #4333 from markshawtoronto/ticket/14648 
[ticket/14648] Fix bug where default notifications stop working if another setting is set.
 2016-05-27 20:29:26 +02:00
Jakub Senko
10d96d4f33 [ticket/14429] Add core.modify_users_online_string_modify 
PHPBB3-14429
 2016-05-27 13:46:23 +02:00
Jakub Senko
c103c42857 [ticket/11446] Make get_notification_type_ids work with string too 
PHPBB3-11446
 2016-05-27 12:59:30 +02:00
Marc Alexander
89371294bf Merge branch '3.2.x' 2016-05-26 15:47:25 +02:00
Richard McGirr
7a8455baa7 [ticket/14649] Add preview variable back to ucp_profile for event 
PHPBB3-14649
 2016-05-26 06:26:14 -04:00
Mark Shaw
548357e14c [ticket/14648] Remove whitespace at the end of a line 
PHPBB3-14648
 2016-05-25 18:28:07 -04:00
Mark Shaw
2576993564 [ticket/14648] Fix bug where default notifications stop working if another setting is set. 
When a new user signs up, they have an email preference set but no board notification preference set. The default board preference should work. Also when a user checks the email box for any notification preference, the default board preference should still work.

PHPBB3-14648
 2016-05-25 14:30:04 -04:00
Crizzo
85fdff8230 [ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.html 
PHPBB3-14620
 2016-05-24 22:44:07 +02:00
Marc Alexander
682aa32af1 Merge branch '3.2.x' 2016-05-24 21:47:56 +02:00
Marc Alexander
3e88ea9c06 Merge pull request #4325 from DavidIQ/ticket/14591 
[ticket/14591] Use the correct delimiter for MSSQL
 2016-05-24 21:47:31 +02:00
Jakub Senko
e6e4c0e62d [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary 
PHPBB3-13978
 2016-05-24 18:07:11 +02:00
Jakub Senko
7e6371ea8e [ticket/11446] Use sql_in_set properly in phpbb_notification_manager 
PHPBB3-11446
 2016-05-23 18:13:17 +02:00
Máté Bartus
8afbb3fb76 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14645] Language pack not reconised when using a symlink
 2016-05-22 21:44:48 +02:00
Jakub Senko
c3fd07a5f0 [ticket/13865] Add id_ary, show_results to core.search_modify_param_before 
PHPBB3-13865
 2016-05-22 14:26:01 +02:00