aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | [feature/prune-users] Fixed user id check in undelivered users loop.Oleg Pudeyev2011-05-081-1/+1
| * | | | | | | | | | | [feature/prune-users] Call sql_is_set once for author ids in user_delete.Oleg Pudeyev2011-05-081-4/+6
| * | | | | | | | | | | [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids.Oleg Pudeyev2011-05-081-2/+2
| * | | | | | | | | | | [feature/prune-users] Call sql_is_set for user ids once in user_delete.Oleg Pudeyev2011-05-081-7/+9
| * | | | | | | | | | | [feature/prune-users] Fixed whitespace in language file.Oleg Pudeyev2011-05-081-8/+8
| * | | | | | | | | | | Merge branch 'develop' into feature/prune-usersOleg Pudeyev2011-05-08139-2312/+3902
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'ee0db1a1d5f0150016d0971057f889f2366f9856' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '904bcb86a054ab6256da565098eb9bd8ab20414b' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.Oleg Pudeyev2011-05-081-2/+2
| * | | | | | | | | | | | | | Merge commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9' into feature/prune-usersOleg Pudeyev2011-05-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-usersOleg Pudeyev2011-05-084-14/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-084-45/+161
| * | | | | | | | | | | | | | | | | [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.Oleg Pudeyev2011-05-081-40/+1
| * | | | | | | | | | | | | | | | | [feature/prune-users] Rework user_delete() functions_user.phpJosh Woody2011-05-083-126/+149
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'p/ticket/11159' into developAndreas Fischer2012-11-085-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | [ticket/11159] Static public is the currently approved order.Oleg Pudeyev2012-11-065-5/+5
* | | | | | | | | | | | | | | | | | Merge PR #1039 branch 'p/ticket/11154' into developOleg Pudeyev2012-11-071-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | [ticket/11154] Do not try to load any extensions when installing.Oleg Pudeyev2012-11-071-1/+11
* | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'p/ticket/11081' into develop-olympusAndreas Fischer2012-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | [ticket/11081] Drop duplicated </td> in subsilver captcha qa template.Oleg Pudeyev2012-11-061-1/+1
* | | | | | | | | | | | | | | | | | | Merge PR #722 branch 'Senky/ticket/9918' into developOleg Pudeyev2012-11-062-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [ticket/9918] default values in request_var changed to one stringSenky2012-04-152-3/+3
| * | | | | | | | | | | | | | | | | | | [ticket/9918] $redirect variable used from nowSenky2012-04-092-6/+6
* | | | | | | | | | | | | | | | | | | | Merge PR #717 branch 'develop-olympus' into developOleg Pudeyev2012-11-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge PR #717 branch 'NeoAdonis/ticket/10661' into develop-olympusOleg Pudeyev2012-11-061-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | [ticket/10661] Added &nbsp; to enumerated recipients (prosilver)Adonais Romero González2012-04-051-3/+3
* | | | | | | | | | | | | | | | | | | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-0612-31/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [ticket/10845] Removed one empty line that wasn't supposed to be thereBruno Ais2012-06-141-1/+0
| * | | | | | | | | | | | | | | | | | | [ticket/10845] Two of the three colouns were missing in the DB update fileBruno Ais2012-05-061-1/+3
| * | | | | | | | | | | | | | | | | | | [ticket/10845] Remove censor from textBruno Ais2012-05-022-3/+6
| * | | | | | | | | | | | | | | | | | | [ticket/10845] Now it shows the preview post parsedBruno Ais2012-05-011-2/+2
| * | | | | | | | | | | | | | | | | | | [ticket/10845] Changed the report system. Now it saves posts with the bbcodeBruno Ais2012-05-019-25/+48
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEADNils Adermann2012-11-063-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #1035 from p/ticket/11159-olympusNils Adermann2012-11-0610-19/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-11-0610-19/+19
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge PR #858 branch 'callumacrae/ticket/10947' into developOleg Pudeyev2012-11-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | [ticket/10947] Fixed quickmod autosubmit functionality.Callum Macrae2012-06-201-0/+4
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-051-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'unknownbliss/ticket/111642' into develop-olympusAndreas Fischer2012-11-051-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | [ticket/11164] Update composer.pharUnknown Bliss2012-11-041-0/+0
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'p/ticket/10933-lite' into developIgor Wiedler2012-11-0312-81/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.Oleg Pudeyev2012-11-021-64/+5
| * | | | | | | | | | | | | | | | | | | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-028-9/+14
| * | | | | | | | | | | | | | | | | | | [ticket/10933] Expanded prose documentation for phpbb_extension_provider.Oleg Pudeyev2012-11-021-2/+10
| * | | | | | | | | | | | | | | | | | | [ticket/10933] Specify empty template path for absolute includephp test.Oleg Pudeyev2012-11-021-1/+1
| * | | | | | | | | | | | | | | | | | | [ticket/10933] Useful documentation for template locate functionOleg Pudeyev2012-11-021-2/+34
| * | | | | | | | | | | | | | | | | | | [ticket/10933] Typo fixesOleg Pudeyev2012-11-022-2/+2
| * | | | | | | | | | | | | | | | | | | [ticket/10933] Initialize template context when template is constructed.Oleg Pudeyev2012-11-022-3/+2
|/ / / / / / / / / / / / / / / / / / /