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

21435 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
fed96a9e7a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
 2014-05-04 22:40:45 +02:00
Andreas Fischer
0f4bff6101 Merge pull request #2407 from Nicofuma/ticket/12499 
[ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate

* Nicofuma/ticket/12499:
  [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
 2014-05-04 22:38:46 +02:00
Tristan Darricau
66b7eaa1ca [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate 
https://tracker.phpbb.com/browse/PHPBB3-12499

PHPBB3-12499
 2014-05-04 22:20:22 +02:00
PayBas
172fa9e7aa [ticket/12488] Typo fix 
PHPBB3-12488
 2014-05-04 22:19:55 +02:00
PayBas
cefeb7f752 [ticket/12488] Removed <em> and removed anonymous check 
PHPBB3-12488
 2014-05-04 22:07:03 +02:00
PayBas
d6c1ca7d94 Merge pull request #4 from prototech/ticket/12431 
[ticket/12431] Add topic poll icon.
 2014-05-04 21:42:15 +02:00
Cesar G
2e6413a522 [ticket/12431] Add topic poll icon. 
PHPBB3-12431
 2014-05-04 12:34:51 -07:00
Joas Schilling
8f0006ec95 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-b3] Update phpBB Version for b4 development
  [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3
  [prep-release-3.1.0-b3] Prepare Changelog
  [prep-release-3.1.0-b3] Add migration for 3.1.0-b3
  [prep-release-3.1.0-b3] Update version to 3.1.0-b3
 2014-05-04 20:25:29 +02:00
Joas Schilling
6cca7d0443 Merge branch 'prep-release-3.1.0-b3' into develop-ascraeus 
* prep-release-3.1.0-b3:
  [prep-release-3.1.0-b3] Update phpBB Version for b4 development
  [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3
  [prep-release-3.1.0-b3] Prepare Changelog
  [prep-release-3.1.0-b3] Add migration for 3.1.0-b3
  [prep-release-3.1.0-b3] Update version to 3.1.0-b3
 2014-05-04 20:25:11 +02:00
Joas Schilling
a469974c85 [prep-release-3.1.0-b3] Update phpBB Version for b4 development 2014-05-04 20:23:33 +02:00
Crizzo
2c8cb4dd60 [ticket/12498] Adds height-property for IE8 in tweaks.css 
PHPBB3-12498
 2014-05-04 18:58:27 +02:00
Joas Schilling
4f5ab1e5e7 [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3 2014-05-04 17:47:19 +02:00
Joas Schilling
324a30315c [prep-release-3.1.0-b3] Prepare Changelog 2014-05-04 17:36:59 +02:00
Gaëtan Muller
eccdc74478 [ticket/12415] Use private message instead of "pm" accronym 
https://tracker.phpbb.com/browse/PHPBB3-12415

PHPBB3-12415
 2014-05-04 17:35:06 +02:00
Joas Schilling
eca1e582d0 [prep-release-3.1.0-b3] Add migration for 3.1.0-b3 2014-05-04 17:34:02 +02:00
Joas Schilling
80d113f688 [prep-release-3.1.0-b3] Update version to 3.1.0-b3 2014-05-04 17:27:20 +02:00
Joas Schilling
c4986448c9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12494] Undefined index: user_type on viewtopic.php
 2014-05-04 16:44:01 +02:00
Joas Schilling
5b6bce89c9 Merge pull request #2405 from Nicofuma/ticket/12494 
[ticket/12494] Undefined index: user_type on viewtopic.php

* Nicofuma/ticket/12494:
  [ticket/12494] Undefined index: user_type on viewtopic.php
 2014-05-04 16:43:47 +02:00
Joas Schilling
647a424ed1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
 2014-05-04 16:41:24 +02:00
Joas Schilling
541de3281a Merge pull request #2394 from VSEphpbb/ticket/12484 
[ticket/12484] Add template event ucp_agreement_terms_before/after

* VSEphpbb/ticket/12484:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
 2014-05-04 16:41:19 +02:00
Joas Schilling
73e07b497b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12411] Improved change documentation
  [ticket/12411] Missed on bool var
  [ticket/12411] Corrected event vars description
  [ticket/12411] Expand vars of event: core.search_modify_tpl_ary
 2014-05-04 16:35:11 +02:00
Joas Schilling
40e28ac56b Merge pull request #2315 from PayBas/ticket/12411 
[ticket/12411] Expand vars of event: core.search_modify_tpl_ary

* PayBas/ticket/12411:
  [ticket/12411] Improved change documentation
  [ticket/12411] Missed on bool var
  [ticket/12411] Corrected event vars description
  [ticket/12411] Expand vars of event: core.search_modify_tpl_ary
 2014-05-04 16:35:03 +02:00
Joas Schilling
86f9a45040 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12392] Fix avatar double assignment bug
  [ticket/12392] Include $profile_fields in core.memberlist_view_profile
 2014-05-04 16:31:55 +02:00
Joas Schilling
1e66500d2c Merge pull request #2294 from PayBas/ticket/12392 
[ticket/12392] Include $profile_fields in core.memberlist_view_profile

* PayBas/ticket/12392:
  [ticket/12392] Fix avatar double assignment bug
  [ticket/12392] Include $profile_fields in core.memberlist_view_profile
 2014-05-04 16:31:46 +02:00
Joas Schilling
469751d73c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12366] Fixed missing comma
  [ticket/12366] Conform to new event coding guidelines
  [ticket/12366] Expanded event vars
  [ticket/12366] Include ORDER BY into the query builder
  [ticket/12366] Changed to sql_build_query
  [ticket/12366] Add Event core.search_get_posts_data
 2014-05-04 16:28:51 +02:00
Joas Schilling
b5ce72d8d9 Merge pull request #2257 from PayBas/ticket/12366 
[ticket/12366] Add Event core.search_get_posts_data

* PayBas/ticket/12366:
  [ticket/12366] Fixed missing comma
  [ticket/12366] Conform to new event coding guidelines
  [ticket/12366] Expanded event vars
  [ticket/12366] Include ORDER BY into the query builder
  [ticket/12366] Changed to sql_build_query
  [ticket/12366] Add Event core.search_get_posts_data
 2014-05-04 16:28:43 +02:00
Joas Schilling
d068396601 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12323] Template Event search_results_postprofile_before
 2014-05-04 16:23:31 +02:00
