Thursday, 20 December 2012< ^ >
arjan has set the subject to: Zotonic - the Erlang Content Management Framework
Room title: "Zotonic"
Allow users to change subject
Allow users to send private messages
Allow users to query other users
Allow users to send invites
Make room semianonymous
Default users as participants
Make room members-only
Make room moderated
Make room password protected
Make room persistent
Make room public searchable
Make participants list public
[00:16:01] Arjan leaves the room
[00:26:59] Arjan joins the room
[00:28:48] Maas leaves the room
[00:32:39] Arjan leaves the room
[00:34:02] Maas joins the room
[00:34:18] Maas leaves the room
[08:16:22] maas.maarten.zeeman joins the room
[08:21:49] Arjan joins the room
[08:49:39] <maas.maarten.zeeman> What is the best way to make a change in a zotonic submodule? Just checkout the module do your thing. And then goto to the zotonic dep directory and do a pull?
[09:18:30] Andreas Stenius joins the room
[09:24:13] Maas joins the room
[10:21:52] <Andreas Stenius> maas.maarten.zeeman: I ususally go to the submodule in the dep dir, git checkout master (or whatever branch the dep is on, so you are not working headless), commit stuff, push it, then go back to zotonic and do a git add deps/submodule (important, make sure there is no trailing slash, a git diff --staged should show a single line mentioning a new sha1 value for the dep), then commit and push that.
[10:22:50] <maas.maarten.zeeman> Can you commit straight from the deps directory. That makes things a lot easier.
[10:23:58] <maas.maarten.zeeman> why do you again have to do a git add?
[10:24:10] <maas.maarten.zeeman> It is already added right?
[10:31:09] <maas.maarten.zeeman> Thanks andreas. Will try it later on today. Busy with something else.
[10:34:36] <Andreas Stenius> I do add again, because that is a *different* git repo..
[10:35:20] <Andreas Stenius> Arjan: did you see this: https://twitter.com/armorica/status/281314799340625920 ?
[10:36:08] <Andreas Stenius> never mind... :p
[12:09:12] Arjan leaves the room
[12:28:40] Arjan joins the room
[13:32:20] Arjan leaves the room
[14:10:33] Arjan joins the room
[14:18:01] Arjan leaves the room
[14:20:21] Arjan joins the room
[14:22:06] <Arjan> maas.maarten.zeeman: fixed
[14:22:08] <Arjan> :)
[14:22:10] <maas.maarten.zeeman> @arjan damn you are quick.
[14:22:14] <Arjan> :P
[14:22:44] <maas.maarten.zeeman> Was just out of the house for half an hour and it is fixed
[14:23:13] <Arjan> it was just something that got broken, no new functionality
[14:23:38] <maas.maarten.zeeman> was busy with a js-api which should be loaded on an external site.
[14:23:46] <Arjan> :)
[14:23:47] <maas.maarten.zeeman> didn't create the api call just yet.
[14:23:49] <Arjan> nice
[14:23:57] <maas.maarten.zeeman> via postMessage
[14:51:29] Arjan leaves the room
[15:03:57] Arjan joins the room
[15:47:36] maas.maarten.zeeman leaves the room
[17:14:08] Maas leaves the room
[18:48:10] Maas joins the room
[18:49:52] maas.maarten.zeeman joins the room
[19:53:42] maas.maarten.zeeman leaves the room
[20:28:45] Arjan leaves the room
[21:25:18] Andreas Stenius leaves the room
[23:10:32] Maas leaves the room