fabricius: polom refizul: polom & hello fabricius syracine: joined #tikiwiki
exit
quit
q
left #tikiwiki
joined #tikiwiki
joined #tikiwiki fabricius: anything going on? refizul: it's running - yeah. fabricius: cool
refizul: congratulations
mail or the Tiki or all 3?
ahh mail was Penguin
so the Tiki refizul: and just in time - tomorrow is an important day for the project fabricius: ah refizul: Tiki connected to a mailinglist fabricius: customer or association?
ah yes
good
are you familiar with git? refizul: atm association, but maybe a customer later, if they can afford employees fabricius: PenguinMan98 did explain me some of it yesterday
I did setup the Codiad editor and besides 4 demo and 1 training Tiki 15 coding Tikis refizul: I don't now the details, because I almost don't use it, but basically it's svn with branching and decentralisation fabricius: now I am thinking to try to connect the editor to Git ... there is an Admin panel and I think it is possible on a per user base refizul: now: party! fabricius: you go out? refizul: no, too late now for that fabricius: are you interested to have a look at the editor?
I needed some review, if that is a useful tool for Tiki coders - at least for training sessions - I am not a coder and thus my personal expertise on this is limited refizul: I've been working >10 hours and this is not much compared to the days before fabricius: no need to work ... just an offer to view if you'd be interested. you can at any time refizul: I'm not capable of deep thinking, looking, or straight walking anymore fabricius: no problem - yesterday night I was faling from the chair as well (literally in the german meaning ;-) )
falling refizul: unfortunately there is no champaign around fabricius: you know: falling down the chair from tiredness *gg*
I could lookup the internet how to wrote one in chat ... but still would stay virtual
I guess you need physical champaign
?? refizul: or champagne fabricius: btw, I could go to the balcony and get my last fag .. arrg already did an hour ago
ahh gosh yes
champagne .. I did not get it refizul: however, still some beer fabricius: so cheers then
hope it is cold refizul: no fabricius: arrrgs refizul: worked too long fabricius: warm plastic bottle from Aldi?
would not be a fest I think refizul: glass bottle fabricius: at least refizul: I'm not satisfied with this installation, but at least it seems to work fabricius: whats the problem?
structure? refizul: it's a Tiki9 fabricius: LTS
can eb upgraded lateron
/s/eb/be refizul: I wanted Tiki11 and then Tiki12 LTS, but there is too much trouble yet PenguinMan98: GIT is a LOT different from SVN refizul: forum mailout does not work in Tiki11, Zend problem
and forum/mailinglist merge is the main reason for that Tiki PenguinMan98: GIT was not built for repository control. It just turns out that's everyone's favorite use for it fabricius: hehe refizul: as HTML was not developed for email, but... fabricius: often things get popular for things they haven't been intentionally developped refizul: that's called hacking PenguinMan98: Creative utilization refizul: hacking as in making hot soup with a coffee machine PenguinMan98: I used to do that all the time, only it was cup-o-noodles fabricius: YEAHHH I made with similar than cup noodles alright
PenguinMan98: I would like to get one test positively running with Git - lets say setting up the Giut master repo for developer 15 and maybe then a push pull thingi with a Git account ... I think to setup one on github PenguinMan98: ok
First off, git is the repo, master is just a branch. goj_killedByISP: joined #tikiwiki fabricius: aaaaargh PenguinMan98: heh fabricius: I wil neeeeeeever get it PenguinMan98: Naw, it's really simple
Treating master like just any other branch is beautiful and simple fabricius: I do not clearly get the words .. the meanings
humm
I will ask you some question in a few minutes ... PenguinMan98: OK. Git manages the repository for you and gives you a default branch to work with called 'master' fabricius: must finish s.th. quickly PenguinMan98: You can make as many other branches as you like and jump from branch to branch as you please.
Any code changes that you make are made outside of any git branches. Thus, if you make a change and then switch branches, the change goes with you. It's not until you commit the change to a branch that it's fixed there and when you change branches then, it stays in the branch you want it in. fabricius: let me finish first and the I concntrate on the git, OK? only minutes PenguinMan98: no sweat fabricius: so finish
rehi
you know the setup of the wiki4.me server?
account root -> codiad / info.wiki4.me / some more directories and no domain on it
I recon, it would make sense to create a directory "git" on that level and into that create the directories for the git master(s)
am I right PenguinMan98 ?
how can I check, if Git is installed on the server?
my idea is, that anybody, who has ssh access to that server can push/pull with git (only trusted developers, or temporary for trainees)
am I on the right track, gitwise? PenguinMan98: try opening command line and typing 'git' and see what it says
And yes, the newbies are going to be committing most likely but not much else
Maybe pull if you want them to pull changes from a central repo
Since each instance is individual, I wouldn't recommend having them push fabricius: one question will be, how to "clean" the developer spaces, once they are finished ... with not much timeconsuming workflow
latest shortly before a new lesson
Since each instance is individual, I wouldn't recommend having them pushan with: "Since each instance is individual, I wouldn't recommend having them push"?
btw PenguinMan98 - tyoping git in the terminal brings back a lot of commands and explanations ... Git is installed on the server
next step? PenguinMan98: OK
Go to the development code folder for one of the 15 tikis
And as for reverting? It's ridiculously simple. I'll show you in a minute fabricius: I go there in the terminal?
ok, I am in dev15 PenguinMan98: OK. Git init fabricius: .git/ PenguinMan98: great!
now you can use: git add _____ to add files to the repo
or: git add -A fabricius: where is the repo? PenguinMan98: to add them all
There isn't one yet, but it will be stored in the .git folder fabricius: where is the .git folder? this .git/ what came back? it is actually IN the codebase of dev15? PenguinMan98: It sits in the folder with the code, yes fabricius: ahhh PenguinMan98: but git should auto-exclude it fabricius: we need to develop a workflow and document this
ok, go on
pls PenguinMan98: once you've added all the files to the repo, (use 'git status' to double check) , then you use git commit to commit it. There are two variations. fabricius: so I use git add -A?
running PenguinMan98: For a first time, yes. We can talk about excluding files later
the only file you really want to exclude is db/local.php fabricius: it is a fresh install anyway and no customised files in it .. assuming you did not start to code or alter yesterday PenguinMan98: but if you aren't pushing the repo to a public place, there is nothing wrong with leaving it in fabricius: ah yeah local.phop MUST be excluded, but I can even take it back out later, isn.t it?
ahh and I have several .SVN files in it aswell
and .htaccess PenguinMan98: yes. We can take it out later if you feel it's important fabricius: best would be to exclude all directories starting with a "." plus local.php
for now it is just a test anyway
in case we would crash dev15, we could delete the content of ahhhh of dev15/Tiki12 ... already fu**** it up PenguinMan98: k. once you've added the files with git add -A or however you do it, then either 'git commit' which will take you to a screen showing your changes and prompt you with a VI interface to enter a commit message, or 'Git commit -m "Some commit message" fabricius: one directory too high PenguinMan98: ok. fabricius: we should delete the whole .git/ and move one level deeper and do it again PenguinMan98: This is very easy to undo. Yes. Delete the .git/ and that's it. fabricius: ok
there is no .git inside ????
the terminal must recognise .files by default, isn't it?
strange
I try again PenguinMan98: try cd .git
see if it works
you might need to sudo to delete it fabricius: nope .. just had to ls -a instead of ls
it is there PenguinMan98: kk
I almost always use ls -lah fabricius: -lah?
means?
ah .. have it
huge amounts of info ;-) PenguinMan98: looovely info fabricius: what is h? -l clear -a clear, but -h?
PenguinMan98: no Tiki inside .git PenguinMan98: There shouldn't be. We didn't commit fabricius: after git add -A PenguinMan98: commit fabricius: how? PenguinMan98: git commit fabricius: dumb wuestion
dumb question -: PenguinMan98 pat pats fabricius: hehe PenguinMan98: ^^ fabricius: works -: fabricius thinks about he will ever understand this
fabricius thinks if and how and when
fabricius but is delghted by the guidance of PenguinMan98
fabricius even forgot the basic grammar, as he is sooo concentrated on this in the early morning ... even forgot he is tired and should sleep before breakfast
PenguinMan98 is glad to be able to give back a little fabricius: that's the reason most of us start to get committed to the community
family like
PenguinMan98: why my terminal stays in the git commit mode now? PenguinMan98: save it fabricius: not coming back to shell mode PenguinMan98: :q fabricius: ah save
ah PenguinMan98: or exc + zz fabricius: not working
thx .. vi ... escape (esc) + ZZ => save thx PenguinMan98 for expl. in query (just if s.b. reads the log one day)
so what I do with the repo now? PenguinMan98: ok
now that you've committed, type git log
it should show you the last few commits. In this case, only one
The name of a commit is a long-ass hexidecimal string fabricius: commit author date
next? PenguinMan98: Thankfully, it's random enough after 6+ characters that GIT can usually get the right one so most people reference commits by just the first 6 characters of the name.
write them down now.
Make sure you know what the initial commit name is
Then, whenever you need to change the repository back to this initial state, all you have to do is type: 'Git checkout __commit_name__'
And now you know how to revert fabricius: what is the initial commit name? PenguinMan98: a long-ass hexidecimal string fabricius: ahhhhh
dumb question again
lol PenguinMan98: You only need the first six characters fabricius: shure? PenguinMan98: it's cool fabricius: sure? PenguinMan98: yes
<PenguinMan98> Thankfully, it's random enough after 6+ characters that GIT can usually get the right one so most people reference commits by just the first 6 characters of the name. fabricius: you said "most people"
and "Git can usually get the right one"
so most and usually enough
*gg* PenguinMan98: use 8 characters then -: PenguinMan98 shrugs fabricius: hehe ok understand ... I can use all, but after 6 it gets very very unlikely to go wrong PenguinMan98: yep fabricius: and if, then repeat and then use more
?? PenguinMan98: yes fabricius: ok
got it PenguinMan98: they can make a billion commits to the repository
it makes no difference.
git checkout __hex__
restores it to its initial state
You can do this with any commit too
So if you want to upgrade the tikis, you revert them to the initial configuration, then upgrade them and commit. Then take note of the new commit name
Then revert back to that one instead
use git log to see the commit history fabricius: hummm
I start to understand
does it delete new files swell?
and what is with the content of dev15/Tiki12 .. I mean the SVN Tiki installation ... is that chenged aswell?
I mean, we code in dev15/Tiki12 and not in dev15/Tiki12/.git
understand what I mean?
/s/chenged/changed
is it one way or two ways??
still not understood?
I think, I am nearly there .. brain still tries to stay in reluctance mode, but cannot keep the counter pressure .. I'd say I am shortly before understanding
hummm
is it, that the actual code is not stored in .git?
just kind of necessary metainformation and stuff like that .. encrypted pieces .. ??
and from here - can I commit from here to another directory on a server and finaly to sourceforge? PenguinMan98: Yes, if you add new files, the git checkout will remove them
And yes, it can go two ways. If you remember the most recent commit name, you can go back to it with git checkout too
Git starts by making a copy of everything you currently have.
Then, every time you make a change, it stores only the changes.
the 'deltas' is what they say
When you go forward or backward, it just applies or removes these deltas (changes) to go from one state to the next fabricius: aha
seem to undestand it
if I wanted to commit to sf ... not from the testing environment here, but in general ... how to do that?
lets say I would use codiad on my local machine or on my personal server account PenguinMan98: commit to 'sf' ? fabricius: I assume, I simply must commit from Tiki12 and exclude local.php and .git
to sourceforge PenguinMan98: oh
Yes. first things first, remove local.php
git rm --cached db/local.php
That command should clear out the file and any cached copy of it for the history of the repo.
adjust the path as needed of course
then commit the change fabricius: adjust the path?
arrrgl ... wouldn't local.php be deleted in Tiki12 aswell?
no good, cause then no database and not connected to subdomain anymore PenguinMan98: No. Only in the repo you run the command in. fabricius: I meant dev15/Tiki12
I did set up things, that this is connected to a database and thus accessable via subdomain as running site
to check whats the result of changes
no local.php in dev15/Tiki12 -> no database -> no running website Tiki|bot: New Forum Posts: New Developer Training - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=47980 fabricius: afaik in SVN you commit single files mainly ... so no problem with local.php in the repo - from that point PenguinMan98: And no, that command will only delete git's copy
not the actual file
If you want git to ignore that file from now on, you go to the directory the file is in and create a new file named .gitignore
Inside the .gitignore file, you add the line local.php/
save it
Then add the .gitignore to the repository and commit it fabricius: ahhhh
nice!!! PenguinMan98: yep!
Add more files to the .gitignore file by appending them to the first line. Don't use newlines. fabricius: all in one line PenguinMan98: (( Truthfully, I'm not sure if newlines are fine or not. I've just only ever seen it all on one line.
Here's my .gitignore
http://screencast.com/t/tRG3yOE43 fabricius: hummm will I have to add local.php or db/local.php into the file .gitignore? PenguinMan98: put the .gitignore in the /db directory and just add local.php
http://screencast.com/t/YehvSsoZ
I tend to ignore the .gitignores. I've been told this is a bad idea Tiki-KGB: tikiwiki 03lindonb r46644 10trunk/lib/ 10(14 files in 5 dirs)
tikiwiki [REF] tablesorter: move implementation for PluginFancytable to new core implementation, which can be extended to other plugin tables. Also other cleanup: separate ajax from pager in settings and add more checks for empty/expected values to avoid notices and errors. fabricius: errrr
PenguinMan98: what is a bad idea?
r u joking? chibaguy: joined #tikiwiki PenguinMan98: Nope. If you ignore the .gitignore file too, then everyone who pulls your code has to ignore the file too
After you give them a copy that doesn't have your passwords in it Tiki-KGB: tikiwiki 03lindonb r46645 10trunk/lib/core/ 10Table/Plugin.php 10Table/Settings/Plugin.php
tikiwiki [DOC] tablesorter: added some documentation fabricius: do not understand now
ahh
the others gits ignore them by default, if you ignore your ignore? PenguinMan98: no. you have to commit your .gitignore to the repository otherwise the people who pull your repository will have to create their own
It's more a nuisance than anything fabricius: ah
I have now a file .gitignor in Tiki12/db
sry .gitignore
content:
local.php/.svn/.gitignore
humm is ther a difference to be made between files and folders?
.svn is a folder PenguinMan98: I dont think that's an issue
It should ignore the whole folder
I say should, but I've had issues with it in the past
When new files are added inside the directory, Git likes to try and add them to the repository anyway
It's something I haven't quite figured out yet fabricius: ok
I thank you very much
it is nearly 7 now ... verrry tired PenguinMan98: no sweat fabricius: I have to slep fast and deep now ... I appreciate all your help
thank you a lot
I hope we will use that in the one or the other way, anyway I learned a lot
I say good bye now PenguinMan98: ok!
Good night! fabricius: joined #tikiwiki chibaguy: joined #tikiwiki
joined #tikiwiki Tiki|Log: joined #tikiwiki Topic: for #tikiwikiis now Tiki Wiki CMS Groupware - The Free and Open Source Web Application with the most built-in features - Tiki 10.2, 9.4 LTS and 6.10 LTS are out! Question? Just ask. We log the channel @ http://irc.tiki.org (start line with [off] to exclude message from log) changi: test marclaporte: joined #tikiwiki chibaguy: joined #tikiwiki arildb: joined #tikiwiki Tiki-KGB: tikiwiki 03arildb r46646 10trunk/lib/filegals/filegallib.php
tikiwiki [FIX] More solid fix for convertSortMode error return
tikiwiki 03arildb r46647 10branches/11.x/lib/filegals/filegallib.php
tikiwiki [bp/r46646][FIX] More solid fix for convertSortMode error return
tikiwiki 03arildb r46648 10branches/10.x/lib/filegals/filegallib.php
tikiwiki [bp/r46646][FIX] More solid fix for convertSortMode error return Telesight: joined #tikiwiki lindonb: joined #tikiwiki arildb_: joined #tikiwiki chibaguy: joined #tikiwiki Tiki|bot: Recent Bug: - CODE Plugin "eats" code, especially HTML - http://dev.tiki.org/item4590 marclaporte: joined #tikiwiki arildb_: joined #tikiwiki Tiki-KGB: tikiwiki 03lindonb r46649 10trunk/templates/tiki-adminusers.tpl
tikiwiki notices chibaguy: joined #tikiwiki lindonb: joined #tikiwiki Tiki-KGB: tikiwiki 03lindonb r46650 10trunk/ 10templates/tiki-adminusers.tpl 10tiki-adminusers.php 04lib/core/Table/Settings/Users.php 03lib/core/Table/Settings/Adminusers.php
tikiwiki [REF] tablesorter: rename Users file and class to Adminusers to be closer to the name of the page the table is on. Add a note to synchronize changes in the tpl affecting columns shown with the related tablesorter logic arildb_: joined #tikiwiki dcedilotte: joined #tikiwiki arildb__: joined #tikiwiki lphuberdeau_: joined #tikiwiki syracine: joined #tikiwiki MagicFab_: joined #tikiwiki
Hi all - from the TikiFest @ Montreal lphuberdeau_: MagicFab_ ping syracine: allo MagicFab_: lphuberdeau, o/
syracine, o/. dcedilotte: joined #tikiwiki MagicFab_: dcedilotte, -> http://dev.tiki.org/BrowserID lphuberdeau_: http://doc.tiki.org/Page%20Alias MagicFab_: lphuberdeau, BrowserID -> MozillaPersona sipherdee: joined #tikiwiki Tiki-KGB: tikiwiki 03marclaporte r46651 10trunk/lang/ro/language.php
tikiwiki adding a Romanian translation. Thank you Valentin dcedilotte: joined #tikiwiki mlaporte: joined #tikiwiki Ccardinal: joined #tikiwiki
joined #tikiwiki dcedilotte: /msg NickServ identify ei909k7o changi: marclaporte: can i start ? Tiki-KGB: tikiwiki 03marclaporte r46652 10branches/9.x/lang/fr/language.php
tikiwiki A quick translation mlaporte: joined #tikiwiki changi: marclaporte: hi
mlaporte: hi :) Tiki-KGB: tikiwiki 03thierrygervais r46653 10trunk/lang/ro/language.php
tikiwiki Language update, Thank to Valentin
tikiwiki 03changi67 r46654 10branches/6.x/ 10lib/setup/twversion.class.php 04db/tiki-secdb_6.11_mysql.sql
tikiwiki [REL] Preparing 6.12 release
tikiwiki 03changi67 r46655 10branches/6.x/README
tikiwiki [REL] Update README file for 6.12
tikiwiki 03changi67 r46656 10branches/6.x/changelog.txt
tikiwiki [REL] Update changelog.txt for 6.12
tikiwiki 03changi67 r46657 10branches/6.x/copyright.txt
tikiwiki [REL] Update copyright.txt for 6.12
tikiwiki 03changi67 r46658 03branches/6.x/db/tiki-secdb_6.12_mysql.sql
tikiwiki [REL] SecDB for 6.12
tikiwiki 03changi67 r46659 03tags/6.12
tikiwiki [REL] Tagging release
tikiwiki 03patrick-proulx r46660 10trunk/lang/fr/language.php
tikiwiki Added French translation for 'New File' dcedilotte: joined #tikiwiki Tiki-KGB: tikiwiki 03ursuleacv r46661 10trunk/lang/ro/language.php
tikiwiki Language romanian add translation Valentin
tikiwiki 03changi67 r46662 10branches/6.x/lib/setup/twversion.class.php
tikiwiki [REL] Closing release of 6.12
tikiwiki 03changi67 r46663 10branches/9.x/ 04db/tiki-secdb_9.5_mysql.sql 10lib/setup/twversion.class.php
tikiwiki [REL] Preparing 9.6 release
tikiwiki 03changi67 r46664 10branches/9.x/README
tikiwiki [REL] Update README file for 9.6
tikiwiki 03changi67 r46665 10branches/9.x/ 10(49 files in 49 dirs)
tikiwiki [REL] Update language.php files for 9.6
tikiwiki 03changi67 r46666 10branches/9.x/changelog.txt
tikiwiki [REL] Update changelog.txt for 9.6
tikiwiki 03changi67 r46667 10branches/9.x/copyright.txt
tikiwiki [REL] Update copyright.txt for 9.6
tikiwiki 03changi67 r46668 03branches/9.x/db/tiki-secdb_9.6_mysql.sql
tikiwiki [REL] SecDB for 9.6
tikiwiki 03changi67 r46669 03tags/9.6
tikiwiki [REL] Tagging release changi: Tiki 10 and tiki 11 will be done tomorrow litexnt: joined #tikiwiki Tiki-KGB: tikiwiki 03changi67 r46670 10branches/9.x/lib/setup/twversion.class.php
tikiwiki [REL] Closing release of 9.6
tikiwiki 03ccardinal r46671 10trunk/lang/fr/language.php
tikiwiki translated add a table of contents to a page. Thank you Marc Laporte for my first commit
tikiwiki 03lphuberdeau r46672 10trunk/templates/comment/list.tpl
tikiwiki [FIX] Display comments form by default - had already been implemented but broken later on
tikiwiki 03lindonb r46673 10trunk/lib/core/Table/Plugin.php
tikiwiki Notices - tablesorter: property shouldn't be static
tikiwiki 03ccardinal r46674 10trunk/lang/fr/language.php
tikiwiki French translation added
tikiwiki 03lindonb r46675 10trunk/templates/tiki-show_page.tpl
tikiwiki Notice
tikiwiki 03lphuberdeau r46676 10branches/11.x/templates/comment/list.tpl
tikiwiki [FIX] Backport r46672 Display comment form by default broken marclaporte: joined #tikiwiki TomJarvis: joined #tikiwiki dcedilotte: joined #tikiwiki MagicFab_: joined #tikiwiki
dcedilotte, irc.mozilla.org port 6697 #identity Tiki-KGB: tikiwiki 03syracine r46677 10trunk/lib/logs/logslib.php
tikiwiki [FIX] Bug 4509 - Fix troncate of comment in Action Log when multi-bytes caracteres are used dcedilotte: joined #tikiwiki