aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-251-67/+0
|\
| * [ticket/13106] Remove \phpbb\di\pass\kernel_pass.phpJakub Senko2014-09-251-67/+0
* | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-241-1/+1
|\ \ | |/
| * Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-09-241-1/+1
| |\
| | * [ticket/13086] String replaces 50 with 20Mario Skouat2014-09-241-1/+1
| | * [ticket/13096] Add phpbb_ prefix to ldap_escape()Jakub Senko2014-09-231-2/+2
| | * Merge pull request #2981 from nickvergessen/ticket/10729Marc Alexander2014-09-231-8/+20
| | |\
| | * \ Merge pull request #2350 from Nicofuma/ticket/11480Joas Schilling2014-08-011-1/+1
| | |\ \
* | | \ \ Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13087] Correctly link to user profile when contact field has no URLJoas Schilling2014-09-241-1/+1
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-2410-69/+99
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2844 from marc1706/ticket/12858Joas Schilling2014-09-2411-72/+110
| |\ \ \ \
| | * | | | [ticket/12858] Properly format UTC offset in footerMarc Alexander2014-09-191-1/+1
| | * | | | [ticket/12858] Directly return and use timezone selectsMarc Alexander2014-09-175-9/+5
| | * | | | [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefixMarc Alexander2014-09-174-35/+35
| | * | | | [ticket/12858] Fix timezone select display in subsilver2Marc Alexander2014-09-171-3/+11
| | * | | | [ticket/12858] Fix timezone display on acp users pageMarc Alexander2014-09-172-5/+11
| | * | | | [ticket/12858] Remove hardcoded language entries from timezone selectsMarc Alexander2014-09-174-44/+48
| | * | | | [ticket/12858] Use UTC for time info in footer and hide offset if it's 0Marc Alexander2014-09-171-1/+6
| | * | | | [ticket/12858] Generate timezone selects with template loopMarc Alexander2014-09-177-19/+38
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-244-2/+108
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2954 from rxu/ticket/13055Joas Schilling2014-09-244-2/+108
| |\ \ \ \ \
| | * | | | | [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-184-2/+108
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-241-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #2983 from Senky/ticket/13094Joas Schilling2014-09-241-4/+4
| |\ \ \ \ \ \
| | * | | | | | [ticket/13094] Condition search properlyJakub Senko2014-09-221-4/+4
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #2988 from prototech/ticket/13011Andreas Fischer2014-09-231-4/+0
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.Cesar G2014-09-231-4/+0
* | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #2985 from nickvergessen/ticket/13048Andreas Fischer2014-09-231-3/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/13048] Only do not update the session page for ajax requestsJoas Schilling2014-09-231-3/+4
* | | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2982 from marc1706/ticket/13070Andreas Fischer2014-09-231-3/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | [ticket/13070] Use old 'template' class for template class hookMarc Alexander2014-09-221-3/+3
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-09-233-1/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeusCesar G2014-09-231-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/12889] Fix multiple select listshanakin2014-09-231-0/+4
| * | | | | | | | | Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeusCesar G2014-09-232-1/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/13082] Repair fixJakub Senko2014-09-212-3/+8
| | * | | | | | | | | [ticket/13082] Join classesJakub Senko2014-09-211-1/+1
| | * | | | | | | | | [ticket/13082] move style to css fileJakub Senko2014-09-202-1/+5
| | * | | | | | | | | [ticket/13082] Replace float by text-alignJakub Senko2014-09-201-1/+1
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | [ticket/13097] Add missing unit typehanakin2014-09-231-1/+1
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2937 from Senky/ticket/13027Joas Schilling2014-09-231-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | [ticket/13027] round to floorJakub Senko2014-09-091-1/+1
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-231-14/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2974 from hanakin/ticket/13080Joas Schilling2014-09-231-14/+11
| |\ \ \ \ \ \ \ \ \