1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 10:39:19 +02:00

153 Commits

Author SHA1 Message Date
Joas Schilling
efedc973eb [ticket/6109] MSN is now called Windows Live Messenger (WLM)
Replaced the logo with the current one and changed the language strings.

PHPBB3-6109
2011-01-10 01:44:54 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Meik Sievertsen
b68de2323d merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-16 15:48:23 +00:00
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
fbaf2baa8d document plugin-support
move language path declaration to object instantiation


git-svn-id: file:///svn/phpbb/trunk@9239 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-28 10:53:28 +00:00
Meik Sievertsen
cf5c856c28 change page_header/page_footer and message handler
git-svn-id: file:///svn/phpbb/trunk@9234 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-27 13:52:27 +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
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
Meik Sievertsen
9d9d61b1a2 Merge revisions:
r8974, r8975, r8976, r8977, r8978, r8979

git-svn-id: file:///svn/phpbb/trunk@8980 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 12:51:43 +00:00
Meik Sievertsen
ce6b87ccec - Automatically add users/groups to the PM recipient list, if entered or selected.
- Reply to PM now includes all previous recipients and not only the original sender.
- Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting.
- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.



git-svn-id: file:///svn/phpbb/trunk@8914 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:11:34 +00:00
Chris Smith
0e0100c525 merge r8829, r8830, r8831, r8832, r8833, r8834, r8835, r8836, r8837, r8838
git-svn-id: file:///svn/phpbb/trunk@8839 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-08 13:39:34 +00:00
Chris Smith
a32f3a6709 Merge in r8827
git-svn-id: file:///svn/phpbb/trunk@8828 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-05 13:49:04 +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
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
Henry Sudhof
3ca0a7cb76 What did you expect? Us slacking off because of a few digg/heise trolls? nah. never!
The show must go on :)


git-svn-id: file:///svn/phpbb/trunk@8280 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-12-13 22:23:25 +00:00
Meik Sievertsen
e8b2c4128e some tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@8155 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-08 14:38:44 +00:00
Meik Sievertsen
7d84cac202 #14621
#14596
info file changes


git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-04 15:08:22 +00:00
Meik Sievertsen
ff3843b39e - make sure the copyright/disclaimer is consistent
- two fixes...


