| *** jelkner has quit IRC | 00:16 | |
| *** fsufitch has joined #schooltool | 00:17 | |
| *** alga has joined #SchoolTool | 01:36 | |
| *** fsufitch has quit IRC | 01:43 | |
| *** fsufitch has joined #schooltool | 02:44 | |
| *** fsufitch has quit IRC | 02:46 | |
| *** fsufitch has joined #schooltool | 04:52 | |
| *** alga has quit IRC | 05:14 | |
| *** spowers has quit IRC | 07:10 | |
| *** spowers has joined #schooltool | 07:10 | |
| *** spowers has quit IRC | 07:11 | |
| *** fsufitch has quit IRC | 07:11 | |
| *** th1a has quit IRC | 07:11 | |
| *** aelkner has quit IRC | 07:11 | |
| *** aelkner has joined #schooltool | 07:11 | |
| *** th1a has joined #schooltool | 07:11 | |
| *** fsufitch has joined #schooltool | 07:11 | |
| *** aelkner has quit IRC | 07:12 | |
| *** yvl has quit IRC | 07:12 | |
| *** Aiste has quit IRC | 07:12 | |
| *** Aiste has joined #schooltool | 07:13 | |
| *** yvl has joined #schooltool | 07:13 | |
| *** povbot has joined #schooltool | 07:22 | |
| *** yvl has quit IRC | 07:27 | |
| *** th1a has quit IRC | 07:27 | |
| *** fsufitch has quit IRC | 07:27 | |
| *** yvl has joined #schooltool | 07:27 | |
| *** yvl has quit IRC | 07:28 | |
| *** Aiste has quit IRC | 07:28 | |
| *** jfroche has quit IRC | 07:28 | |
| *** aelkner has quit IRC | 07:28 | |
| *** yvl has joined #schooltool | 07:29 | |
| *** Aiste has joined #schooltool | 07:29 | |
| *** fsufitch has joined #schooltool | 07:29 | |
| *** spowers has joined #schooltool | 07:30 | |
| *** yvl has quit IRC | 07:31 | |
| *** Aiste has quit IRC | 07:31 | |
| *** th1a has joined #schooltool | 07:31 | |
| *** Aiste has joined #schooltool | 07:31 | |
| *** yvl has joined #schooltool | 07:31 | |
| *** wgrant has joined #schooltool | 07:31 | |
| *** aelkner has joined #schooltool | 07:32 | |
| *** jfroche has joined #schooltool | 07:40 | |
| *** aelkner has quit IRC | 09:11 | |
| *** aelkner has joined #schooltool | 10:18 | |
| *** lisppaste5 has joined #schooltool | 12:49 | |
| *** ignas has joined #schooltool | 14:26 | |
| *** fsufitch has quit IRC | 14:45 | |
| *** jelkner has joined #schooltool | 14:49 | |
| *** jelkner has quit IRC | 14:55 | |
| *** yvl has quit IRC | 15:49 | |
| *** mgedmin has joined #schooltool | 16:45 | |
| *** alga has joined #SchoolTool | 18:01 | |
| *** fsufitch has joined #schooltool | 18:25 | |
| fsufitch | aelkner: ping | 18:26 |
|---|---|---|
| fsufitch | ignas: ping | 18:26 |
| ignas | fsufitch: yes | 18:27 |
| fsufitch | ignas: do you know where aelkner pushed the changes to schooltool and schooltool.gradebook done at the sprint? | 18:27 |
| fsufitch | th1a would like to see them | 18:27 |
| ignas | fsufitch: http://staging.schooltool.org/bzr2/schooltool/aelkner/schooltool/ | 18:28 |
| fsufitch | it's apparently not the LP branches, so... :-/ | 18:28 |
| ignas | the sla_sprint branches | 18:28 |
| fsufitch | ah | 18:28 |
| ignas | merged to trunk | 18:28 |
| fsufitch | ok | 18:28 |
| ignas | gradebook and schooltool | 18:28 |
| ignas | anyway | 18:28 |
| fsufitch | they did? | 18:28 |
| ignas | lyceum.journal will have to get fixed | 18:28 |
| ignas | I did | 18:28 |
| fsufitch | when? | 18:28 |
| ignas | before I merge it | 18:28 |
| fsufitch | i just tried pulling the changes, but i got nothing | 18:28 |
| ignas | hmm, i have merged it like 2-3 hours ago | 18:28 |
| fsufitch | odd | 18:29 |
| ignas | launchpad is mirroring after a significant delay | 18:29 |
| ignas | http://staging.schooltool.org/bzr2/schooltool/schooltool/trunk/ is always up to date though ;) | 18:29 |
| ignas | same for http://staging.schooltool.org/bzr2/schooltool/schooltool.gradebook/trunk/ | 18:30 |
| aelkner | hey ignas | 18:49 |
| aelkner | so i got your note | 18:49 |
| aelkner | i guess you should make whatever changes you think you should make to ccarey's code | 18:50 |
| aelkner | as long as it results in the same functionality that th1a requested | 18:50 |
| ignas | aelkner: i think you or ccarey should make the changes | 18:50 |
| ignas | as they know how it is supposed to look and work | 18:51 |
| ignas | I really don't have the time to do them and test them | 18:51 |
| aelkner | i'll forward you note to ccarey then | 18:51 |
| ignas | thanks | 18:51 |
| ignas | merged the other two branches | 18:52 |
| *** alga has quit IRC | 18:52 | |
| aelkner | ignas: what should i give ccarey as the branch to branch off of? | 18:55 |
| aelkner | my branch looks like this: | 18:55 |
| aelkner | bzr+ssh://schooltool.org/aelkner/schooltool/schooltool.lyceum.journal_sla_sprint/ | 18:55 |
| ignas | he does not have ssh access | 18:56 |
| aelkner | but i don't think ccarey has ssh access | 18:56 |
| ignas | http://staging.schooltool.org/bzr2/schooltool/aelkner/ | 18:56 |
| ignas | is the public place of your branches | 18:56 |
| ignas | http://staging.schooltool.org/bzr2/schooltool/aelkner/schooltool/schooltool.lyceum.journal_sla_sprint/ | 18:56 |
| ignas | is the one he needs | 18:56 |
| aelkner | thanks | 18:56 |
| fsufitch | ignas: the schooltool staging ones arent giving me changes >_< | 18:59 |
| fsufitch | ignas: check me on the revno | 19:00 |
| fsufitch | 48 for schooltool.gradebook, 2456 for schooltool | 19:00 |
| ignas | bzr log -r -1.. | 19:03 |
| fsufitch | ------------------------------------------------------------ | 19:05 |
| fsufitch | revno: 2456 | 19:05 |
| fsufitch | committer: Filip Sufitchi <fsufitch@charon> | 19:05 |
| fsufitch | branch nick: schooltool | 19:05 |
| fsufitch | timestamp: Sat 2009-01-24 10:47:42 -0500 | 19:05 |
| fsufitch | message: Made delete button RED to make tom happy | 19:05 |
| ignas | bzr info | 19:05 |
| fsufitch | fStandalone tree (format: pack-0.92) | 19:05 |
| fsufitch | Location: | 19:05 |
| fsufitch | branch root: . | 19:05 |
| fsufitch | Related branches: | 19:05 |
| fsufitch | push branch: bzr+ssh://aelkner@10.85.219.133/home/aelkner/gradebook_sandbox/schooltool/ | 19:05 |
| fsufitch | parent branch: bzr+ssh://fsufitch@bazaar.launchpad.net/%7Eschooltool-owners/schooltool/schooltool/ | 19:05 |
| ignas | so - it's not the trunk branch | 19:06 |
| ignas | it's your branch | 19:06 |
| ignas | you should either branch from trunk a new | 19:07 |
| ignas | or you should pull trunk into your branch | 19:07 |
| *** alga has joined #SchoolTool | 19:07 | |
| aelkner | fsufitch: what do you need? the code for tom? | 19:09 |
| *** fsufitch has quit IRC | 19:37 | |
| *** alga has quit IRC | 19:38 | |
| *** fsufitch has joined #schooltool | 19:40 | |
| *** alga has joined #SchoolTool | 19:41 | |
| fsufitch | aelkner, ignas: hi | 19:41 |
| fsufitch | my connection died | 19:41 |
| fsufitch | so which branch should i pull from? | 19:42 |
| fsufitch | to have the latest sla work to show tom and the others? | 19:42 |
| ignas | http://staging.schooltool.org/bzr2/schooltool/schooltool.gradebook/trunk/ | 19:43 |
| aelkner | http://staging.schooltool.org/bzr2/schooltool/aelkner/schooltool/schooltool.gradebook_sla_sprint | 19:43 |
| ignas | and http://staging.schooltool.org/bzr2/schooltool/schooltool/trunk/ | 19:43 |
| aelkner | oh, sorry, ignas already merged | 19:43 |
| ignas | yeah | 19:44 |
| ignas | i merged everything except sla sprint lyceum branch | 19:44 |
| aelkner | ignas: i made another sla_sprint branch, this time of schooltool | 19:49 |
| aelkner | it has my changes to remove the identifier field | 19:49 |
| aelkner | could you please merge that? | 19:49 |
| ignas | aelkner: one more? | 19:50 |
| ignas | aelkner: i mean - i have merged schooltool.gradebook_sla_sprint and schooltool_sla_sprint | 19:50 |
| aelkner | one more change, that is | 19:51 |
| aelkner | you might have already merged it | 19:52 |
| aelkner | did you do the merge just a couple of hours ago? | 19:52 |
| aelkner | of schooltool_sla_sprint, that is | 19:52 |
| ignas | yeah, think so, what did you add? | 19:52 |
| ignas | i merged courses form | 19:52 |
| ignas | as in - the removal of identifier field on the add/edit course form | 19:53 |
| aelkner | actually, it's all add/edit forms | 19:53 |
| aelkner | b ut the tests were only impacted in addCourse | 19:53 |
| aelkner | so yes | 19:53 |
| aelkner | thanks | 19:53 |
| *** alga has quit IRC | 20:09 | |
| *** fsufitch has quit IRC | 20:12 | |
| *** mgedmin has quit IRC | 21:49 | |
| *** ignas has quit IRC | 22:05 | |
| *** fsufitch has joined #schooltool | 22:45 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!