Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3487 from MateBartus/ticket/13697 | Tristan Darricau | 2015-04-16 | 82 | -658/+1860 |
|\ | |||||
| * | [ticket/13697] Moving filesystem related functions to filesystem service | MateBartus | 2015-04-16 | 82 | -658/+1860 |
* | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-16 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #3537 from RMcGirr83/ticket/13763 | Andreas Fischer | 2015-04-16 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | [ticket/13763] Fix typo in extension lang file | Richard McGirr | 2015-04-15 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch '3.1.x' | Dhruv | 2015-04-14 | 2 | -2/+55 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #3533 from Elsensee/ticket/13756 | Dhruv Goel | 2015-04-14 | 2 | -2/+55 |
| |\ \ | |||||
| | * | | [ticket/13756] Add test for generate_resize_string() | Oliver Schramm | 2015-04-12 | 1 | -0/+53 |
| | * | | [ticket/13756] Fix resize after upload with plupload | Oliver Schramm | 2015-04-11 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-10 | 3 | -2/+148 |
|\ \ \ | |/ / | |||||
| * | | [3.1.x] Update development version to 3.1.5-dev | Joas Schilling | 2015-04-10 | 3 | -3/+3 |
| * | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-04-10 | 8 | -9/+155 |
| |\ \ | |||||
| | * | | [prep-release-3.1.4] Add changelog for 3.1.4-RC1 | Joas Schilling | 2015-04-09 | 1 | -1/+116 |
| | * | | [prep-release-3.1.4] Add migration for 3.1.4-RC1 | Joas Schilling | 2015-04-09 | 1 | -0/+31 |
| | * | | Update version to 3.1.4-RC1 | Joas Schilling | 2015-04-09 | 6 | -8/+8 |
| |/ / | |||||
* | | | Merge branch '3.1.x' | Oliver Schramm | 2015-04-06 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #3525 from marc1706/ticket/13749 | Oliver Schramm | 2015-04-06 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | [ticket/13749] Add missing slash to base uri in helper route tests | Marc Alexander | 2015-04-06 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 3 | -1/+55 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #3392 from marc1706/ticket/13493 | Joas Schilling | 2015-04-06 | 3 | -1/+55 |
| |\ \ | |||||
| | * | | [ticket/13493] Append page name to base url if it doesn't contain it | Marc Alexander | 2015-02-11 | 3 | -1/+55 |
* | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 2 | -1/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #3492 from RMcGirr83/ticket/13710 | Joas Schilling | 2015-04-06 | 3 | -1/+30 |
| |\ \ \ | |||||
| | * | | | [ticket/13710] Allow template events near smilies display | RMcGirr83 | 2015-03-19 | 3 | -1/+30 |
* | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 2 | -0/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3488 from Crizz0/ticket/13701 | Joas Schilling | 2015-04-06 | 2 | -0/+16 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13701] Adds two new events to posting_pm_layout.html | Crizzo | 2015-03-13 | 2 | -0/+16 |
* | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 2 | -1/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #3517 from Wolfsblvt/ticket/13739 | Joas Schilling | 2015-04-06 | 3 | -1/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/13739] Add template core event posting_poll_body_options_after | Wolfsblvt | 2015-04-03 | 1 | -1/+1 |
| | * | | | | | [ticket/13739] Add template core event posting_poll_body_options_after | Wolfsblvt | 2015-04-03 | 1 | -1/+2 |
| | * | | | | | [ticket/13739] Add template core event posting_poll_body_options_after | Wolfsblvt | 2015-04-03 | 3 | -0/+10 |
* | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #3523 from Nicofuma/ticket/13747 | Joas Schilling | 2015-04-06 | 1 | -0/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/13747] Add assertions to test_validate_path_linux | Tristan Darricau | 2015-04-06 | 1 | -0/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3522 from nickvergessen/ticket/13522 | Oliver Schramm | 2015-04-06 | 1 | -4/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/13522] Fix globals for 3.2 in Q&A tests | Joas Schilling | 2015-04-06 | 1 | -4/+7 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-04-06 | 1 | -6/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #3458 from nickvergessen/ticket/8494 | Tristan Darricau | 2015-04-06 | 1 | -6/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/8494] Ignore errors from the database schema preparation | Joas Schilling | 2015-03-01 | 1 | -6/+4 |
* | | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 1 | -1/+23 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3437 from marc1706/ticket/12368 | Joas Schilling | 2015-04-06 | 1 | -1/+23 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/12368] Fix comment in docblock | Marc Alexander | 2015-03-26 | 1 | -1/+1 |
| | * | | | | | | | [ticket/12368] Correctly check if avatars migration is installed | Marc Alexander | 2015-02-24 | 1 | -1/+23 |
* | | | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #3409 from Senky/ticket/11424 | Joas Schilling | 2015-04-06 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [ticket/11424] Add space between control flow keywords and parenthesis | Jakub Senko | 2015-02-19 | 1 | -2/+2 |
| | * | | | | | | | | [ticket/11424] Handle race condition properly for Quick-Mod Tools | Jakub Senko | 2015-02-16 | 1 | -0/+25 |
* | | | | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3402 from brunoais/ticket/13621 | Joas Schilling | 2015-04-06 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ |