1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-27 17:49:27 +02:00

778 Commits

Author SHA1 Message Date
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Meik Sievertsen
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
Meik Sievertsen
1042152a55 Merge changes made in revisions #r9405 to #r9467
2009-04-18

git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-18 15:09:19 +00:00
Meik Sievertsen
4cbf6bc703 Merge most changes from 3.0.x branch since the 25th december.
(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-22 16:34:26 +00:00
Meik Sievertsen
e85f9f79bc remove no longer necessary files... hooray
git-svn-id: file:///svn/phpbb/trunk@9221 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 13:14:24 +00:00
Chris Smith
7e95a3ee6c merge in r9090, r9170, r9174, r9179
git-svn-id: file:///svn/phpbb/trunk@9214 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-23 13:53:13 +00:00
Meik Sievertsen
c076becc5a Use "less than a minute ago" instead of "0 minutes ago"
Use "Sent: {DATE}" in pm's, instead of "Sent at: {DATE}"

git-svn-id: file:///svn/phpbb/trunk@9163 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-03 11:19:25 +00:00
Meik Sievertsen
4379b3d7bc [Change] Performance increase for format_date() (Bug #37575 - Patch by BartVB)
[Change] Changed prosilver date separator from 'on' to '»'
[Feature] Added 'AGO' setting to relative date strings. For example: posted 14 minutes ago. (Patch by BartVB)
[Fix] Extend vertical line for last post column if no posts in forum (Bug #37125)


git-svn-id: file:///svn/phpbb/trunk@9137 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-30 14:43:25 +00:00
Chris Smith
ae9c4068e7 Deprecate S_ROW_COUNT, remove *really* old assignments from the code
git-svn-id: file:///svn/phpbb/trunk@9107 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 07:22:28 +00:00
Meik Sievertsen
a9274f1d63 define cookie var for styleswitcher.js for popups (Bug #36765)
git-svn-id: file:///svn/phpbb/trunk@9081 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-22 20:05:24 +00:00
Meik Sievertsen
d46e8e6f98 merge revisions i missed... hopefully not breaking things - did not check every change.
git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-22 19:38:25 +00:00
Chris Smith
ef0c0d4c82 been a while :( ... merge in r8997, r8998, r8999, r9000, r9001, r9002, r9003, r9004, r9005, r9007, r9008, r9009, r9010, r9011, r9012, r9013, r9014, r9015, r9022, r9023, r9029, r9030, r9034, r9048, r9049, r9054, r9056
git-svn-id: file:///svn/phpbb/trunk@9064 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-13 13:04:54 +00:00
Henry Sudhof
36635929a8 #36695
git-svn-id: file:///svn/phpbb/trunk@9061 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-13 11:45:40 +00:00
Chris Smith
5ce6035aad Merging r8993, r8994, r8995
git-svn-id: file:///svn/phpbb/trunk@8996 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-10 17:58:32 +00:00
Meik Sievertsen
9c7d8dcd7d - Do not show link to user/group profiles if user has no permission to view the linked page and gets a denied message anyway. (Bug #15088)
- Do not display last post link and sort display options for search engines. (Bug #15088)


git-svn-id: file:///svn/phpbb/trunk@8988 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 14:22:07 +00:00
Meik Sievertsen
d4c8a078a2 Show coloured guest names correctly if not enclosed in <a> tags. ;) Bug #21935
git-svn-id: file:///svn/phpbb/trunk@8984 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 15:17:27 +00:00
Henry Sudhof
e4c3a743ca #34815
git-svn-id: file:///svn/phpbb/trunk@8959 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 12:55:48 +00:00
Meik Sievertsen
f3844a17f7 revert r8893 - there were massive problems with the display and select all code
git-svn-id: file:///svn/phpbb/trunk@8954 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-28 17:09:20 +00:00
Chris Smith
c439b286e9 Merge in r8940, r8941, r8942, r8945, r8946, r8947, r8949, r8950, r8951
git-svn-id: file:///svn/phpbb/trunk@8952 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-27 11:45:30 +00:00
Henry Sudhof
9f9a89c78e Merging 8927, 8928, 8929, 8930
git-svn-id: file:///svn/phpbb/trunk@8931 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 12:29:57 +00:00
Chris Smith
884cde18fe Merge in r8922
git-svn-id: file:///svn/phpbb/trunk@8923 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 16:31:45 +00:00
Henry Sudhof
0f14f278d0 fixing some vC bugs (attempt counting and posting) and introducing prototype for reCaptcha
git-svn-id: file:///svn/phpbb/trunk@8903 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 12:37:42 +00:00
Meik Sievertsen
80ced5c0b7 support tabs in code selections (Bug #25445). Still does not solve the strange "4 spaces prefixed on every line" problem in firefox. :/
git-svn-id: file:///svn/phpbb/trunk@8894 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 16:42:55 +00:00
Henry Sudhof
01c1c27f2c meh
git-svn-id: file:///svn/phpbb/trunk@8892 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 16:18:59 +00:00
Henry Sudhof
461be11e8d Okay, that is pretty raw, but better to have it in place than trying to play catch-up. Introducing an early stage of CAPTCHA modules.
git-svn-id: file:///svn/phpbb/trunk@8889 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 13:17:30 +00:00
Meik Sievertsen
2fc6d5147a Set secure cookie for style switcher if required. (Bug #19625)
git-svn-id: file:///svn/phpbb/trunk@8875 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 14:17:39 +00:00
Meik Sievertsen
235f552974 Expand shown ban reason in unban screen to fully show long entries. (Bug #16234)
git-svn-id: file:///svn/phpbb/trunk@8863 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-17 14:50:48 +00:00
Chris Smith
10c8d29205 Merge in r8825
git-svn-id: file:///svn/phpbb/trunk@8826 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-05 12:52:00 +00:00
Meik Sievertsen
44416f4744 - queue trigger feature
- queued posts do not affect user_posts
- show links to MCP + queued posts in ucp and acp


git-svn-id: file:///svn/phpbb/trunk@8816 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 14:04:30 +00:00
Henry Sudhof
b46bd90f6e merge
git-svn-id: file:///svn/phpbb/trunk@8769 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-18 11:51:07 +00:00
Henry Sudhof
f741c4ff05 merge
git-svn-id: file:///svn/phpbb/trunk@8757 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-14 12:49:11 +00:00
Henry Sudhof
cec12340b9 merge
git-svn-id: file:///svn/phpbb/trunk@8748 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-13 14:17:11 +00:00
Henry Sudhof
360e245a1a make IM links in PMs behave like their viewtopic brothers (#30075 - fix by Porter21)
git-svn-id: file:///svn/phpbb/trunk@8728 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-29 15:35:45 +00:00
Meik Sievertsen
ad739a358c merge? merge.
git-svn-id: file:///svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-23 18:22:44 +00:00
Meik Sievertsen
b54a9ec1e2 #28485
git-svn-id: file:///svn/phpbb/trunk@8618 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-07 13:59:14 +00:00
Nils Adermann
150c6c4c24 removed executable props [Bug #6464]
git-svn-id: file:///svn/phpbb/trunk@8599 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-04 15:38:14 +00:00
Henry Sudhof
98dadd5eb8 merge
git-svn-id: file:///svn/phpbb/trunk@8575 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-29 14:07:55 +00:00
Meik Sievertsen
28e8c3ea85 merge
git-svn-id: file:///svn/phpbb/trunk@8570 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-26 12:05:22 +00:00
Meik Sievertsen
53dc95d429 #26885
git-svn-id: file:///svn/phpbb/trunk@8564 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-18 20:02:14 +00:00
Meik Sievertsen
8dde998e87 merge the quick fix
git-svn-id: file:///svn/phpbb/trunk@8553 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-08 17:36:22 +00:00
Meik Sievertsen
eb664ddafb some missing merges...
git-svn-id: file:///svn/phpbb/trunk@8545 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-04 14:47:49 +00:00
Meik Sievertsen
3e42df098c merging some changes
git-svn-id: file:///svn/phpbb/trunk@8484 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-03-31 14:58:14 +00:00
Meik Sievertsen
02a5032a52 merging... again
git-svn-id: file:///svn/phpbb/trunk@8452 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-03-18 14:47:43 +00:00
Meik Sievertsen
8c64d7c32a merging #r8426 to #r8430
git-svn-id: file:///svn/phpbb/trunk@8431 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-03-13 15:25:20 +00:00
Henry Sudhof
2a3eb724a8 cross-ci
git-svn-id: file:///svn/phpbb/trunk@8411 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-27 15:21:23 +00:00
Meik Sievertsen
2cedbbac09 merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390
git-svn-id: file:///svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-23 14:23:34 +00:00
Nils Adermann
3b669aedfd adding a new option to hide the entire list of subforums on listforums
git-svn-id: file:///svn/phpbb/trunk@8373 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-03 22:39:38 +00:00
Henry Sudhof
2e5e0a7868 Oh well
git-svn-id: file:///svn/phpbb/trunk@8365 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-01 15:17:04 +00:00
Meik Sievertsen
4b5fab372f merge with revision #r8350
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-30 16:14:39 +00:00
Henry Sudhof
fedee2c07e cross-ci
git-svn-id: file:///svn/phpbb/trunk@8336 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-24 11:11:11 +00:00