0b0c9544a3
found a much better method to skip whitespace/tab changes. :)
...
This also solves even more unncessary conflicts - Bug #51365
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10157 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-17 08:14:56 +00:00
6b5d195a98
correctly display diff for conflicts
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10156 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-17 08:13:28 +00:00
8bcfd33539
Remove duplicate S_DISPLAY_GALLERY key from ucp_groups. Regression from r9757
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10155 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-17 07:52:35 +00:00
2f808d274b
fix xhtml issue in updater - Bug #51335
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10154 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 14:37:17 +00:00
8cea32f3bf
fix some XHTML issues in admin style - Bug #51405
...
the acp_logs one is quite nasty, i know - but at least it does not require a new css class
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10153 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 14:30:36 +00:00
c32d295d97
Bug #51385 - regression from r9252 - only spelling fix
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10152 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 13:02:13 +00:00
198989dcfd
add send_statistics feature to changelog
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10151 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 13:01:20 +00:00
697fd5a134
Fix #51285 and more issues with template inherence on set_custom_template
...
Conflict introduced with r9839 and r9823
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10150 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 08:11:52 +00:00
b27e96cf62
move up the feed code because MODs often use this location which results in more unneccessary conflicts.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10149 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 07:51:26 +00:00
c616b2b336
fix coppa setting in convertor (Bug #50735 ) - at the same time increase target phpBB version number for the phpBB2 convertor and convertor version number. ;)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10148 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 19:01:42 +00:00
36dc2d6e2d
Fix login for passworded forums - Bug #51265
...
Was a regression from r10067 for Bug #50285
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10147 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 13:10:59 +00:00
1df914d80a
fix uninitialised variable in functions_admin.php (Bug #51295 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10146 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 12:58:23 +00:00
b4c7dbcd66
Fix #51305 - User need a_clearlog to delete warnings
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 09:45:05 +00:00
ffbe4e3b82
sanity check - avoid ugly error messages
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10144 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 09:11:17 +00:00
bf2133d380
#51395 - remove legacy captcha code. authorised by: acyd burn
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10143 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 09:08:37 +00:00
cb88671638
fix #51235 - regression from 9843 for #48265
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10142 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-13 15:04:21 +00:00
3b73584430
why am i so dumb sometimes... /me hits myself with the dumbness stick...
...
regression from r10122
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10141 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-13 14:31:32 +00:00
c768cff554
fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approval
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-12 13:17:58 +00:00
bf63d6cf10
rollback; will be in 3.0.7
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10138 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-11 14:38:23 +00:00
96ac8a84e6
#50985 - typo
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10137 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-11 13:56:26 +00:00
e4e59b3b65
#50985
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10136 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-11 13:53:56 +00:00
33e58d8e90
Fix bug #51105 . - Ignore (disable) newly generated forum in forums list. Related to r9896.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10135 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 19:49:19 +00:00
dd9a5b3da6
Language changes
...
#51065
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10134 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 15:32:16 +00:00
78fe1375d4
Language changes
...
#51065
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10133 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 15:27:10 +00:00
735e396152
Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10132 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 13:56:11 +00:00
94373fd1f8
also collect admins user agent vendor and version (send_statistics)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10131 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 13:30:47 +00:00
a5ec35e185
Fix database updater for PostgreSQL: Data needs to be GROUPed BY left_id, before we can ORDER BY left_id. Introduced in r10072.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10130 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 08:58:24 +00:00
ab971c59be
Fix bug #51075 introduced in r10121.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10129 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 08:44:34 +00:00
d20a910b86
Fix bug #50445 - Fix icon alignment for forums with large descriptions in subsilver2.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10128 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 22:32:13 +00:00
edaa46a47d
Fix bug #51035 introduced in r9814.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10127 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 22:00:08 +00:00
8c3d390c61
Related to r9830: Change REPORT_POST to REPORT_PM.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10126 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 21:41:51 +00:00
4675bf8179
regarding r10108 - Hide some more search links for #50685
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10125 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 10:46:51 +00:00
30d402c24b
Send emails for manual user activation if admin activation is enabled not through queue in ACP (Bug #50925 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10124 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 09:08:24 +00:00
dc4619c889
define $data array at the correct location. ;)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10123 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 08:07:01 +00:00
a5e4ca259a
Always remove temporary filename (Bug #50965 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10122 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 14:02:40 +00:00
5537393f76
Further adjust unread tracking query, should work now for user last mark times less than forum/topic mark times.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10121 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 10:36:22 +00:00
d85493ab16
Rename get_unread_topics_list() to get_unread_topics().
...
Cleanup: Remove some stuff we no longer need.
Related to report #46765
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10120 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 08:53:01 +00:00
d92cbe7fd1
regarding r10108 - Hide some more search links for #50685
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10119 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 07:59:03 +00:00
bb8e42fa5f
Fix retrieval of unread topics list. The old queries were too heavy, using temporary and filesort and actually only based on topics being retrieved before. Instead now use one query which is also a lot faster and yields the same results.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10118 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 15:48:15 +00:00
fdf19b0d95
since we now have several search_ids, all with different default results modes we now always add the sr variable to the URL - Bug #50775
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10117 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 12:39:37 +00:00
02b2cced5a
beautify q&a captcha a bit (only slightly)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10116 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 11:57:58 +00:00
5f244f64c6
related to Bug #50185 - forgot to add tabindex to submit button on registration
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10115 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 11:57:21 +00:00
58a3d87744
Fix Bug #50845 (missing info icon in subsilver2)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10114 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 11:42:30 +00:00
1d37a633cd
Adjustments to r10005: Use request_var() to get cookie data.
...
Some more adjustments to get_unread_topics_list()
Related to report: #46765
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10113 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 00:38:20 +00:00
df86a1b27c
Some smaller changes to r10041.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10112 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-06 23:59:35 +00:00
bd212ff730
Adjust r10110 - Also add autowidth class to keywords input field - Bug #50795 related
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10111 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-05 12:21:34 +00:00
d30ecde618
add inputbox class to input in prosilver - Bug #50795
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10110 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-05 12:12:23 +00:00
239438a6c9
Fix r10041 - Bug #50765
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10109 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-05 12:06:12 +00:00
e0bf824501
Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10108 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-05 12:03:52 +00:00
fc5a21e16a
Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10107 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 17:27:13 +00:00