git-svn-id: file:///svn/phpbb/trunk@8061 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-21 15:09:52 +00:00
Henry Sudhof
2915ba1a5a minor correction
git-svn-id: file:///svn/phpbb/trunk@7978 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-29 11:44:31 +00:00
Henry Sudhof
92c25a3e6c #13791 - I hope this works :D
git-svn-id: file:///svn/phpbb/trunk@7960 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-27 17:01:37 +00:00
Meik Sievertsen
a43ead8ee7 do not get too excited
git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-26 15:51:11 +00:00
Meik Sievertsen
75a5162945 again, a lot of bug fixes
git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-19 20:38:38 +00:00
Henry Sudhof
c0c424a564 #13435
git-svn-id: file:///svn/phpbb/trunk@7887 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-15 12:09:54 +00:00
Meik Sievertsen
002dd81557 some more fixes
git-svn-id: file:///svn/phpbb/trunk@7875 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-12 16:14:07 +00:00
Meik Sievertsen
2d5298e8e1 some fixes here and there
git-svn-id: file:///svn/phpbb/trunk@7860 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-10 15:14:25 +00:00
Henry Sudhof
4aa578c73d Adding the bot mark/unmark links already promised in the changelog.
Adds backlinks to the success screen after closing reports (#12905)
Some style and language fixes (#12493, #12235, #11235,  #11949) - the latter is still not perfect.
Added code to the phpBB2 converter to deal with slashed quotes (#12607)

Changes and adds language entries :)


git-svn-id: file:///svn/phpbb/trunk@7822 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-02 14:05:21 +00:00
Henry Sudhof
78c1256e5c Minor fixes
#12699


git-svn-id: file:///svn/phpbb/trunk@7800 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-26 14:27:22 +00:00
Henry Sudhof
6813967ae1 Changing the behaviour of the hideonline permission.
Test the current setting before altering the memory limit during install(Bug #12195)

And another language var.


git-svn-id: file:///svn/phpbb/trunk@7755 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-14 15:03:52 +00:00
Meik Sievertsen
455536773f ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-09 11:11:20 +00:00
Meik Sievertsen
c04a69c67c tiny fixes which do not need to be listed within the changelog... (falls under tiny stylistic and language changes)
git-svn-id: file:///svn/phpbb/trunk@7709 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-03 16:12:00 +00:00
Meik Sievertsen
4c44eddc90 we included a check for getimagesize() existance... now we again can suppress notices while running this function.
git-svn-id: file:///svn/phpbb/trunk@7646 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-19 16:40:56 +00:00
Meik Sievertsen
aa4ad4b62e Allow pre-setting language dependant data in schema_data.sql... specified with {L_*}, also create the search index on installation
git-svn-id: file:///svn/phpbb/trunk@7644 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-19 15:44:23 +00:00
Meik Sievertsen
38e08367d2 label changes, language fixes...
git-svn-id: file:///svn/phpbb/trunk@7608 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-16 14:45:13 +00:00
Henry Sudhof
ec4b04ae82 The message shouldn't be displayed at all(now), unless there's foul play invlolved.
#10968


git-svn-id: file:///svn/phpbb/trunk@7592 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-15 17:14:25 +00:00
Henry Sudhof
0b94cfb702 Making logout somewhat more secure.
Language variables, take them while they're hot. (just one, so be quick)


git-svn-id: file:///svn/phpbb/trunk@7590 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-15 16:02:00 +00:00
Meik Sievertsen
26cf5c195d some language fixes reported.
git-svn-id: file:///svn/phpbb/trunk@7570 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-14 15:05:32 +00:00
Meik Sievertsen
b2c2ad6ee5 some language fixes. fix encoding for acp/ban.php
git-svn-id: file:///svn/phpbb/trunk@7565 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-14 08:30:13 +00:00
Meik Sievertsen
c1a738ce5f punctuation changes in language files
git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-10 15:31:35 +00:00
Meik Sievertsen
f7b51337c5 some language-specific adjustements
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)


git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-03 14:29:22 +00:00
Meik Sievertsen
290187c6c7 more bugfixing. Important change: admins able to give ban reason for user quick tool ban - logging also syndicated, now always logged to ACP and MCP logs.
git-svn-id: file:///svn/phpbb/trunk@7426 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-29 12:30:22 +00:00
Meik Sievertsen
2c7ef5f5c0 timezone box + shortening pm options variable as well as max login attempts fix.
git-svn-id: file:///svn/phpbb/trunk@7419 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-28 14:11:18 +00:00
Meik Sievertsen
fc295f5f0e checking in some fixes. ;) Most of them are really minor, including:
- correctly enter report notification into db
- fix double-quote pm issue


git-svn-id: file:///svn/phpbb/trunk@7409 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-26 18:41:26 +00:00
Jonathan Stanley
8a5452d4eb #10103
Collective nouns ;)


git-svn-id: file:///svn/phpbb/trunk@7398 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-24 21:58:34 +00:00
Jonathan Stanley
5ebb018cb8 #10067
Never noticed the date output in the dropdown was dynamic... so made sense to actually use the relative days feature to _actually show_ how it works by placing "Today" within the date, and append it with a date of how it'd be formatted it it wasn't yesterday/today/tomorrow by offsetting the time() by 1 year negatively.

Bonus is that the RELATIVE_DAYS variable is no longer needed, though have switched that for a VARIANT_DATE_SEPARATOR variable incase people want to localise " / " (could have been hardcoded, but you never know! :P)

The YESTERDAY/TODAY/TOMORROW variables have also had their trailing commas nuked (the comma has gone into the date format code) as people whom want:

"d M Y @ H:i:s" => "01 Jan 2007 @ 13:37:00"

... enabling relative days with: "|d M Y| @ H:i:s"

... would have got: "Today, @ 13:37:00"

... but now they shall get: "Today @ 13:37:00"

Lastly, added a relative date option for those prefering middle-endian dates with am/pm time.


git-svn-id: file:///svn/phpbb/trunk@7391 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-24 00:11:20 +00:00
Jonathan Stanley
56e83ff4ea #10065
Rewording UCP_PM_OPTIONS to something more verbose since that panel does contain a lot of options. Rejigged the menu as "Manage PM drafts" sits better with "Compose message", with UCP_PM_OPTIONS on its own at the bottom.


git-svn-id: file:///svn/phpbb/trunk@7390 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-23 22:27:39 +00:00
David M
3b68624076 #9881
git-svn-id: file:///svn/phpbb/trunk@7368 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-16 21:39:39 +00:00
Jonathan Stanley
3b60c51604 #9524
git-svn-id: file:///svn/phpbb/trunk@7349 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-13 05:52:30 +00:00