1.1.X-trunk coordination

[DarTar]

Please post a reference to this ticket in the commit comment everytime:

• you port code from trunk to branches/1.1.X or branches/1.2.X
• you commit code/fix issues in branches/1.1.X or branches/1.2.X that should also be committed to trunk

This should help avoid that issues fixed in 1.1.X or 1.2.X and marked as closed may still be lurking in trunk.

Related tickets

• #562 Coordination ticket for 1.1.6.4 changes

Tickets still to be ported to trunk (1.3)

• #884 checkversion timeout
• #154 Adding Random Tokens for Form Submissions
• #879 Stricter input validation for admin actions.

[OlivierBorowski]

(In [785]) Add missing "hidden" class, refs #575

[DarTar]

(In [786]) Replacing named color with hex value in the stylesheet, ports [448] from trunk to 1.1.6.4, refs #416 and #575 and fixes #579

[OlivierBorowski]

(In [797]) Initial revision of WikkaEdit in Trunk, refs #584, #578, #575

[OlivierBorowski]

(In [802]) Add an additionnal "div" for textarea decorations, this fixes the "textarea-width:100%" bug, refs #576, #575

[OlivierBorowski]

(In [803]) Use WikkaEdit as GUI editor (WikiEdit is not used anymore), refs #584, #578, #575 Add an additionnal "div" for textarea decorations, this fixes the "textarea-width:100%" bug, refs #576

[BrianKoontz]

