aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prototech/ticket/11672' into developJoas Schilling2013-12-035-129/+143
|\
| * [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.Cesar G2013-11-212-11/+6
| * [ticket/11672] Remove duplicate $request global.Cesar G2013-11-191-1/+1
| * [ticket/11672] The json response call exits so the else is not necessary.Cesar G2013-11-191-23/+11
| * [ticket/11672] Remove the messages for lock/unlock/change topic type.Cesar G2013-11-191-22/+22
| * [ticket/11672] Clean up the logic in mcp_queue.php.Cesar G2013-11-191-97/+75
| * [ticket/11672] Remove some messages that were missed in mcp_queue.php.Cesar G2013-11-191-2/+10
| * [ticket/11672] Replace sprintf() usage with $user->lang().Cesar G2013-11-194-11/+17
| * [ticket/11672] Removed unnecessary text from alerts.callumacrae2013-11-194-14/+53
* | Merge remote-tracking branch 'cyberalien/ticket/11969' into developJoas Schilling2013-12-0311-27/+58
|\ \
| * | [ticket/11969] Change topic link to unread post in subsilver2Vjacheslav Trushkin2013-10-255-5/+6
| * | [ticket/11969] Change topic link to unread post in prosilverVjacheslav Trushkin2013-10-255-22/+50
| * | [ticket/11969] New language strings for first and last post linksVjacheslav Trushkin2013-10-251-0/+2
* | | Merge remote-tracking branch 'vsephpbb/ticket/12014' into developJoas Schilling2013-12-033-0/+12
|\ \ \
| * | | [ticket/12014] Change event date in docsMatt Friedman2013-11-211-1/+1
| * | | [ticket/12014] Fix version number in event docsMatt Friedman2013-11-121-1/+1
| * | | [ticket/12014] Template Event index_body.html before forumlistMatt Friedman2013-11-113-0/+12
* | | | Merge remote-tracking branch 'prototech/ticket/11346' into developJoas Schilling2013-12-021-16/+11
|\ \ \ \
| * | | | [ticket/11346] Hide "Mark topics read" link when forum is empty.Cesar G2013-12-011-16/+11
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-12-021-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/12048] Fix the regexp for language keys in custom bbcodes.Cesar G2013-12-021-2/+2
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/12045' into developDhruv2013-11-303-4/+12
|\ \ \ \ \
| * | | | | [ticket/12045] Only display group selection if there are groupsJoas Schilling2013-11-282-2/+10
| * | | | | [ticket/12045] Correctly close <span> before closing parent tagJoas Schilling2013-11-281-1/+1
| * | | | | [ticket/12045] Correctly close <dd> with </dd>Joas Schilling2013-11-281-1/+1
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12042' into developDhruv2013-11-303-14/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/12042] Replace B with a more meaningful key nameJoas Schilling2013-11-272-2/+2
| * | | | | [ticket/12042] Add all language strings from PLUpload 2.0 to the language fileJoas Schilling2013-11-273-14/+44
* | | | | | Merge remote-tracking branch 'prototech/ticket/11507' into developJoas Schilling2013-11-281-28/+45
|\ \ \ \ \ \
| * | | | | | [ticket/11507] Handle empty sets correctly.Cesar G2013-11-271-5/+5
| * | | | | | [ticket/11507] Allow group & unapproved post count options to be used alone.Cesar G2013-11-271-21/+37
| * | | | | | [ticket/11507] Fix the unapproved posts count query.Cesar G2013-11-271-1/+2
| * | | | | | [ticket/11507] Allow the posts awaiting approval value to be 0.Cesar G2013-11-271-3/+3
| |/ / / / /
* | | | | | Merge remote-tracking branch 'prototech/ticket/12040' into developJoas Schilling2013-11-281-0/+2
|\ \ \ \ \ \
| * | | | | | [ticket/12040] Prevent AJAX background animation flicker in ACPCesar G2013-11-261-0/+2
* | | | | | | Merge remote-tracking branch 'prototech/ticket/11869' into developJoas Schilling2013-11-281-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/11869] Fix strict standards error when registering.Cesar G2013-11-271-1/+2
| |/ / / / /
* | | | | | Merge remote-tracking branch 'Marc/ticket/11914' into developJoas Schilling2013-11-277-184/+208
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/11914] Add assets version to included plupload scriptsMarc Alexander2013-11-051-2/+2
| * | | | | [ticket/11914] Update plupload to 2.0.0Marc Alexander2013-10-237-20/+44
| * | | | | [ticket/11914] Use unix line endings in plupload queue css fileMarc Alexander2013-10-231-177/+177
* | | | | | Merge remote-tracking branch 'prototech/ticket/12036' into developJoas Schilling2013-11-261-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/12036] Re-add missing move up button to module management page.Cesar G2013-11-251-1/+1
* | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-11-262-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | [ticket/12037] Fix hard-coded text in acp_inactive.html.Cesar G2013-11-252-1/+2
* | | | | | [ticket/12015] Fix variable name and event versionJoas Schilling2013-11-211-6/+14
* | | | | | Merge pull request #1883 from s9e/ticket/12028Nathan Guse2013-11-212-2/+2
|\ \ \ \ \ \
| * | | | | | [ticket/12028] Replace L_COLON with literal colons9e2013-11-212-2/+2
* | | | | | | Merge pull request #1870 from nickvergessen/ticket/12015Nathan Guse2013-11-212-4/+40
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/12015] Fix english grammarJoas Schilling2013-11-211-1/+1