mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity
14,571 Commits 17 Branches 190 Tags
Commit Graph

136 Commits

Author SHA1 Message Date
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
 2012-11-10 12:27:19 +01:00
Joas Schilling
f77a6eaab5 [feature/soft-delete] Fix the rest of *_approved and the delete_post unit test 
PHPBB3-9567
 2012-11-10 11:24:52 +01:00
Joas Schilling
9c2a58eff4 [feature/soft-delete] Append _approved to *_posts and *_topics column names 
PHPBB3-9567
 2012-11-09 13:37:53 +01:00
Joas Schilling
0a07635329 [feature/soft-delete] Fix convertor and one mcp issue 
PHPBB3-9567
 2012-10-22 17:21:56 +02:00
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
 2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https 
PHPBB3-11135
 2012-10-05 21:18:59 -03:00
Andreas Fischer
d8ddda5121 [develop-olympus] Bumping version numbers to final for 3.0.11 releases. 2012-05-31 20:19:28 +02:00
Shibu Lijack
394a95b5c5 [ticket/10688] Updated version to 3.1 
Replace phpBB 3.0.x to phpBB 3.1.x

PHPBB-10688
 2012-04-11 17:54:50 +05:30
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Andreas Fischer
06ae98b1e5 [develop-olympus] Bumping version numbers to final for 3.0.10 releases. 2011-11-20 21:41:24 +01:00
Nils Adermann
a4acd62f3b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
 2011-11-18 19:32:44 +01:00
rxu
3091efc501 [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded 
PHPBB3-9416
 2011-11-17 22:16:41 +08:00
Andreas Fischer
b774520621 [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases. 2011-06-12 19:45:01 +02:00
Nils Adermann
ed95c7195f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
 2011-06-02 04:53:48 +02:00
Patrick Webster
94c28efe07 [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter. 
PHPBB3-10039
 2011-05-13 19:43:17 -04:00
Richard Foote
90c8803d59 [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'. 
Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode
non-ascii characters that might be in default_dateformat.

E.g. "d M Y à H:i"

PHPBB3-9348
 2010-12-28 21:33:34 +01:00
Nils Adermann
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +01:00
Richard Foote
66fc086742 [ticket/9748] Replace <br /> before converting < and > to their entities. 
PHPBB3-9748
 2010-07-24 11:48:47 +02:00
Nils Adermann
39490abfff Incrementing the version number to 3.0.7-PL1 2010-03-05 21:09:37 +01:00
Josh Woody
4a17abbcc4 Merge r10473 into the 3.0.7 branch. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-04 01:07:30 +00:00
Meik Sievertsen
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
Meik Sievertsen
9666983c69 also populate forum_options on conversions 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10028 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-20 12:19:12 +00:00
Meik Sievertsen
c32f49679f - add options for quick reply (forum-based and board-wide) 
- add option for minimum post chars (which is a required setting for quick reply, therefore we introduce it here)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9656 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-23 10:48:53 +00:00
Henry Sudhof
f42fe3b024 Actually, this should never happen, ... #41945 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9333 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-02-20 14:50:43 +00:00
Chris Smith
6ebd421299 Fix a problem with r9005 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9325 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-02-09 14:47:21 +00:00
Henry Sudhof
e5f0824e4b As proposed by marshalrusty: re-hash plain MD5s left in the database 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9312 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-02-06 14:51:26 +00:00
Meik Sievertsen
83839139e6 dumdidum... 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9155 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-12-02 17:13:34 +00:00
Nils Adermann
05e8d9ee09 Ha- ndle checking for duplicate usernames in chunks (Bug #17285 - Patch by A_Jelly_Doughnut)t) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9113 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-24 19:23:23 +00:00
Meik Sievertsen
5d9306c512 up the version number 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9036 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-25 14:16:17 +00:00
Chris Smith
1d616b8104 Correctly convert Neil's Birthday MOD to the date format used in phpBB3. #32895 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9005 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-11 19:01:17 +00:00
Meik Sievertsen
2fcd96ca72 Ok, story real database server info, as well as caching it 
Store it on installation too - allows us to check the db version used on installation and used currently to warn the user about incompatibilities

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8814 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-04 12:01:47 +00:00
Meik Sievertsen
ae2b448833 up the version for the convertor 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8619 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-07 14:10:16 +00:00
Meik Sievertsen
c508c3e44e version update 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8492 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-04-07 13:08:42 +00:00
Nils Adermann
261b310b0d - Find and display colliding usernames correctly when converting from one database to another (Bug #23925) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8489 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-04-03 14:04:10 +00:00
Henry Sudhof
d7c5f502b4 Fixing converter bugs. 
#21215
#18575
#18435
#16565



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8379 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-02-13 16:28:37 +00:00
Meik Sievertsen
6f97a529a4 and the final version number ;) 
git-svn-id: file:///svn/phpbb/trunk@8274 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-12-12 10:54:51 +00:00
Meik Sievertsen
d4efe02e3f *** empty log message *** 
git-svn-id: file:///svn/phpbb/trunk@8250 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-11-26 13:20:57 +00:00
Henry Sudhof
04ebbeca3f '1' might not have been a good choice 
git-svn-id: file:///svn/phpbb/trunk@8216 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-29 13:39:34 +00:00
Meik Sievertsen
4f73460474 anyone having any further form token problems or other very critical bugs found? If so, go, head to the bug tracker or message me through IRC. ;) 
git-svn-id: file:///svn/phpbb/trunk@8191 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-14 22:09:06 +00:00
Meik Sievertsen
d7fbabba47 RC6 preparation 
git-svn-id: file:///svn/phpbb/trunk@8173 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-13 11:47:54 +00:00
Henry Sudhof
e365b6abfa #14704 
That should solve the issue for the user table, I hope that it doesn't manifest at other places.


git-svn-id: file:///svn/phpbb/trunk@8167 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-12 16:11:41 +00:00
Henry Sudhof
f3fd365496 Minor change, might help with some lost users 
git-svn-id: file:///svn/phpbb/trunk@8164 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-11 14:45:47 +00:00
Meik Sievertsen
10ed58b2c9 prevent posting empty messages with some UTF8-characters as well as fixing conversion in CVS. 
git-svn-id: file:///svn/phpbb/trunk@8163 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-11 08:12:41 +00:00
Henry Sudhof
0f156f08f9 Minor - make the resulting query cleaner. 
git-svn-id: file:///svn/phpbb/trunk@8134 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-04 14:53:56 +00:00
Meik Sievertsen
92f554e38a deregister globals to install too 
git-svn-id: file:///svn/phpbb/trunk@8130 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-04 11:33:33 +00:00
Meik Sievertsen
6f1d6e9246 erm, yeah... 
git-svn-id: file:///svn/phpbb/trunk@8070 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-24 18:26:15 +00:00
Henry Sudhof
5f4cd5b65c #14105 Note that announcements can be global - that's not a bug. 
git-svn-id: file:///svn/phpbb/trunk@8060 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-21 14:08:23 +00:00
Meik Sievertsen
65fd807646 and up the number... 
git-svn-id: file:///svn/phpbb/trunk@7972 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-28 15:06:16 +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
6aaf78de29 Some more quote workarounds. 
git-svn-id: file:///svn/phpbb/trunk@7903 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-18 12:51:57 +00:00