aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* improve code to detect and solve conflicts for code removed from one version ↵Meik Sievertsen2009-09-201-8/+16
| | | | | | to another. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10168 89ea8834-ac86-4346-8a33-228a782c2dd0
* if preserve_cr is true and the file generated no conflict but is obviously ↵Meik Sievertsen2009-09-201-0/+7
| | | | | | not "empty" we tag it as modified because preserve_cr is the default mode for showing modifications (else the user gets a resolvable conflict and may wonder why ;)) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10167 89ea8834-ac86-4346-8a33-228a782c2dd0
* although we do not use force_approved_state check it nevertheless for the ↵Meik Sievertsen2009-09-201-2/+2
| | | | | | message displayed to the user - bug #51325 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10166 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #51655 - Missing global vars phpbb_root_path & phpExJoas Schilling2009-09-191-1/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10165 89ea8834-ac86-4346-8a33-228a782c2dd0
* use existing language key for "private message not found"Meik Sievertsen2009-09-191-1/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10164 89ea8834-ac86-4346-8a33-228a782c2dd0
* Ok, after 20+ hours i think i fixed all grave issues with the updaterMeik Sievertsen2009-09-183-146/+384
| | | | | | | | | | | | | - smaller memory footprint - better checks for already updated files - even less conflicts - fixed automatic conflict resolving after successful merges - no more conflicts for $Id$ changes - fixed skip_whitespace_changes bug where code blocks were added to diff_op_add whereby the previous or next diff_op_copy already had the change - correctly display merged files in diff view (previously it happened that the old file was used for comparision, although the new file was different/newer/merged) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10163 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix r9814 - remove echo "aha"; - Happy birthday nadermanJoas Schilling2009-09-181-1/+1
| | | | | | Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10162 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #51375 - Do not show QR in closed topics/forumsJoas Schilling2009-09-181-1/+2
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10161 89ea8834-ac86-4346-8a33-228a782c2dd0
* phpBB updater now solves common conflicts on it's own. This further reduces ↵Meik Sievertsen2009-09-172-0/+96
| | | | | | | | the chance of conflicts. (tested with some heavily modified files who previously generated a lot of conflicts) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10160 89ea8834-ac86-4346-8a33-228a782c2dd0
* Return integers when get_forum_list() is supposed to only return IDs.Andreas Fischer2009-09-171-1/+1
| | | | | | | This will save us some calls to the sql escape function when used with sql_in_set(). Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10159 89ea8834-ac86-4346-8a33-228a782c2dd0
* extend r9387 - check for existance of all functions we use...Meik Sievertsen2009-09-172-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10158 89ea8834-ac86-4346-8a33-228a782c2dd0
* found a much better method to skip whitespace/tab changes. :)Meik Sievertsen2009-09-172-20/+9
| | | | | | 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
* correctly display diff for conflictsMeik Sievertsen2009-09-171-12/+12
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10156 89ea8834-ac86-4346-8a33-228a782c2dd0
* Remove duplicate S_DISPLAY_GALLERY key from ucp_groups. Regression from r9757Meik Sievertsen2009-09-171-1/+0
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10155 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix xhtml issue in updater - Bug #51335Meik Sievertsen2009-09-161-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10154 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix some XHTML issues in admin style - Bug #51405Meik Sievertsen2009-09-165-9/+13
| | | | | | 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
* Bug #51385 - regression from r9252 - only spelling fixMeik Sievertsen2009-09-161-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10152 89ea8834-ac86-4346-8a33-228a782c2dd0
* add send_statistics feature to changelogMeik Sievertsen2009-09-161-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10151 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix #51285 and more issues with template inherence on set_custom_templateJoas Schilling2009-09-163-6/+11
| | | | | | | | 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
* move up the feed code because MODs often use this location which results in ↵Meik Sievertsen2009-09-161-10/+10
| | | | | | more unneccessary conflicts. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10149 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix coppa setting in convertor (Bug #50735) - at the same time increase ↵Meik Sievertsen2009-09-151-3/+3
| | | | | | 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
* Fix login for passworded forums - Bug #51265Meik Sievertsen2009-09-151-0/+1
| | | | | | 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
* fix uninitialised variable in functions_admin.php (Bug #51295)Meik Sievertsen2009-09-151-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10146 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix #51305 - User need a_clearlog to delete warningsJoas Schilling2009-09-152-18/+8
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0
* sanity check - avoid ugly error messagesHenry Sudhof2009-09-151-3/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10144 89ea8834-ac86-4346-8a33-228a782c2dd0
* #51395 - remove legacy captcha code. authorised by: acyd burnHenry Sudhof2009-09-151-18/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10143 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix #51235 - regression from 9843 for #48265Joas Schilling2009-09-131-0/+2
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10142 89ea8834-ac86-4346-8a33-228a782c2dd0
* why am i so dumb sometimes... /me hits myself with the dumbness stick...Meik Sievertsen2009-09-131-1/+0
| | | | | | regression from r10122 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10141 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approvalJoas Schilling2009-09-121-1/+1
| | | | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
* rollback; will be in 3.0.7Henry Sudhof2009-09-113-25/+7
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10138 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50985 - typoHenry Sudhof2009-09-111-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10137 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50985Henry Sudhof2009-09-113-7/+25
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10136 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #51105. - Ignore (disable) newly generated forum in forums list. ↵Andreas Fischer2009-09-101-1/+1
| | | | | | Related to r9896. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10135 89ea8834-ac86-4346-8a33-228a782c2dd0
* Language changesYuriy Rusko2009-09-101-2/+2
| | | | | | #51065 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10134 89ea8834-ac86-4346-8a33-228a782c2dd0
* Language changesYuriy Rusko2009-09-101-4/+4
| | | | | | #51065 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10133 89ea8834-ac86-4346-8a33-228a782c2dd0
* Correctly display underlined links placed in last line in viewtopic. (Bug ↵Meik Sievertsen2009-09-102-0/+2
| | | | | | #14811 - Patch by primehalo) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10132 89ea8834-ac86-4346-8a33-228a782c2dd0
* also collect admins user agent vendor and version (send_statistics)Meik Sievertsen2009-09-102-3/+19
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10131 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix database updater for PostgreSQL: Data needs to be GROUPed BY left_id, ↵Andreas Fischer2009-09-101-0/+1
| | | | | | 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
* Fix bug #51075 introduced in r10121.Andreas Fischer2009-09-101-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10129 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #50445 - Fix icon alignment for forums with large descriptions in ↵Andreas Fischer2009-09-092-4/+3
| | | | | | subsilver2. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10128 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #51035 introduced in r9814.Andreas Fischer2009-09-091-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10127 89ea8834-ac86-4346-8a33-228a782c2dd0
* Related to r9830: Change REPORT_POST to REPORT_PM.Andreas Fischer2009-09-091-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10126 89ea8834-ac86-4346-8a33-228a782c2dd0
* regarding r10108 - Hide some more search links for #50685Joas Schilling2009-09-091-1/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10125 89ea8834-ac86-4346-8a33-228a782c2dd0
* Send emails for manual user activation if admin activation is enabled not ↵Meik Sievertsen2009-09-091-1/+1
| | | | | | through queue in ACP (Bug #50925) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10124 89ea8834-ac86-4346-8a33-228a782c2dd0
* define $data array at the correct location. ;)Meik Sievertsen2009-09-091-3/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10123 89ea8834-ac86-4346-8a33-228a782c2dd0
* Always remove temporary filename (Bug #50965)Meik Sievertsen2009-09-081-8/+9
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10122 89ea8834-ac86-4346-8a33-228a782c2dd0
* Further adjust unread tracking query, should work now for user last mark ↵Meik Sievertsen2009-09-082-8/+16
| | | | | | times less than forum/topic mark times. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10121 89ea8834-ac86-4346-8a33-228a782c2dd0
* Rename get_unread_topics_list() to get_unread_topics().Andreas Fischer2009-09-083-18/+20
| | | | | | | 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
* regarding r10108 - Hide some more search links for #50685Joas Schilling2009-09-082-2/+2
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10119 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix retrieval of unread topics list. The old queries were too heavy, using ↵Meik Sievertsen2009-09-071-79/+25
| | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 13:32:54 +0000