aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-06-201-1/+1
|\
| * Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11Andreas Fischer2012-06-201-1/+1
| |\
| | * [ticket/10925] Clarify installation requirements for SQLitePatrick Webster2012-06-191-1/+1
* | | Merge pull request #779 from callumacrae/ticket/10855Nils Adermann2012-06-181-4/+34
|\ \ \
| * | | [ticket/10855] Fixed a couple issues in coding guidelines.Callum Macrae2012-05-221-2/+2
| * | | [ticket/10855] Added JS camelCaps info to guidelines.Callum Macrae2012-05-031-2/+8
| * | | [ticket/10855] Added array trailing commas info in js to guidelines.Callum Macrae2012-05-031-1/+1
| * | | [ticket/10855] Modified coding guidelines to reflect JS brace changes.Callum Macrae2012-04-291-1/+25
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-311-19/+136
|\ \ \ \ | | |/ / | |/| |
| * | | [develop-olympus] Add changelog for 3.0.11 release.Andreas Fischer2012-05-311-19/+136
| * | | [develop-olympus] Bumping version numbers to final for 3.0.11 releases.Andreas Fischer2012-05-311-2/+2
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-0/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympusNils Adermann2012-05-311-0/+1
| |\ \ \
| | * | | [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.Andreas Fischer2012-05-311-0/+1
| | | |/ | | |/|
* | | | Merge PR #725 branch 'develop-olympus' into developOleg Pudeyev2012-05-101-4/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge PR #725 branch 'Senky/ticket/9896' into develop-olympusOleg Pudeyev2012-05-101-4/+4
| |\ \
| | * | [ticket/9896] Links changedSenky2012-05-101-5/+5
| * | | [ticket/10843] Backport changes to install language.Oleg Pudeyev2012-05-051-4/+4
| * | | [ticket/10834] Backport general development language changes to 3.0.Oleg Pudeyev2012-05-051-12/+17
| | |/ | |/|
* | | Merge PR #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-261-1/+1
|\ \ \
| * | | [ticket/10161] added fullstop to the end of sentenceSenky2012-04-261-1/+1
| * | | [ticket/10161] coding-guidelines.html updatedSenky2012-04-261-1/+1
* | | | Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-194-46/+57
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10688] Update install.html for 3.1 and current practices.Oleg Pudeyev2012-04-121-8/+12
| * | | [ticket/10688] Update readme for 3.1 and current practices.Oleg Pudeyev2012-04-111-24/+31
| * | | [ticket/10688] Changed 3.0 to 3.1 in docsShibu Lijack2012-04-114-16/+16
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-121-2/+3
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.Andreas Fischer2012-04-111-2/+2
| * | | [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.Andreas Fischer2012-04-111-0/+1
| | |/ | |/|
* | | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-311-1/+1
* | | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-312-3/+3
* | | [feature/merging-style-components] Updating styles in coding guidelinesVjacheslav Trushkin2012-03-311-13/+17
* | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-311-0/+3
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-303-6/+6
| |\ \ \
| * | | | [feature/event-dispatcher] Add Symfony2 to AUTHORSIgor Wiedler2012-01-081-0/+3
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'upstream/develop' into feature/merging-style-co...Vjacheslav Trushkin2012-03-293-6/+6
|\ \ \ \ | | |/ / | |/| |
| * | | [task/php5.3] Updated range of tested PHP versionsDavid King2012-03-261-1/+1
| * | | [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to...David King2012-03-253-5/+5
| |/ /
* | | [feature/merging-style-components] Updating coding guidelinesVjacheslav Trushkin2012-03-141-13/+14
|/ /
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-028-12/+11
|\ \ | |/
| * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-027-9/+9
| * [ticket/9916] Changing coding guidelines licenseUnknown2012-01-021-3/+2
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-117/+121
|\ \ | |/
| * [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.Andreas Fischer2011-12-161-117/+121
* | [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 placesDavid King2011-12-121-3/+3
* | Merge branch 'develop-olympus' into developNils Adermann2011-12-011-1/+1
|\ \ | |/
| * [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.Andreas Fischer2011-11-291-1/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-281-1/+0
|\ \ | |/
| * [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.Andreas Fischer2011-11-281-1/+0
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-0/+8
|\ \ | |/