aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | [ticket/12015] Add some parameters to viewonline eventsJoas Schilling2013-11-131-2/+7
| * | | [ticket/12015] Add @change to events that got changedJoas Schilling2013-11-131-1/+3
| * | | [ticket/12015] Add post counting information to eventJoas Schilling2013-11-131-3/+10
| * | | [ticket/12015] Add an event after the post has been assigned to the templateJoas Schilling2013-11-131-0/+14
| * | | [ticket/12015] Add attachments to core.viewtopic_modify_post_rowJoas Schilling2013-11-131-1/+2
| * | | [ticket/12015] Add more parameters to core.viewtopic_get_post_dataJoas Schilling2013-11-131-1/+8
* | | | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-2112-109/+43
|\ \ \ \
| * | | | [ticket/12005] Remove PM popup module from DBLukasz2013-11-081-0/+42
| * | | | [ticket/12005] Delete templates filesLukasz2013-11-082-62/+0
| * | | | [ticket/12005] Remove language vars used by PM popupLukasz2013-11-082-7/+0
| * | | | [ticket/12005] Remove PM popupLukasz2013-11-082-3/+1
| * | | | [ticket/12005] Remove PM popup UCP moduleLukasz2013-11-082-28/+0
| * | | | [ticket/12005] Remove PM popup from converterLukasz2013-11-081-1/+0
| * | | | [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-082-8/+0
* | | | | Merge pull request #1856 from prototech/ticket/12001Nathan Guse2013-11-213-28/+31
|\ \ \ \ \
| * | | | | [ticket/12001] Ensure that form data is sent to server in AJAX requests.Cesar G2013-11-083-28/+31
* | | | | | Merge pull request #1860 from prototech/ticket/12010Nathan Guse2013-11-216-26/+35
|\ \ \ \ \ \