mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-18 05:19:43 +02:00
Code Issues Releases Wiki Activity
12,200 Commits 18 Branches 192 Tags
Commit Graph

90 Commits

Author SHA1 Message Date
Joas Schilling
91eccc708b [ticket/11775] Fix error when moving the last post to another topic 
PHPBB3-11775
 2013-08-08 13:42:51 +02:00
Nathan Guse
2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/10491] Install board once per test run.
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  ...

Conflicts:
	phpBB/includes/mcp/mcp_topic.php
 2012-12-13 20:46:25 -06:00
Nathan Guse
a50907250e [ticket/8610] Use phpbb_update_rows_avoiding_duplicates 
PHPBB3-8610
 2012-12-13 20:42:10 -06:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase 
PHPBB3-8610
 2012-12-13 20:32:43 -06:00
Nathan Guse
71bcc58fee [ticket/8610] Add some comments 
PHPBB3-8610
 2012-12-13 20:23:04 -06:00
Nathaniel Guse
5a88bd1bf1 [ticket/8610] Update Bookmarks and Subscriptions when splitting topics 
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function

PHPBB3-8610
 2012-12-13 20:23:03 -06:00
Nathaniel Guse
05d7decdd3 [ticket/8610] Update Bookmarks when merging posts into another topic 
Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.

PHPBB3-8610
 2012-12-13 20:19:27 -06:00
Oleg Pudeyev
e2c67a8e42 [ticket/11162] Rename tricky updates to database helper. 
PHPBB3-11162
 2012-12-12 21:46:38 -05:00
Oleg Pudeyev
1a411c5658 [ticket/11162] Use correct functions. 
PHPBB3-11162
 2012-12-05 00:11:14 -05:00
Oleg Pudeyev
abca64b1df [ticket/11162] Add includes. 
PHPBB3-11162
 2012-12-04 23:37:14 -05:00
