Tiki-KGB: tablesorter: add latest version 2.12.0 and remove 2.11.1 from satis.json (only supposed to edit satis.json in trunk but added this version in 12.x so should reverse it out here just this once I think) Caarrie|away: joined #tikiwiki Tiki-KGB: 03lindonb r48185 10trunk/composer.json 10trunk/_htaccess 10trunk 10trunk/composer.lock
[MRG] Automatic merge, branches/12.x 48178 to 48184. Manually fixed conflicts in tim-create, composer.json and composer.lock
03lindonb r48186 10branches/12.x/templates/ 10(14 files)
admin wizard: Additional cleaning of presentation and text (thanks xavi). Feel free to add back some info if too minimalist.
03lindonb r48187 10trunk/ 10(6 files in 6 dirs)
[MRG] Semi-automatic merge, branches/12.x 48178 to 48184, part 2. Some files didn't commit in r48185 for some reason. lindonb: joined #tikiwiki chibaguy: joined #tikiwiki Tiki-KGB: 03lindonb r48188 10trunk * [MRG] Semi-automatic merge, branches/12.x 48186.
03lindonb r48189 10branches/12.x/templates/ 10(9 files) * admin wizard: conforming cleanup
03lindonb r48190 10trunk * [MRG] Totally manual merge, branches/12.x 48186-48189.
03lindonb r48191 10trunk/templates/ 10(20 files)
Totally manual merge, branches/12.x 48186-48189. Files did not commit n r48190 for some reason chibaguy: joined #tikiwiki
polom arctanx: joined #tikiwiki
left #tikiwiki Emenems: joined #tikiwiki arildb: joined #tikiwiki Telesight: joined #tikiwiki
joined #tikiwiki
joined #tikiwiki
left #tikiwiki
joined #tikiwiki
joined #tikiwiki Serg_: joined #tikiwiki Telesight: joined #tikiwiki marclaporte: joined #tikiwiki dbalieiro: joined #tikiwiki Tiki|bot: New Forum Posts: Tiki 12 Alpha on dev.t.o - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=49865 redflo: joined #tikiwiki Tiki|bot: Recent Bug: - Spreadsheet: Potential CSS regression in Tiki12, with line-height - http://dev.tiki.org/item4818 marclaporte: joined #tikiwiki
joined #tikiwiki