Joas Schilling
|
b15ea672fd
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 11:31:50 +01:00 |
|
Joas Schilling
|
8489e0bdc2
|
Merge branch 'develop-olympus' into develop-ascraeus
|
2014-11-22 11:31:41 +01:00 |
|
Jakub Senko
|
30f292f5a2
|
[ticket/11613] Allow cookies to work on netbios domains
PHPBB3-11613
|
2014-11-22 11:29:57 +01:00 |
|
PayBas
|
2c15388520
|
[ticket/13228] Gotta use !important after all. Too bad
PHPBB3-13228
|
2014-11-22 02:42:25 +01:00 |
|
Crizzo
|
867bfa3f9e
|
[ticket/10442] Adds <dd> </dd> to <dl> for xhtml correctness
PHPBB3-10442
|
2014-11-22 01:08:14 +01:00 |
|
Marc Alexander
|
afc658c71a
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 00:15:24 +01:00 |
|
Crizzo
|
4cb930c2c1
|
[ticket/12885] New if for Index-page - board-index-text switch
PHPBB3-12885
|
2014-11-22 00:09:38 +01:00 |
|
Joas Schilling
|
c174862b7e
|
[ticket/10744] Fix some doc blocks
PHPBB3-10744
|
2014-11-21 23:59:29 +01:00 |
|
Joas Schilling
|
7c683608ab
|
[ticket/10744] Type hint objects for IDE usages
PHPBB3-10744
|
2014-11-21 23:58:53 +01:00 |
|
Joas Schilling
|
7f8c4d877a
|
[ticket/10744] Prevent installing styles with reserved names
PHPBB3-10744
|
2014-11-21 23:55:48 +01:00 |
|
Marc Alexander
|
9649d78fa4
|
Merge branch 'ticket/13358' into ticket/security-171
|
2014-11-21 23:37:17 +01:00 |
|
PayBas
|
16c43b6a7d
|
[ticket/13228] Fix codebox "select all" font-size in UCP and MCP
PHPBB3-13228
|
2014-11-21 23:35:33 +01:00 |
|
Joas Schilling
|
47d3865fa6
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 23:33:51 +01:00 |
|
Joas Schilling
|
2e2ab7b485
|
Merge pull request #3127 from omniError/ticket/13323
[ticket/13323] empty auth option in posting.php
|
2014-11-21 23:33:45 +01:00 |
|
Marc Alexander
|
6d3ac29aee
|
[ticket/13358] Use protected and public keywords where applicable
PHPBB3-13358
|
2014-11-21 23:30:47 +01:00 |
|
Joas Schilling
|
dd3e440cef
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/memberlist_email.html
|
2014-11-21 23:26:51 +01:00 |
|
Crizzo
|
f930a75471
|
[ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries
PHPBB3-13357
|
2014-11-21 23:18:42 +01:00 |
|
Marc Alexander
|
171837eefe
|
[ticket/13358] Do not pass variables by reference
PHPBB3-13358
|
2014-11-21 23:16:22 +01:00 |
|
Joas Schilling
|
0017fad554
|
Merge pull request #3108 from Elsensee/ticket/13284
[ticket/13284] Message body not included in email
|
2014-11-21 23:10:00 +01:00 |
|
Joas Schilling
|
655cd3bd3a
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 22:52:29 +01:00 |
|
Joas Schilling
|
c98cceaf22
|
Merge pull request #3068 from marc1706/ticket/13204
[ticket/13204] Tell user that password was incorrect when exceeding attempts
|
2014-11-21 22:52:24 +01:00 |
|
Joas Schilling
|
9b54f2d0c4
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 22:42:26 +01:00 |
|
Joas Schilling
|
dd7e09d092
|
Merge pull request #3064 from marc1706/ticket/13197
[ticket/13197] Also delete group avatar from users that have it set
|
2014-11-21 22:41:17 +01:00 |
|
Marc Alexander
|
4ee05b1c17
|
[ticket/security-171] Add tests for retrieved remote data in version_helper
SECURITY-171
|
2014-11-21 22:32:28 +01:00 |
|
Marc Alexander
|
34004612ac
|
[ticket/security-171] Sanitize data from composer.json
SECURITY-171
|
2014-11-21 22:32:28 +01:00 |
|
Marc Alexander
|
da1888a7fa
|
[ticket/security-171] Use type cast helper for json data
SECURITY-171
|
2014-11-21 22:32:28 +01:00 |
|
Joas Schilling
|
3c8d11f6cc
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 22:29:08 +01:00 |
|
Cesar G
|
8d8c2930d2
|
[ticket/13354] Fix incorrect column name when deleting all topic logs.
PHPBB3-13354
|
2014-11-21 12:48:26 -08:00 |
|
Marc Alexander
|
352648f173
|
[ticket/13358] Fix tests and use exceptions instead of user object
PHPBB3-13358
|
2014-11-21 21:37:43 +01:00 |
|
Marc Alexander
|
f6e7a94bd5
|
[ticket/13358] Use file_downloader in get_remote_file()
get_remote_file() has been marked as deprecated.
PHPBB3-13358
|
2014-11-21 21:37:43 +01:00 |
|
Marc Alexander
|
2793f9c078
|
[ticket/13358] Add file_downloader to version_helper
PHPBB3-13358
|
2014-11-21 21:37:43 +01:00 |
|
Marc Alexander
|
a080173010
|
[ticket/13358] Add file_downloader as replacement for get_remote_file
PHPBB3-13358
|
2014-11-21 21:37:43 +01:00 |
|
Cesar G
|
f3373e1e32
|
[ticket/13316] Ensure Recaptcha image uses https when necessary.
PHPBB3-13316
|
2014-11-21 12:17:04 -08:00 |
|
Joas Schilling
|
b104bf5791
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 21:05:35 +01:00 |
|
Joas Schilling
|
f719803fdc
|
Merge pull request #3144 from marc1706/ticket/13337
[ticket/13337] Do not use SQL IN comparison with empty array
|
2014-11-21 21:04:11 +01:00 |
|
Joas Schilling
|
1104f788c3
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/confirm_delete_body.html
|
2014-11-21 21:00:00 +01:00 |
|
Joas Schilling
|
d56da0d68f
|
Merge pull request #3044 from Elsensee/ticket/13100
[ticket/13100] Display only confirmation buttons when deleting shadow topic
|
2014-11-21 20:59:22 +01:00 |
|
Joas Schilling
|
95a8f40052
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 20:41:14 +01:00 |
|
Joas Schilling
|
1689191f29
|
Merge pull request #3023 from Nicofuma/ticket/13133
[ticket/13133] Allow @vendor_name for includecss
|
2014-11-21 20:36:41 +01:00 |
|
Joas Schilling
|
a191708601
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 20:20:45 +01:00 |
|
Joas Schilling
|
973c2a9a3a
|
Merge pull request #2765 from Elsensee/ticket/11863
[ticket/11863] Set require_activation to none if emails are disabled
|
2014-11-21 20:18:15 +01:00 |
|
Joas Schilling
|
90a5d29523
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 20:15:09 +01:00 |
|
Joas Schilling
|
707a85b6c1
|
Merge pull request #3043 from rxu/ticket/13182
[ticket/13182] Add posting.php core event to allow modifying the message text
|
2014-11-21 20:14:36 +01:00 |
|
Joas Schilling
|
73f1cfd583
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 20:09:27 +01:00 |
|
Joas Schilling
|
71a015557f
|
Merge pull request #3150 from omniError/ticket/13347
[ticket/13347] missing acp_forums template events
Conflicts:
phpBB/docs/events.md
|
2014-11-21 20:09:13 +01:00 |
|
Joas Schilling
|
d311fa2c5e
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 20:05:37 +01:00 |
|
Joas Schilling
|
bc52a84998
|
Merge pull request #3131 from omniError/ticket/13328
[ticket/13328] add core.mcp_view_forum_modify_sql
|
2014-11-21 20:05:19 +01:00 |
|
Joas Schilling
|
f7051a958c
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 19:58:49 +01:00 |
|
Joas Schilling
|
d6e8cce44b
|
Merge pull request #3130 from omniError/ticket/13326
[ticket/13326] add viewtopic_url to event
|
2014-11-21 19:58:43 +01:00 |
|
Joas Schilling
|
ac33ee2290
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/index_body.html
|
2014-11-21 19:54:44 +01:00 |
|