| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'prototech/ticket/11346' into develop | Joas Schilling | 2013-12-02 | 1 | -16/+11 |
| |\ | | | | | | | | | * prototech/ticket/11346: [ticket/11346] Hide "Mark topics read" link when forum is empty. | ||||
| | * | [ticket/11346] Hide "Mark topics read" link when forum is empty. | Cesar G | 2013-12-01 | 1 | -16/+11 |
| | | | | | | | | | | | | | TOTAL_POSTS and TOTAL_USERS are not defined for viewforum.php. PHPBB3-11346 | ||||
| * | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-12-02 | 1 | -2/+2 |
| |\ \ | |/ |/| | | | | | * develop-olympus: [ticket/12048] Fix the regexp for language keys in custom bbcodes. | ||||
| | * | [ticket/12048] Fix the regexp for language keys in custom bbcodes. | Cesar G | 2013-12-02 | 1 | -2/+2 |
| | | | | | | | | | PHPBB3-12048 | ||||
| * | | Merge remote-tracking branch 'nickvergessen/ticket/12045' into develop | Dhruv | 2013-11-30 | 3 | -4/+12 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/12045: [ticket/12045] Only display group selection if there are groups [ticket/12045] Correctly close <span> before closing parent tag [ticket/12045] Correctly close <dd> with </dd> | ||||
| | * | | [ticket/12045] Only display group selection if there are groups | Joas Schilling | 2013-11-28 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | Also fixed the empty option which is not allowed. PHPBB3-12045 | ||||
| | * | | [ticket/12045] Correctly close <span> before closing parent tag | Joas Schilling | 2013-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-12045 | ||||
| | * | | [ticket/12045] Correctly close <dd> with </dd> | Joas Schilling | 2013-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-12045 | ||||
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/12042' into develop | Dhruv | 2013-11-30 | 3 | -14/+44 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/12042: [ticket/12042] Replace B with a more meaningful key name [ticket/12042] Add all language strings from PLUpload 2.0 to the language file | ||||
| | * | | [ticket/12042] Replace B with a more meaningful key name | Joas Schilling | 2013-11-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | PHPBB3-12042 | ||||
| | * | | [ticket/12042] Add all language strings from PLUpload 2.0 to the language file | Joas Schilling | 2013-11-27 | 3 | -14/+44 |
| | | | | | | | | | | | | | PHPBB3-12042 | ||||
| * | | | Merge remote-tracking branch 'prototech/ticket/11507' into develop | Joas Schilling | 2013-11-28 | 1 | -28/+45 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/11507: [ticket/11507] Handle empty sets correctly. [ticket/11507] Allow group & unapproved post count options to be used alone. [ticket/11507] Fix the unapproved posts count query. [ticket/11507] Allow the posts awaiting approval value to be 0. | ||||
| | * | | | [ticket/11507] Handle empty sets correctly. | Cesar G | 2013-11-27 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the last parameter in $db->sql_in_set() does not give the correct behaviour expected here. The query should not be negated if the set is empty. PHPBB3-11507 | ||||
| | * | | | [ticket/11507] Allow group & unapproved post count options to be used alone. | Cesar G | 2013-11-27 | 1 | -21/+37 |
| | | | | | | | | | | | | | | | | | PHPBB3-11507 | ||||
| | * | | | [ticket/11507] Fix the unapproved posts count query. | Cesar G | 2013-11-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Only unapproved posts should be counted. PHPBB3-11507 | ||||
| | * | | | [ticket/11507] Allow the posts awaiting approval value to be 0. | Cesar G | 2013-11-27 | 1 | -3/+3 |
| | |/ / | | | | | | | | | | PHPBB3-11507 | ||||
| * | | | Merge remote-tracking branch 'prototech/ticket/12040' into develop | Joas Schilling | 2013-11-28 | 1 | -0/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | * prototech/ticket/12040: [ticket/12040] Prevent AJAX background animation flicker in ACP | ||||
| | * | | | [ticket/12040] Prevent AJAX background animation flicker in ACP | Cesar G | 2013-11-26 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-12040 | ||||
| * | | | | Merge remote-tracking branch 'prototech/ticket/11869' into develop | Joas Schilling | 2013-11-28 | 1 | -1/+2 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | * prototech/ticket/11869: [ticket/11869] Fix strict standards error when registering. | ||||
| | * | | | [ticket/11869] Fix strict standards error when registering. | Cesar G | 2013-11-27 | 1 | -1/+2 |
| | |/ / | | | | | | | | | | PHPBB3-11869 | ||||
| * | | | Merge remote-tracking branch 'Marc/ticket/11914' into develop | Joas Schilling | 2013-11-27 | 7 | -184/+208 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | * Marc/ticket/11914: [ticket/11914] Add assets version to included plupload scripts [ticket/11914] Update plupload to 2.0.0 [ticket/11914] Use unix line endings in plupload queue css file | ||||
| | * | | [ticket/11914] Add assets version to included plupload scripts | Marc Alexander | 2013-11-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | PHPBB3-11914 | ||||
| | * | | [ticket/11914] Update plupload to 2.0.0 | Marc Alexander | 2013-10-23 | 7 | -20/+44 |
| | | | | | | | | | | | | | | | | | | | | | | There are no longer seperate javascript files for each type of uploader. New filenames have been kept as used inside the plupload package. PHPBB3-11914 | ||||
| | * | | [ticket/11914] Use unix line endings in plupload queue css file | Marc Alexander | 2013-10-23 | 1 | -177/+177 |
| | | | | | | | | | | | | | PHPBB3-11914 | ||||
| * | | | Merge remote-tracking branch 'prototech/ticket/12036' into develop | Joas Schilling | 2013-11-26 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | * prototech/ticket/12036: [ticket/12036] Re-add missing move up button to module management page. | ||||
| | * | | | [ticket/12036] Re-add missing move up button to module management page. | Cesar G | 2013-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-12036 | ||||
| * | | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-11-26 | 2 | -1/+2 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | * develop-olympus: [ticket/12037] Fix hard-coded text in acp_inactive.html. Conflicts: phpBB/adm/style/acp_inactive.html | ||||
| | * | | [ticket/12037] Fix hard-coded text in acp_inactive.html. | Cesar G | 2013-11-25 | 2 | -1/+2 |
| | | | | | | | | | | | | | PHPBB3-12037 | ||||
| * | | | [ticket/12015] Fix variable name and event version | Joas Schilling | 2013-11-21 | 1 | -6/+14 |
| | | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | | Merge pull request #1883 from s9e/ticket/12028 | Nathan Guse | 2013-11-21 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | [ticket/12028] Replace L_COLON with literal colon | ||||
| | * | | | [ticket/12028] Replace L_COLON with literal colon | s9e | 2013-11-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace L_COLON with literal colon in JavaScript context. [ci skip] PHPBB3-12028 | ||||
| * | | | | Merge pull request #1870 from nickvergessen/ticket/12015 | Nathan Guse | 2013-11-21 | 2 | -4/+40 |
| |\ \ \ \ | |/ / / |/| | | | Ticket/12015 Enhance events in viewtopic to increase their usability | ||||
| | * | | | [ticket/12015] Fix english grammar | Joas Schilling | 2013-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-12015 | ||||
| | * | | | [ticket/12015] Add some parameters to viewonline events | Joas Schilling | 2013-11-13 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | PHPBB3-12015 | ||||
| | * | | | [ticket/12015] Add @change to events that got changed | Joas Schilling | 2013-11-13 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-12015 | ||||
| | * | | | [ticket/12015] Add post counting information to event | Joas Schilling | 2013-11-13 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | PHPBB3-12015 | ||||
| | * | | | [ticket/12015] Add an event after the post has been assigned to the template | Joas Schilling | 2013-11-13 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | PHPBB3-12015 | ||||
| | * | | | [ticket/12015] Add attachments to core.viewtopic_modify_post_row | Joas Schilling | 2013-11-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-12015 | ||||
| | * | | | [ticket/12015] Add more parameters to core.viewtopic_get_post_data | Joas Schilling | 2013-11-13 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | | | Merge pull request #1854 from Pico88/ticket/12005 | Nathan Guse | 2013-11-21 | 12 | -109/+43 |
| |\ \ \ \ | | | | | | | | | | | [ticket/12005] Remove code responsible for PM popup completely | ||||
| | * | | | | [ticket/12005] Remove PM popup module from DB | Lukasz | 2013-11-08 | 1 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| | * | | | | [ticket/12005] Delete templates files | Lukasz | 2013-11-08 | 2 | -62/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| | * | | | | [ticket/12005] Remove language vars used by PM popup | Lukasz | 2013-11-08 | 2 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| | * | | | | [ticket/12005] Remove PM popup | Lukasz | 2013-11-08 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| | * | | | | [ticket/12005] Remove PM popup UCP module | Lukasz | 2013-11-08 | 2 | -28/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| | * | | | | [ticket/12005] Remove PM popup from converter | Lukasz | 2013-11-08 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| | * | | | | [ticket/12005] Remove PM popup setting from user preferences | Lukasz | 2013-11-08 | 2 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| * | | | | | Merge pull request #1856 from prototech/ticket/12001 | Nathan Guse | 2013-11-21 | 3 | -28/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | [ticket/12001] Ensure that form data is sent to server in AJAX requests. | ||||
| | * | | | | | [ticket/12001] Ensure that form data is sent to server in AJAX requests. | Cesar G | 2013-11-08 | 3 | -28/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12001 | ||||
| * | | | | | | Merge pull request #1860 from prototech/ticket/12010 | Nathan Guse | 2013-11-21 | 6 | -26/+35 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [ticket/12010] Make the navbar icons clickable. | ||||