Joas Schilling
b1d30dad5c Merge pull request #2203 from PayBas/ticket/12323 
[ticket/12323] Template Event search_results_postprofile_before/after

* PayBas/ticket/12323:
  [ticket/12323] Template Event search_results_postprofile_before

Conflicts:
	phpBB/docs/events.md
 2014-05-04 16:23:14 +02:00
Joas Schilling
7c23a62bc7 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12438] Add Template event memberlist_view_content_prepend
 2014-05-04 16:21:33 +02:00
Tristan Darricau
20022f0dc8 [ticket/12494] Undefined index: user_type on viewtopic.php 
PHPBB3-12494
 2014-05-04 16:15:50 +02:00
Joas Schilling
3674f95e52 Merge pull request #2346 from PayBas/ticket/12438 
[ticket/12438] Add Template event memberlist_view_content_prepend

* PayBas/ticket/12438:
  [ticket/12438] Add Template event memberlist_view_content_prepend
 2014-05-04 16:14:20 +02:00
Joas Schilling
02352c9346 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12410] Add Template events search_results_post_ b/a
 2014-05-04 16:12:05 +02:00
Joas Schilling
eb52028334 Merge pull request #2314 from PayBas/ticket/12410 
[ticket/12410] Add Template events search_results_post_ b/a

* PayBas/ticket/12410:
  [ticket/12410] Add Template events search_results_post_ b/a
 2014-05-04 16:11:56 +02:00
Joas Schilling
01911cffc5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12396] Added missing viewtopic_topic_title_append
  [ticket/12396] Add Template events viewforum_forum_name
 2014-05-04 16:09:27 +02:00
Joas Schilling
f615d46261 Merge pull request #2297 from PayBas/ticket/12396 
[ticket/12396] Add Template events viewforum_forum_name_append/prepend

* PayBas/ticket/12396:
  [ticket/12396] Added missing viewtopic_topic_title_append
  [ticket/12396] Add Template events viewforum_forum_name
 2014-05-04 16:09:18 +02:00
Joas Schilling
8e0503c7b8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12376] Changed to viewtopic_body_poll_option_before and after
  [ticket/12376] Added viewtopic_body_poll_question_append
  [ticket/12376] Add template events viewtopic_body_polls
 2014-05-04 15:58:40 +02:00
