aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-022-2/+2
|\
| * [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-032-2/+2
* | Merge remote-tracking branch 'remotes/bantu/ticket/11368' into develop-olympusNathaniel Guse2013-03-021-1/+1
|\ \ | |/ |/|
| * [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
|/
* Merge remote-tracking branch 'naderman/ticket/10986' into develop-olympusAndreas Fischer2013-02-241-1/+23
|\
| * [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generatedNils Adermann2013-02-241-1/+23
|/
* Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-02-241-18/+32
|\
| * [ticket/11358] Changed the name of post parameter.erangamapa2013-02-241-2/+2
| * [ticket/11358] Changed the action parameter value to represent the link.erangamapa2013-02-241-20/+30
| * [ticket/11358] Enabled link making all users default for a group.erangamapa2013-02-241-2/+40
| * [ticket/11358] Removed redundant code and referred proper variable.erangamapa2013-02-241-40/+2
| * [ticket/11358] Success message even without selecting a user.erangamapa2013-02-241-0/+4
|/
* Merge branch 'ticket/11355' into develop-olympusNils Adermann2013-02-241-1/+5
|\
| * [ticket/11355] Referred proper variable when validating selection.erangamapa2013-02-241-1/+1
| * [ticket/11355] Wrong error message when no user is selected.erangamapa2013-02-241-1/+5
|/
* Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympusNils Adermann2013-02-241-1/+2
|\
| * [ticket/11361] Make sure that array passed to strtr() has the proper format.Andreas Fischer2013-02-231-1/+2
* | Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-ol...Nils Adermann2013-02-244-3/+10
|\ \
| * | [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-043-3/+2
| * | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-043-2/+10
* | | Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympusNils Adermann2013-02-241-1/+2
|\ \ \
| * | | [ticket/11122] Move rxu to 'Former Contributors' section.Andreas Fischer2013-02-241-1/+1
| * | | [ticket/11122] Add EXreaction to docs/AUTHORS.Andreas Fischer2013-02-241-0/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'github-bantu/ticket/7262' into develop-olympusNils Adermann2013-02-241-2/+21
|\ \ \ | |/ / |/| |
| * | [ticket/7262] Add note about set_config() not updating is_dynamic.Andreas Fischer2013-02-241-0/+3
| * | [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().Andreas Fischer2013-02-241-4/+6
| * | [ticket/7262] Backport set_config() and set_config_count() docs from develop.Andreas Fischer2013-02-241-2/+16
|/ /
* | Merge branch 'ticket/erangamapa/11196' into develop-olympusAndreas Fischer2013-02-121-1/+1
|\ \ | |/ |/|
| * [ticket/11196] Changed 401 response message in session.php.erangamapa2013-02-121-1/+1
|/
* Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympusAndreas Fischer2013-02-031-3/+3
|\
| * [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
* | Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympusAndreas Fischer2013-01-311-1/+1
|\ \
| * | [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
* | | Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympusNathaniel Guse2013-01-301-1/+1
|\ \ \ | |/ / |/| |
| * | [ticket/10050] removing prosilver editsSenky2013-01-241-1/+1
| * | [ticket/10050] adding .topicrow to template conditionSenky2013-01-222-2/+2
* | | Merge PR #1219 branch 'bantu/ticket/11343' into develop-olympusOleg Pudeyev2013-01-271-1/+1
|\ \ \ | |_|/ |/| |
| * | [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| * | [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| * | [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
|/ /
* | Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympusOleg Pudeyev2013-01-244-2/+59
|\ \
| * | [ticket/11337] Abort setup-webserver.sh script when an error occurs.Andreas Fischer2013-01-231-0/+1
| * | [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.Andreas Fischer2013-01-233-3/+3
| * | [ticket/11337] Silence nginx config file writing.Andreas Fischer2013-01-231-1/+1
| * | [ticket/11337] php-fpm.conf is no longer owned by root.Andreas Fischer2013-01-231-1/+1
| * | [ticket/11337] Run functional tests on travis using nginx and php-fpm.Andreas Fischer2013-01-234-0/+56
|/ /
* | Merge remote-tracking branch 'p/ticket/11295' into develop-olympusAndreas Fischer2013-01-231-2/+25
|\ \
| * | [ticket/11295] Drop tables rather than database for postgres in test suite.Oleg Pudeyev2012-12-261-2/+25
* | | Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympusAndreas Fischer2013-01-222-0/+9
|\ \ \
| * | | [ticket/11323] Backport include_define test to olympus.Oleg Pudeyev2013-01-132-0/+9