aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-0120-43/+51
|\
| * Merge remote-tracking branch 'cyberalien/ticket/10733' into developIgor Wiedler2012-04-0114-29/+251
| |\
| | * [ticket/10733] Fixing testVjacheslav Trushkin2012-04-011-7/+7
| | * [ticket/10733] Removing static from data providersVjacheslav Trushkin2012-04-0111-26/+26
| * | Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-04-010-0/+0
| |\ \
| | * | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-012-4/+4
| * | | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-012-2/+2
| * | | Merge remote-tracking branch 'cyberalien/ticket/10735' into developIgor Wiedler2012-03-316-85/+62
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'brunoais/ticket/10705' into developDavid King2012-03-315-7/+7
| |\ \ \ \
| | * | | | [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2Bruno Ais2012-03-292-3/+3
| | * | | | [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilverBruno Ais2012-03-292-3/+3
| | * | | | [ticket/10705] Change WARNINGS_ZERO_TOTAL in en languageBruno Ais2012-03-291-1/+1
| * | | | | Merge branch 'develop-olympus' into developIgor Wiedler2012-03-312-1/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympusIgor Wiedler2012-03-312-1/+9
| | |\ \ \ \
| | | * | | | [Ticket/10675] Correct language string ATTACH_DISK_FULLRichard Foote2012-03-311-1/+1
| | | * | | | [ticket/10675] Add disk full language string when posting attachmentsRichard Foote2012-03-192-1/+9
| | * | | | | Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympusIgor Wiedler2012-03-301-0/+1
| | |\ \ \ \ \
| | | * | | | | [feature/event-dispatcher] Adding composer.phar to .gitignore for olympusMichael Cullum2012-03-301-0/+1
* | | | | | | | [ticket/10665] INCLUDEJS unit testVjacheslav Trushkin2012-04-012-0/+53
* | | | | | | | [ticket/10665] Changing template compiler testVjacheslav Trushkin2012-04-011-1/+1
* | | | | | | | [ticket/10665] INCLUDEJS template changesVjacheslav Trushkin2012-04-014-1/+5
* | | | | | | | [ticket/10665] INCLUDEJS template tagVjacheslav Trushkin2012-04-013-5/+109
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | [ticket/10733] Adding test for locatorVjacheslav Trushkin2012-04-011-0/+84
* | | | | | | [ticket/10733] Adding functions to locate resourcesVjacheslav Trushkin2012-04-013-0/+115
* | | | | | | [ticket/10733] Extending get_source_file_for_handleVjacheslav Trushkin2012-03-311-4/+27
| |_|_|_|_|/ |/| | | | |
* | | | | | [ticket/10735] Changing locator paths structureVjacheslav Trushkin2012-03-316-85/+62
|/ / / / /
* | | | | Merge remote-tracking branch 'github-igorw/feature/class-prefix' into developNils Adermann2012-03-3122-875/+879
|\ \ \ \ \
| * | | | | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-3111-15/+12
| * | | | | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-3114-860/+867
* | | | | | Merge pull request #676 from cyberalien/feature/merging-style-componentsIgor Wiedler2012-03-311-2/+2
|\ \ \ \ \ \
| * | | | | | [feature/merging-style-components] Fixing typos in database updaterVjacheslav Trushkin2012-03-311-2/+2
* | | | | | | Merge pull request #675 from cyberalien/feature/merging-style-componentsIgor Wiedler2012-03-311-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | [feature/merging-style-components] Fixing typo in database updaterVjacheslav Trushkin2012-03-311-1/+1
* | | | | | Merge remote-tracking branch 'cyberalien/feature/merging-style-components' in...Igor Wiedler2012-03-3155-3718/+1824
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [feature/merging-style-components] Fix back link on install pageIgor Wiedler2012-03-311-1/+1
| * | | | | [feature/merging-style-components] Fix for unit testsVjacheslav Trushkin2012-03-312-2/+2
| * | | | | [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-317-17/+17
| * | | | | [feature/merging-style-components] Renaming "delete" to "uninstall" for stylesVjacheslav Trushkin2012-03-312-34/+37
| * | | | | [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-317-17/+27
| * | | | | [feature/merging-style-components] Fixing few errors in acp_stylesVjacheslav Trushkin2012-03-311-6/+1
| * | | | | [feature/merging-style-components] Fix notices in acp_stylesIgor Wiedler2012-03-311-2/+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-3181-627/+1716
| |\ \ \ \ \
| * | | | | | [feature/merging-style-components] Changing acp_styles textVjacheslav Trushkin2012-03-301-1/+1
| * | | | | | Merge remote-tracking branch 'upstream/develop' into feature/merging-style-co...Vjacheslav Trushkin2012-03-2965-97/+766
| |\ \ \ \ \ \
| * | | | | | | [feature/merging-style-components] Updating test casesVjacheslav Trushkin2012-03-154-5/+5
| * | | | | | | [feature/merging-style-components] Updating style initializationVjacheslav Trushkin2012-03-156-14/+14
| * | | | | | | [feature/merging-style-components] Changing style classVjacheslav Trushkin2012-03-151-5/+70
| * | | | | | | [feature/merging-style-components] Changing template classVjacheslav Trushkin2012-03-151-65/+11
| * | | | | | | [feature/merging-style-components] Changing resource locatorVjacheslav Trushkin2012-03-151-27/+40