Joas Schilling
28f2c1eb08 Merge pull request #2273 from PayBas/ticket/12376 
[ticket/12376] Add template events viewtopic_body_polls

* PayBas/ticket/12376:
  [ticket/12376] Changed to viewtopic_body_poll_option_before and after
  [ticket/12376] Added viewtopic_body_poll_question_append
  [ticket/12376] Add template events viewtopic_body_polls
 2014-05-04 15:58:33 +02:00
Joas Schilling
90d98cb884 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12374] Fixed alphabetical sorting
  [ticket/12374] Added prepend-versions of events
  [ticket/12374] Updated code layout
  [ticket/12374] Add Template events index_body_block_(name)_append
 2014-05-04 15:55:51 +02:00
Joas Schilling
587a9445cd Merge pull request #2270 from PayBas/ticket/12374 
[ticket/12374] Add Template events index_body_block_(name)_append

* PayBas/ticket/12374:
  [ticket/12374] Fixed alphabetical sorting
  [ticket/12374] Added prepend-versions of events
  [ticket/12374] Updated code layout
  [ticket/12374] Add Template events index_body_block_(name)_append
 2014-05-04 15:55:44 +02:00
Joas Schilling
877b4cfcaa Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12346] Change tabs to spaces
  [ticket/12346] Add Template Event overall_header_navlink_app/pre
 2014-05-04 15:52:36 +02:00
Joas Schilling
96394bb044 Merge pull request #2233 from PayBas/ticket/12346 
[ticket/12346] Add Template Event overall_header_navlink_append/prepend

* PayBas/ticket/12346:
  [ticket/12346] Change tabs to spaces
  [ticket/12346] Add Template Event overall_header_navlink_app/pre
 2014-05-04 15:52:26 +02:00
Joas Schilling
9f9998f89a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12335] Remove $ from desc
  [ticket/12335] Added generate_profile_fields _ before
  [ticket/12335] Documentation fix and added use_contact_fields
  [ticket/12335] Fix phpBB version number
  [ticket/12335] Add Events to phpbb\profilefields\manager
 2014-05-04 15:50:17 +02:00
Joas Schilling
329c2d9292 Merge pull request #2219 from PayBas/ticket/12335 
[ticket/12335] Add Events to phpbb\profilefields\manager

* PayBas/ticket/12335:
  [ticket/12335] Remove $ from desc
  [ticket/12335] Added generate_profile_fields _ before
  [ticket/12335] Documentation fix and added use_contact_fields
  [ticket/12335] Fix phpBB version number
  [ticket/12335] Add Events to phpbb\profilefields\manager
 2014-05-04 15:48:05 +02:00
Nicofuma
f90e6649f7 [ticket/12459] Enable related tests 
PHPBB3-12459
 2014-05-04 15:44:15 +02:00
Tristan Darricau
3bf61d4df0 [ticket/12459] Fix: Differentiating unapproved and deleted posts 
Unapproved and deleted posts should not be displayed with the same message
(POST_UNAPPROVED)

PHPBB3-12459
 2014-05-04 15:44:13 +02:00
Tristan Darricau
9dc4e5a61f [ticket/12459] Fix: Soft deleted topics should appear in feeds 
As for the posts, a soft deleted topic should appear (with a corresponding
message) in topic's based feeds.

PHPBB3-12459
 2014-05-04 15:44:12 +02:00
Tristan Darricau
68293450f9 [ticket/12459] Fix: the posts were always marked as unapproved 
the database return a string, so the strict comparison always returned false

PHPBB3-12459
 2014-05-04 15:44:10 +02:00
Joas Schilling
92ec7616be Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12378] Prosilver common.css duplicate entry
 2014-05-04 15:44:09 +02:00
Joas Schilling
a1561fffba Merge pull request #2402 from MGaetan89/ticket/12378 
[ticket/12378] Prosilver common.css duplicate entry

* MGaetan89/ticket/12378:
  [ticket/12378] Prosilver common.css duplicate entry
 2014-05-04 15:44:00 +02:00
Joas Schilling
cd7be3f58b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12455] Remove unused language strings from common.php and app.php
 2014-05-04 15:43:33 +02:00