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
Meik Sievertsen
c903b453fa
i had these changes sitting... must've been a merge not committed (and because we do not use svn 1.5 as the client version i am not able to say which they were)
...
git-svn-id: file:///svn/phpbb/trunk@9042 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-02 11:22:30 +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
Henry Sudhof
18bfc5e69b
and why not this as well?
...
git-svn-id: file:///svn/phpbb/trunk@8965 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-01 10:29:27 +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
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
b486710ea1
Merge in r8843, r8908, r8909
...
git-svn-id: file:///svn/phpbb/trunk@8910 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 12:56:34 +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
2eeeaadcfd
emails to e-mails
...
git-svn-id: file:///svn/phpbb/trunk@8856 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 13:21:12 +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
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
Chris Smith
0dbe7e3b6c
Remove caching of templates from the database completely, themes is cut down ready for a complete chop, and fix the installer :)
...
git-svn-id: file:///svn/phpbb/trunk@8812 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 11:39:25 +00:00
Meik Sievertsen
15e04808fc
writeable -> writable merge
...
git-svn-id: file:///svn/phpbb/trunk@8762 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-16 13:11:50 +00:00
Henry Sudhof
6eed0e5bd2
merge
...
git-svn-id: file:///svn/phpbb/trunk@8744 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-13 12:28:17 +00:00
Meik Sievertsen
d8f2c4a1c4
add warning to ACP index if config file is writeable
...
git-svn-id: file:///svn/phpbb/trunk@8689 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-28 13:21:53 +00:00
Henry Sudhof
d7a217c28c
#16124
...
git-svn-id: file:///svn/phpbb/trunk@8635 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 13:06:14 +00:00
Henry Sudhof
65fb840b76
merge
...
git-svn-id: file:///svn/phpbb/trunk@8587 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-03 16:33:02 +00:00
Henry Sudhof
91b4fe1868
Merging mime and referer checks into the Trunk
...
git-svn-id: file:///svn/phpbb/trunk@8571 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-28 13:05:45 +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
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
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
7fed5dd166
cross-checkin for the TRUNK
...
git-svn-id: file:///svn/phpbb/trunk@8333 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-23 14:32:15 +00:00
David M
85055ac97f
oh boy...
...
- Migrate code base to PHP 5.1+
git-svn-id: file:///svn/phpbb/trunk@8295 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-03 17:00:40 +00:00
Meik Sievertsen
c3ef1109c0
Ticket #16945
...
git-svn-id: file:///svn/phpbb/trunk@8288 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-12-27 16:27:24 +00:00
Meik Sievertsen
bf2741ca80
Ticket #17705
...
git-svn-id: file:///svn/phpbb/trunk@8287 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-12-27 16:04:42 +00:00
Henry Sudhof
df58b050f0
grr
...
git-svn-id: file:///svn/phpbb/trunk@8255 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-28 20:09:01 +00:00
Henry Sudhof
d78b227478
missed one. Language change, sorry about that.
...
git-svn-id: file:///svn/phpbb/trunk@8254 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-28 19:46:36 +00:00
Henry Sudhof
da7fc3d188
#15554
...
#15464
#15384
Yes, there is a lang change.
git-svn-id: file:///svn/phpbb/trunk@8253 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-27 15:13:50 +00:00
Meik Sievertsen
18d014c765
further fixes
...
- fix infinite loop on checking ban for those not having ever visited the page (or removed all session cookies)
- avatar width/height switched in language files
- fix windows switching to background on IE7 (smlies window for example)
git-svn-id: file:///svn/phpbb/trunk@8224 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-03 20:31:05 +00:00
Henry Sudhof
4cce6105c2
Let's be not quite that ambigious.
...
git-svn-id: file:///svn/phpbb/trunk@8158 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-09 15:42:39 +00:00
Henry Sudhof
ea9c1d7ea9
new clicky thingies.
...
git-svn-id: file:///svn/phpbb/trunk@8156 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-09 11:21:08 +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
82abcbf856
example.com
...
git-svn-id: file:///svn/phpbb/trunk@8148 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:45:34 +00:00
Henry Sudhof
7baf3ed140
#i43
...
git-svn-id: file:///svn/phpbb/trunk@8143 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 13:14:58 +00:00
Henry Sudhof
570f2f6f7f
#14633
...
git-svn-id: file:///svn/phpbb/trunk@8140 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 07:38:15 +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
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
Meik Sievertsen
529980ab79
language fixes and template adjustements for the whois facility...
...
git-svn-id: file:///svn/phpbb/trunk@8093 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-20 15:36:00 +00:00
Meik Sievertsen
feee13f962
fixing some language and style bugs...
...
git-svn-id: file:///svn/phpbb/trunk@8079 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-05 13:33:18 +00:00
Meik Sievertsen
cda8083ba7
fixing some bugs
...
git-svn-id: file:///svn/phpbb/trunk@8075 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-02 17:24:56 +00:00
Nils Adermann
35b45cdff1
- added an option to specify a port for the LDAP server
...
- restricted access to "Recent searches" to admins who are allowed to configure search [Bug #14085 ]
git-svn-id: file:///svn/phpbb/trunk@8064 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-23 13:41:34 +00:00
Nils Adermann
23e3766497
- Prevent {URL} token in custom BBCodes from make_clickable messing [Bug #14151 ]
...
- Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
git-svn-id: file:///svn/phpbb/trunk@8056 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-19 21:29:31 +00:00
Nils Adermann
979ee66773
- allow multibyte search configuration
...
- added ldap_user_filter to add additional restrictions on the user objects used for authentication [Bug #12627 ]
- improved ldap explanations a bit
- display searchable subforums of invisible parents in advanced search forum selection [Bug #11395 ]
git-svn-id: file:///svn/phpbb/trunk@8047 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-18 13:52:33 +00:00
Nils Adermann
d25ca29ca0
- strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode
...
- highlight in post subjects and topic titles
- language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED
git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-17 23:53:06 +00:00
Meik Sievertsen
e9188d4e05
Some changes... non-invasive...
...
git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-13 12:14:07 +00:00
Henry Sudhof
aa3e36eb8a
heh, ...
...
git-svn-id: file:///svn/phpbb/trunk@8012 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-06 17:12:15 +00:00