Oleg Pudeyev
69225bd0a6 [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. 
PHPBB3-11162
 2012-12-01 23:09:31 -05:00
Joas Schilling
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page 
PHPBB3-8636
 2012-02-23 10:55:57 +01:00
Igor Wiedler
52bd8c307f [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read 
PHPBB3-10365
 2011-11-13 15:37:26 +01:00
Igor Wiedler
d6c3e7785d [ticket/10365] Make sure moderators only get mcp_reports link when allowed 
The m_report permission is not not being checked when displaying the link to
mcp_reports.

PHPBB3-10365
 2011-10-30 19:10:57 +01:00
Joas Schilling
954b3c3484 [ticket/7720] Fix alternative image-description for unread posts. 
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.

PHPBB3-7720
 2010-07-14 20:55:07 +02:00
Cullen Walsh
f40418296a Bug #56285 - Properly calculate posts in a topic in the MCP 
Authorised by: bantu


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-19 00:14:31 +00:00
Meik Sievertsen
8bae495874 revert r10079 (bug #50035) to be able to investigate other options of handling this later. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-10-03 11:35:39 +00:00
Meik Sievertsen
35eea4539a check for m_split and m_merge permission on target topic and topic icon selection (Bug #51675) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-23 09:41:54 +00:00
Meik Sievertsen
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
Joas Schilling
d7925595dc Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts" 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10079 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-31 13:50:40 +00:00
Meik Sievertsen
e461162847 Fix race condition for updating post/topic/etc. counter. (reported by BartVB) 
please do not try such fixes at home - the correct solution would be to create a second config table with integer columns. ;)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9398 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-03-19 17:01:59 +00:00
Meik Sievertsen
c97ff6352d fix r8999 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9030 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-19 18:32:11 +00:00
Chris Smith
77058f31c2 Correctly display topic in MCP when start parameter is equal to or greater than the number of posts. #30525 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9023 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-16 19:12:12 +00:00
Chris Smith
40bfc3d361 Increase board topic counter when splitting topics. #32125 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8999 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-11 15:16:05 +00:00
Chris Smith
c1407d8047 Split posts target forum requires 'f_post' now instead of 'm_split'. #31015 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8941 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-26 11:56:33 +00:00
Chris Smith
b812f81ac4 MCP topic view checkboxes now default to unchecked. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8925 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-23 21:15:10 +00:00
Henry Sudhof
2bec47abfe #31265 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8702 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-07-28 16:44:02 +00:00
Meik Sievertsen
9640f5b108 remove the _f_ portion from redirect urls now they no longer exist 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8520 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-04-21 13:17:30 +00:00
Meik Sievertsen
d0f2399a86 some bugfixes 
git-svn-id: file:///svn/phpbb/trunk@8168 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-12 18:14:28 +00:00
Meik Sievertsen
e2ac95febf *** empty log message *** 
git-svn-id: file:///svn/phpbb/trunk@8132 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-04 12:33:31 +00:00
Henry Sudhof
4defd8a830 Ok, here comes a big one. Poor updater. Also requires testing. 
#i91
#i92
#i93
#i94
#i95
#i96


git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-03 15:05:54 +00:00
Henry Sudhof
052025bb1f -#14438 
-Refactor the confirm table cleanup
-Add confirm table cleanup to session garbage collection. Might require own pseudo-cron.


git-svn-id: file:///svn/phpbb/trunk@8089 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-13 15:15:27 +00:00
David M
a74fe8a811 #14363 
git-svn-id: file:///svn/phpbb/trunk@8082 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-06 03:55:29 +00:00
Nils Adermann
d104d3d969 - BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments() 
- using \r on custom bbcodes to allow line breaks [Bug #10758]


git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-19 13:40:53 +00:00
Meik Sievertsen
acf0c0ddeb err, forgot to commit 
git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-27 17:33:27 +00:00
Henry Sudhof
4373e62a56 #13731 
git-svn-id: file:///svn/phpbb/trunk@7928 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-23 12:03:41 +00:00
Henry Sudhof
fcb0c89962 Cleaning up (#13689) 
Also removed the useless login box from the ACP.


git-svn-id: file:///svn/phpbb/trunk@7919 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-22 14:04:26 +00:00
Henry Sudhof
0d074672fa Introducing the ability to manually set the dimensions of an image in the imageset editor. 
A little spelling.

Introduces new language variable(s).

#11925
#11675


git-svn-id: file:///svn/phpbb/trunk@7750 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-06-11 12:39:51 +00:00
David M
1667a17923 #12067 
git-svn-id: file:///svn/phpbb/trunk@7739 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-06-09 12:26:32 +00:00
Meik Sievertsen
456586475b oh my god - what did he do? Adding attachment display to post/topic review, queue, reports, post details, mcp topic view... fixing other tiny things along the line. 
git-svn-id: file:///svn/phpbb/trunk@7642 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-19 12:04:22 +00:00
Meik Sievertsen
c0caf7652f Fixing some tiny bugs... 
- correctly close span tags within code=php


git-svn-id: file:///svn/phpbb/trunk@7619 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-17 14:59:33 +00:00
David M
36f95d545b #10659 
git-svn-id: file:///svn/phpbb/trunk@7506 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-08 22:21:38 +00:00
David M
919c1aee53 #10567 
git-svn-id: file:///svn/phpbb/trunk@7490 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-06 19:11:06 +00:00
David M
db952fe094 #9873 
git-svn-id: file:///svn/phpbb/trunk@7473 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-05 14:29:49 +00:00
Meik Sievertsen
550f270a00 #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624 
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)


git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-04-22 15:27:40 +00:00
Meik Sievertsen
3abc3dd331 #5396, #5266, #5147 
git-svn-id: file:///svn/phpbb/trunk@7246 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-03-31 12:35:44 +00:00
David M
fb709f65cb #8098 
git-svn-id: file:///svn/phpbb/trunk@7056 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-02-24 19:35:20 +00:00
Meik Sievertsen
2e941d3d38 trying to fix some bugs... 
git-svn-id: file:///svn/phpbb/trunk@7054 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-02-24 12:31:21 +00:00
Nils Adermann
aa8ebc7bf3 - introducing read/unread images in the MCP, if you view something through the MCP it will not update the "read" status of a post/topic/forum [includes Bug #6796] 
git-svn-id: file:///svn/phpbb/trunk@6936 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-01-27 16:04:58 +00:00
Meik Sievertsen
a841fe70a8 ok, handled some bugs... the most important being validate_username (the variable passed to validate_data([...]array('username', [...])) and updating group listings while doing relevant group actions. Oh, and PM icons are working now. :o 
git-svn-id: file:///svn/phpbb/trunk@6894 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-01-17 18:41:49 +00:00