| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge branch 'develop-olympus' into develop-ascraeus | Nils Adermann | 2014-10-20 | 1 | -26/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13138] Do not use cookie data and autologin while forcing a user_id Conflicts: phpBB/phpbb/session.php | |||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Dhruv | 2014-10-19 | 1 | -2/+2 | |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | # By Nils Adermann # Via Dhruv Goel (1) and Nils Adermann (1) * develop-ascraeus: [ticket/13181] Replace database credentials with placeholders in sphinx conf | |||||
| | * | | | [ticket/13181] Replace database credentials with placeholders in sphinx conf | Nils Adermann | 2014-10-18 | 1 | -2/+2 | |
| | |/ / | | | | | | | | | | PHPBB3-13181 | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-15 | 1 | -7/+7 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge pull request #3024 from marc1706/ticket/13124 | Joas Schilling | 2014-10-15 | 1 | -7/+7 | |
| | |\ \ | | |/ | |/| | | | | [ticket/13124] Also trim spaces in front of comments except for first line | |||||
| | | * | [ticket/13124] Also trim spaces in front of comments except for first line | Marc Alexander | 2014-10-06 | 1 | -7/+7 | |
| | | | | | | | | | | | | | PHPBB3-13124 | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-07 | 1 | -0/+33 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg | |||||
| | * | | [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5 | Joas Schilling | 2014-10-07 | 1 | -0/+33 | |
| | | | | ||||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-06 | 1 | -2/+14 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus | Joas Schilling | 2014-10-06 | 1 | -2/+14 | |
| | |\ \ | | |/ | |/| | | | | [ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined | |||||
| | | * | [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224" | Tristan Darricau | 2014-10-03 | 1 | -2/+14 | |
| | | | | | | | | | | | | | This reverts commit 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7. | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-06 | 1 | -8/+70 | |
| |\ \ \ | |/ / | | | | | | | | | | * develop-ascraeus: [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'" | |||||
| | * | | Merge pull request #3017 from nickvergessen/ticket/13033 | Nils Adermann | 2014-10-06 | 1 | -8/+70 | |
| | |\ \ | | | | | | | | | [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'" | |||||
| | | * | | [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'" | Joas Schilling | 2014-10-02 | 1 | -8/+70 | |
| | | |/ | | | | | | | | | | | | | | | | Caused by the solution of PHPBB3-12990 PHPBB3-13033 | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-10-05 | 1 | -0/+2 | |
| |\ \ \ | |/ / | ||||||
| | * | | [ticket/12368] Always clean the cache prior to run the migrations | Tristan Darricau | 2014-10-05 | 1 | -0/+2 | |
| | | | | | | | | | | | | | PHPBB3-12368 | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-02 | 1 | -4/+42 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge pull request #2947 from rxu/ticket/13059 | Joas Schilling | 2014-10-02 | 1 | -4/+42 | |
| | |\ \ | | |/ | |/| | | | | [ticket/13059] Add core event to generate_page_link() | |||||
| | | * | [ticket/13059] Add core event to generate_page_link() | rxu | 2014-10-01 | 1 | -4/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to generate_page_link() to allow overriding/modifying pagination URLs. Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905 PHPBB3-13059 | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -14/+2 | |
| |\ \ \ | |/ / | ||||||
| | * | | [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224" | Joas Schilling | 2014-10-01 | 1 | -14/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292. PHPBB3-11224 | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -0/+51 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge pull request #3013 from VSEphpbb/ticket/13121 | Joas Schilling | 2014-10-01 | 1 | -0/+51 | |
| | |\ \ | | | | | | | | | | | | | [ticket/13121] Remove cache mode from style management module | |||||
| | | * | | [ticket/13121] Fix migration file | Matt Friedman | 2014-10-01 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | PHPBB3-13121 | |||||
| | | * | | [ticket/13121] Remove cache mode from style management module | Matt Friedman | 2014-10-01 | 1 | -0/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13121 PHPBB3-13121 | |||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -2/+14 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge pull request #2460 from Nicofuma/ticket/11224 | Joas Schilling | 2014-10-01 | 1 | -2/+14 | |
| | | | | | | | | | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined | |||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -2/+2 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge pull request #2545 from ptitlazy/ticket/12657 | Joas Schilling | 2014-10-01 | 1 | -2/+2 | |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/12657] Add a test file for base case of command cache:purge | |||||
| | | * | | | [ticket/12657] Add a test file for base case | LEZY Thomas | 2014-09-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12657 | |||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -2/+5 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Merge pull request #2888 from Nicofuma/ticket/12993 | Joas Schilling | 2014-10-01 | 1 | -2/+5 | |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | [ticket/12993] Improve get_user_ranks | |||||
| | | * | | | [ticket/12993] Return an array instead of reference passing | Tristan Darricau | 2014-08-19 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12993 | |||||
| | | * | | | [ticket/12993] Fix includes of functions_display | Tristan Darricau | 2014-08-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12993 | |||||
| | | * | | | [ticket/12993] Rename to phpbb_get_user_rank | Tristan Darricau | 2014-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12993 | |||||
| | | * | | | [ticket/12993] Fix user_loader and memberlist | Tristan Darricau | 2014-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12993 | |||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Andreas Fischer | 2014-09-30 | 1 | -1/+1 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13111] Dropdown options are already an array in the field data | |||||
| | * | | | | Merge pull request #3008 from nickvergessen/ticket/13111 | Andreas Fischer | 2014-09-30 | 1 | -1/+1 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13111] Dropdown options are already an array in the field data * nickvergessen/ticket/13111: [ticket/13111] Dropdown options are already an array in the field data | |||||
| | | * | | | | [ticket/13111] Dropdown options are already an array in the field data | Joas Schilling | 2014-09-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13111 | |||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Andreas Fischer | 2014-09-30 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13118] Correctly use the provided datetime class | |||||
| | * | | | | | Merge pull request #3007 from nickvergessen/ticket/13118 | Andreas Fischer | 2014-09-30 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13118] Correctly use the provided datetime class * nickvergessen/ticket/13118: [ticket/13118] Correctly use the provided datetime class | |||||
| | | * | | | | | [ticket/13118] Correctly use the provided datetime class | Joas Schilling | 2014-09-30 | 1 | -1/+1 | |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | PHPBB3-13118 | |||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-09-30 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql | |||||
| | * | | | | | Merge pull request #3003 from nickvergessen/ticket/13117 | Nils Adermann | 2014-09-30 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql | |||||
| | | * | | | | | [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql | Joas Schilling | 2014-09-29 | 1 | -1/+1 | |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unintended change from 95ab4b3e931521ce3c56068478311f0c04f713cc PHPBB3-13117 | |||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-09-29 | 1 | -7/+10 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13113] Updates the base url only when the front-end isn't app.php | |||||
| | * | | | | | [ticket/13113] Updates the base url only when the front-end isn't app.php | Tristan Darricau | 2014-09-28 | 1 | -7/+10 | |
| | |/ / / / | | | | | | | | | | | | | | | | PHPBB3-13113 | |||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Andreas Fischer | 2014-09-25 | 1 | -18/+21 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" [ticket/13105] Add a test for relative dates | |||||
| | * | | | | Merge pull request #2995 from nickvergessen/ticket/13105 | Andreas Fischer | 2014-09-25 | 1 | -18/+21 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13105] Future relative dates are always displayed as "Tomorrow" * nickvergessen/ticket/13105: [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" [ticket/13105] Add a test for relative dates | |||||
| | | * | | | | [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" | Joas Schilling | 2014-09-25 | 1 | -18/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13105 | |||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |