Loading...
 
Where to commit? Type of page »  Developers documentation

Where to commit

  • You have fixed something?
  • You have added a feature?
  • You want to share back?


The goal is to make the feature as generic as possible so it may be used in various contexts. Also, we must be sure it doesn't duplicate another existing feature.

Once you have read up on how to commit code, a very important decision is where to commit? Stable-LTS, Stable, Dev (trunk), Mods or experimental? You may want to checkout the Version lifecycle.

See also: Freeze and Slush

Dashboard

Quick overview intended to help know where to commit to right now in most situations. See Branches section below for more detailed explanations.

Snapshot
  • Automatic merging?: ''Only from 13.x to trunk (a.k.a. Semi-automatic merging period')' If you want to make a fix to 12.x LTS, please commit the fix in 13.x, and then backport to 12.x. For more details - see table below.

  • Upcoming releases:
    • 13.0 will be releasing soon (see Tiki13 for more information), 12.2 LTS out now!


Commit status and order for each open branch:

I want to commit to: What is allowed: Commit first to: Afterwards commit to:
future 14x Functional enhancements and new features trunk
13x Fixes for 13.0 (and trunk) 13.x 12.x (if applicable)
12x Fixes for the LTS 12.3 13.x Bug fixes: 12x
Security fixes: 12x, 9x & 6x
9x Security fixes only 13x & 12x 9x
6x Security fixes only 13x, 12x & 9x 6x



Branches


Root: https://svn.code.sf.net/p/tikiwiki/code/

NameBRANCHComments
Upcoming Releasebranches/13.xBug fixes only.
Stable LTSbranches/12.xBug and regression fixes, as well as minor and safe enhancements only. Backport from trunk.
Previous Stable LTSbranches/9.xSecurity fixes and translations only.
Devtrunk (will become 14.x )Most development (new features) happens here. New features, need to be functional, but don't need to be complete. In theory, should be releasable at any time. This is the place for refactoring. Cosmetic code changes should be done here after the Semi-automatic merging period has ended. Also: Update language stringsIf you must change the English version (but are not changing the meaning and so the translations are still valid, please use mass spelling correction. If you can't use that, just add to pending text corrections. . If you commit to trunk, and after you want to commit to a stable branch, please see how to merge a commit from trunk.
Old stable LTSbranches/6.xOnly security fixes and translations. Commits to LTS must have been developed and tested previously on higher branches (at least trunk) unless they do not apply there (for example, a fix to a feature that was removed later). See here for more info.
Modsmods in trunkIf your feature is too specific or too experimental for the main branch, it can go into mods. Please read: To Mods Or Not To Mods. There are no branches for mods.
Experimental branchesmanyAll developments for things that are not stable enough yet or just intended as proof of concept before the real work starts. These branches will never become a released branch directly, the author of the experimental branch must move the functionality in the Dev branch when it's ready.

Definition of "security-only" phase

  • The "security-only" of the LTS period is intended for security fixes, but could include a few bug fixes as well.
    • We will review security vulnerabilities reported to the Security Team
    • Publish a fix or a way to deactivate the feature.
      • If the included code doesn't have a patch for that version
  • What if a security vulnerability requires major code changes, that are not suitable for LTS?
    • We'll disable the feature via System Configuration so you can can choose to use it knowing the risks, decide not to use it, or upgrade.
  • The documentation at doc.tiki.org is kept up to date for more recent versions, so expect to see there some documentation about features not available in your Tiki.

Other notes

  • The community will handle merges from stable to dev, with help from a merging script during Semi-automatic merging period
  • On stable branches, try to avoid any changes to the database as this complicates things and increases possibilities for errors. If you must, please see: Database Schema Upgrade
  • If you must change the English version (but are not changing the meaning and so the translations are still valid, please use mass spelling correction. If you can't use that, just add to Pending text corrections
  • If we are close to a release, and you have a change with a risk of regression, try to consult the release manager.
  • There are some things that are black and white and there are many shades of gray. In case of doubt, ask on the Dev Mailing List


Legacy

1.9.x, 2.x, 3.xLTS, 4.x, 5.x, 7.x, 8.x, 10.x and 11.x.
There are no more planned releases of these versions. If you are running one and commit a fix , please merge manually your fix to the appropriate branch.

Examples

[+]

Search Wishes (subject only) [Toggle]

Keywords [Toggle]

The following is a list of keywords that should serve as hubs for navigation within the Tiki development and should correspond to documentation keywords.

Each feature in Tiki has a wiki page which regroups all the bugs, requests for enhancements, etc. It is somewhat a form of wiki-based project management. You can also express your interest in a feature by adding it to your profile. You can also try out the Dynamic filter.

Accessibility (WAI & 508)
Accounting 7.x
Administration
Ajax 2.x
Articles & Submissions
Backlinks
Banner
Batch 6.x
BigBlueButton audio/video/chat/screensharing (5.x)
Blog
Bookmark
Browser Compatibility
Calendar
Category
Chat
Comment
Communication Center
Consistency
Contacts Address book
Contact us
Content template
Contribution 2.x
Cookie
Copyright
Credits 6.x
Custom Home (and Group Home Page)
Database MySQL - MyISAM
Database MySQL - InnoDB
Date and Time
Debugger Console
Directory (of hyperlinks)
Documentation link from Tiki to doc.tiki.org (Help System)
Docs 8.x
DogFood
Draw 7.x
Dynamic Content
Preferences
Dynamic Variable
External Authentication
FAQ
Featured links
Feeds (RSS)
File Gallery
Forum
Friendship Network (Community)
Group
Help
Hotword
HTML Page
i18n (Multilingual, l10n, Babelfish)
Image Gallery
Import-Export
Install
Integrator
Interoperability
Inter-User Messages
InterTiki
jQuery
Kaltura video management
Karma
Live Support
Logs (system & action)
Lost edit protection
Mail-in
Map
Menu
Meta Tag
Missing features
Visual Mapping 3.x
Mobile Tiki and Voice Tiki
Mods
Module
MultiTiki
MyTiki
Newsletter
Notepad
OS independence (Non-Linux, Windows/IIS, Mac, BSD)
Payment 5.x
Performance Speed / Load / Compression / Cache
Permission
Poll
Profiles
Quiz
Rating
Report
Score
Search engine optimization (SEO)
Search
Security
Semantic links 3.x
Shopping Cart 5.x
Shoutbox
Site Identity
Slideshow
Smarty Template
Social Networking
Spam protection (Anti-bot CATPCHA)
Spellcheck
Spreadsheet
Staging and Approval
Stats
Survey
Syntax Highlighter (Codemirror)
Tags 2.x
Task
Tell a Friend, alert + Social Bookmarking
TikiTests 2.x
Theme
Toolbar (Quicktags)
Trackers
TRIM
User Administration
User Files
User Menu
Watch
WebHelp
Webmail and Groupmail
WebServices 3.x
Wiki 3D
Wiki History, page rename, etc
Wiki plugins extends basic syntax
Wiki syntax text area, parser, etc
Wiki structure (book and table of content)
Workspace and perspectives 4.x
WYSIWTSN 4.x
WYSIWYCA
WYSIWYG 2.x
XMLRPC




Spaces [Toggle]