(In [836]) Updated remaining error tags to use em.error CSS style; IncludeBuffered() now returns escaped error text with em.error formatting for consistency across application (refs #598).

[DarTar]

(In [842]) Adding a link to the homepage in the main wiki heading, ports [724] from trunk, refs #227 and #575 and #562

[DarTar]

(In [843]) Forgot a tiny bit from previous commit [842], refs #227 and #575 and #562

[BrianKoontz]

(In [855]) Replaced SQL with SavePage() call; added optional parameter to SavePage() to allow for page owner override. Refs #566.

[BrianKoontz]

This ticket is somewhat confusing to me...don't we plan on porting up most all changes in 1.1.6.4 to trunk? If that's the case, what exactly is the purpose of this ticket?

[DotMG]

For what I understand about the description, when you have finished a modification in 1.1.6.4, and you commit it, you should reference that modification into this ticket (as to be ported to trunk), unless you've already finished the port to trunk or if that commit will be done in few moments. When you close a ticket in 1.1.6.4, you should be sure that it is ported into trunk.

Sometimes, you have time to fix a bug in 1.1.6.4 branch but not yet ported it to trunk. There is also some commits in 1.1.6.4 that aren't yet ported to trunk.

[BrianKoontz]

(In [868]) Added more meaningful error messages during login and registration. Refs #622

[DarTar]

(In [870]) Updating documentation links in the source code, refs #632 and #575

[OlivierBorowski]

(In [872]) Split addToLine() into addToLine() and indent()

Use {{table}} syntax instead of table Add new function getSelectionContent() Add new function setTextAreaContent() Add new class SelRange instead of {start:x, end:y} Remove unused function setAreaConcent() Remove unused function getSelection() Fix a bug in addToLine() related to selection when more than 1 line is selected Remove strange loop in js_countTextAreaChars() Some cosmetic changes refs #578, #575

[OlivierBorowski]

(In [874]) Use new functions getSelectionContent(), setTextAreaContent(), SelRange() refs #578, #575

[DarTar]

(In [876]) Porting dbinfo action to trunk and creating default pages, refs #27 and #575

[DotMG]

(In [880]) On fresh install, adding default pages CategoryAdmin and DatabaseInfo.

refs #97, #27, #575. See also [876].

[DotMG]

(In [896]) [COORD] refs #644, #575

Value of SEARCH_RESULTS is now Search results: <strong>%1$s</strong> for <strong>%2$s</strong>

[DarTar]

[907] ports basic support for numbered revisions from 1.1.6.4 ([905]-[906]) to trunk, refs #650 and #499

[BrianKoontz]

(In [915]) These changes all stem from enabling the {{my*}} actions in AdminUsers. There is an important fix to the comment actions (hidden comments were being displayed) that needs to be ported to 1.1.7. New parameter ($user) added to Load...Comment() calls in main library.

Refs #25, #562, #575

[DotMG]

(In [919]) porting [472], [473], [528] and [535] to 1.1.6.4

• closing previous indent type if a new kind of indent is to come
• Permitting ---- after indent
• Matching lists at start of the page
• Supporting roman types for ordered list, differentiating capital and lowercases

refs #575

[DarTar]

(In [924]) Porting [166] to 1.1.6.4: incorrect formatting of lists in FormattingRules, refs #303 and #575

[DotMG]

(In [935]) Allow installation on https

This is a port of codes committed in trunk, but I couldn't find which changeset. This commit is to allow installation of wikka 1.1.6.4 on a https protocol.

refs #575

[DarTar]

Mahefa, if this is fully implemented as of 1.1.6.4, please add a note on WikkaReleaseNotes1164.

[DarTar]

(In [937]) Changing .keys and input styling in the installer to match 1.1.7, refs #575

[DotMG]

(In [941]) COORD of [940]

This commit is just about consistency and does not affect how Wikka works. Search Form (TextSearch) at the bottom of the page should have URL referring to page TextSearch, no matter which page are currently viewed. Before this commit, it refers to the same page that is viewed. I said It does not affect how Wikka works because this value is not used since there is an <input> tag inside the form.

refs #670, #575

[DarTar]

(In [949]) Changing styling for calendar action to match trunk, refs #575

[DarTar]

(In [953]) Porting new highscores action to trunk, refs #575 and #688

[BrianKoontz]

(In [956]) Version number removed from footer (except when logged in as admin user). Refs #680, #575.

[DarTar]

(In [976]) Simplified WikiCategory default page, refs #646 and #575

[DarTar]

(In [980]) Changing revisioninfo styling for consistency with trunk, refs #562 and #575

[DarTar]

(In [981]) Applying revisioninfo styling to /history handler, refs #562 and #575

[DarTar]

(In [982]) Applying revisioninfo styling to /diff handler, refs #562 and #575

[DarTar]

(In [984]) Porting [707] from trunk: preventing a diff can be requested (leading to an error) when there are no revisions for a page at all, refs #562 and #575

[BrianKoontz]

(In [1004]) Support for checkversion action, ported from 1.1.6.4. Refs #381, #575

[BrianKoontz]

(In [1013]) Create instance-specific URL param for wikka.css config entry to force reloading of stylesheet. Refs #600, #562, #575

[DarTar]

This ticket should now be used to reference all commits porting code already added to 1.1.6.4 but missing in trunk.

[BrianKoontz]

(In [1021]) Port of {{adminusers}} action to 1.1.7. Refs #575, #608.

[BrianKoontz]

(In [1021]) Partial port of {{adminpages}} action to 1.1.7. Refs #575, #722.

[BrianKoontz]

(In [1022]) Completed port of {{adminpages}}, minor edit to remove reverence to deprecated DB field in pages table. Refs #575, #722.

[BrianKoontz]

(In [1026]) Create sessions table for {{adminpages}} and default pages for {{adminpages}} and {{adminusers}}. Refs #575, #608, #722

[BrianKoontz]

Replying to OlivierBorowski:

(In [785]) Add missing "hidden" class, refs #575

Ported to 1.1.7.

[BrianKoontz]

Replying to BrianKoontz:

Replying to OlivierBorowski:

(In [785]) Add missing "hidden" class, refs #575

> Ported to 1.1.7.

Please disregard, responded to wrong message...

[DotMG]

(In [1066]) refs #761, #575

Replacing @wikka with _wikka

The change needs to be ported into trunk

[DotMG]

(In [1067]) refs #761, #575

Porting [1066] to trunk

[DarTar]

(In [1081]) Porting CSS from 1.1.6.4, refs #575

[DarTar]

(In [1082]) Porting CSS from 1.1.6.4, refs #575

[DarTar]

(In [1098]) Porting [932] from 1.1.6.4, refs #669 and #575

[DarTar]

(In [1099]) Porting [933] from 1.1.6.4, refs #669 and #575

[DarTar]

(In [1105]) Porting [958] to trunk, refs #575 and #597

[DarTar]

(In [1106]) Porting [774] to trunk, refs #575 and #572

[DarTar]

(In [1108]) Porting [934] to trunk, refs #672 and #575

[DarTar]

(In [1113]) Initial porting of changes in diff and history to trunk, refs #650, #702 and #575

[DarTar]

(In [1116]) Numbered revisions (porting changes in /show to trunk), refs #575 and #650

[DarTar]

(In [1119]) translation strings moved to lang file, refs #575

[DarTar]

(In [1120]) [m] translation strings moved to lang file, refs #575

[DotMG]

(In [1139]) refs #575

Porting a little part of [822], which seems to be forgotten, to trunk.

[DotMG]

(In [1141]) Adding/Updating default pages should be performed using update_default_page() to avoid having 2 copies of the same page with status 'Y' on the db.

refs #575

[DarTar]

(In [1232]) {{lastusers}} - porting [1231] to trunk, refs #575 and #654

[DotMG]

(In [1238]) refs #816, #575

porting [1237] to trunk: applying htmlspecialchars_ent to GetConfigValue(meta_keywords) and GetConfigValue(meta_description).

[DarTar]

(In [1276]) Adding meta generator tag to header, refs #839 and #575

[DarTar]

(In [1284]) Several GUI changes to show + revisions + diff + history handlers, ported from trunk, refs #844 and #770 and #575

[DarTar]

(In [1285]) Semantically correct use of <ins> and <del> in the formatter (porting from trunk, credits TormodH), refs #274 and #575

[DarTar]

Retargeting to 1.3. Code for this ticket may have already been committed to trunk, from which 1.3 will be branched. Consider backporting urgent issues to 1.2.X

[DarTar]

(In [1445]) backporting [134] from trunk: adds new config option "enable_user_host_lookup" to fix extreme slowness issue when looking up hostnames (thanks J_Rey for spotting this) refs #240 and #575

[BrianKoontz]

This task is no longer valid. Trunk merges will take place on the 1.3 branch (see #912), after which parallel branches will no longer exist.