History: Where to commit
Comparing version 376 with version 377
Go to current version| Lines: 6-15 | Lines: 6-15 | ||
| Commit status and order for each open branch: | Commit status and order for each open branch: | ||
| {FANCYTABLE(head="__Name__ |__Currently this is git branch__| __What is allowed in this branch__ | __Before commiting here, first commit to__ ")} | {FANCYTABLE(head="__Name__ |__Currently this is git branch__| __What is allowed in this branch__ | __Before commiting here, first commit to__ ")} | ||
| - | __Dev__|[https://gitlab.com/tikiwiki/tiki/commits/master|__master__ (trunk)] (future 28x) | Functional [[ENH]ancements and new features, [[FIX]es and [[TRA]nslations %%% 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 [[REF]actoring or cosmetic changes. %%% Also: {MOUSEOVER(label="Update language strings")}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.{MOUSEOVER}. If you commit to master, and after you want to commit to a stable branch, please see how to ((git cherry-pick)). | This is the first place to propose a merge request (MR) __Next Stable__ | [https://gitlab.com/tikiwiki/tiki/-/tree/27.x|branches/27.x] | Exists only between the time Dev has been branched into the next stable, and the next stable .0 release has been released. Bug fixes and Translations only |Dev Dev__Current Stable__ | [https://gitlab.com/tikiwiki/tiki/-/tree/26.x|branches/26.x] | Bug fixes and minor safe enhancements | Dev, Next Stable (if ) __Previous Stable__ | None | Exists only until .1 release of Current Stable has been released. Then EoL or becomes the Previous Stable LTS | DevStable Current Stable__Previous Stable; LTS__|[https://gitlab.com/tikiwiki/tiki/-/tree/24.x|branches/24.x] | Minor safe enhancements, fixes and translations backported from Current Stable or Next Stable | Dev, Stable Stable or Next Stable__Security fixes only; LTS__ |[https://gitlab.com/tikiwiki/tiki/-/tree/21.x|branches/21.x] | Security fixes only | Dev, Current Stable or Next Stable, Previous Stable LTS |
+ | __Dev__ ~|~ [https://gitlab.com/tikiwiki/tiki/commits/master|__master__ (trunk)] (future 28x) ~|~ Functional [[ENH]ancements and new features, [[FIX]es and [[TRA]nslations %%% 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 [[REF]actoring or cosmetic changes. %%% Also: {MOUSEOVER(label="Update language strings")}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.{MOUSEOVER}. If you commit to master, and after you want to commit to a stable branch, please see how to ((git cherry-pick)). ~|~ This is the first place to propose a merge request (MR) __Next Stable__ ~|~ [https://gitlab.com/tikiwiki/tiki/-/tree/27.x|branches/27.x] ~|~ Exists only between the time Dev has been branched into the next stable, and the next stable .0 release has been released. Bug fixes and Translations only ~|~Dev Dev__Current Stable__ ~|~ [https://gitlab.com/tikiwiki/tiki/-/tree/26.x|branches/26.x] ~|~ Bug fixes and minor safe enhancements ~|~ Dev, Next Stable (if ) __Previous Stable__ ~|~ None ~|~ Exists only until .1 release of Current Stable has been released. Then EoL or becomes the Previous Stable LTS ~|~ DevStable Current Stable__Previous Stable; LTS__ ~|~ [https://gitlab.com/tikiwiki/tiki/-/tree/24.x|branches/24.x] ~|~ Minor safe enhancements, fixes and translations backported from Current Stable or Next Stable ~|~ Dev, Stable Stable or Next Stable__Security fixes only; LTS__ ~|~ [https://gitlab.com/tikiwiki/tiki/-/tree/21.x|branches/21.x] ~|~ Security fixes only ~|~ Dev, Current Stable or Next Stable, Previous Stable LTS |
| {FANCYTABLE} | {FANCYTABLE} | ||
History
| Information | Version | ||||||
|---|---|---|---|---|---|---|---|
| 18 Mar 26 01:05 UTC bienvenu ushindi Update Where to Commit section | 396 | ||||||
| 27 Feb 26 15:45 UTC Benoit Grégoire | 395 | ||||||
| 27 Feb 26 15:43 UTC Benoit Grégoire Emphasise that backports shouldn't be automatic... | 394 | ||||||
| 06 Feb 26 12:44 UTC bienvenu ushindi | 393 | ||||||
| 19 Nov 25 14:14 UTC Benoit Grégoire Update for release of Tiki 29.0 | 392 | ||||||
| 24 Sep 25 11:07 UTC Marc Laporte Label name update | 391 | ||||||
| 18 Sep 25 15:17 UTC luci | 390 | ||||||
| 29 Aug 25 14:52 UTC Benoit Grégoire | 389 | ||||||
| 29 Aug 25 14:51 UTC Benoit Grégoire | 388 | ||||||
| 24 Jul 25 20:32 UTC Rodriguez Nyiringabo Fix | 387 | ||||||
| 24 Jul 25 20:19 UTC Rodriguez Nyiringabo Fix | 386 | ||||||
| 24 Jul 25 20:12 UTC Rodriguez Nyiringabo Fix error | 385 | ||||||
| 24 Jul 25 10:36 UTC bienvenu ushindi | 384 | ||||||
| 24 Jul 25 09:42 UTC bienvenu ushindi | 383 | ||||||
| 18 Nov 24 13:47 UTC Marc Laporte | 382 | ||||||
| 18 Nov 24 13:45 UTC Marc Laporte Adding a section for exceptions | 381 | ||||||
| 16 Nov 24 15:11 UTC Baraka Kinywa Fix typo Approuve => Approve | 380 | ||||||
| 15 Nov 24 22:25 UTC benjamin.shako Document how to comment on tasks on gitlab to ensure collaboration | 379 | ||||||
| 27 Oct 24 00:11 UTC Rodriguez Nyiringabo | 378 | ||||||
| 12 May 24 16:43 UTC lindon Use ~|~ table cell separators for the table body to avoid pipes in links being interpreted as table cell dividers | 377 | ||||||
| 22 Apr 24 13:47 UTC Benoit Grégoire Update after branching | 376 | ||||||
| 08 Apr 24 12:31 UTC Benoit Grégoire | 375 | ||||||
| 04 Jan 24 22:05 UTC Benoit Grégoire | 374 | ||||||
| 03 Oct 23 09:51 UTC Lupundu Kalekwa Yan | 373 | ||||||
| 09 Aug 23 23:43 UTC Marc Laporte Cypht | 372 | ||||||