| Time |
S |
Nick |
Message |
| 03:54 |
|
|
sneumann joined #bioclipse |
| 03:58 |
|
|
egonw joined #bioclipse |
| 05:15 |
|
|
egonw joined #bioclipse |
| 05:21 |
|
|
egonw_ joined #bioclipse |
| 05:23 |
|
|
sneumann joined #bioclipse |
| 05:31 |
|
|
egonw__ joined #bioclipse |
| 05:38 |
|
|
egonw joined #bioclipse |
| 05:44 |
|
|
egonw_ joined #bioclipse |
| 05:47 |
|
|
sneumann joined #bioclipse |
| 05:51 |
|
|
jonalv joined #bioclipse |
| 05:53 |
|
|
jonalv joined #bioclipse |
| 06:29 |
|
|
egonw_ joined #bioclipse |
| 06:58 |
|
|
Gpox joined #bioclipse |
| 07:14 |
|
|
zaetnick joined #bioclipse |
| 08:42 |
|
zaetnick |
Gpox: ping |
| 08:42 |
|
Gpox |
zaetnick: pong |
| 08:43 |
|
zaetnick |
Gpox: it's about bioclipse.core, the target.platform |
| 08:44 |
|
zaetnick |
I did fetch and the merge failed due to conflicts in target.platform |
| 08:45 |
|
zaetnick |
I tried to resolve the conflicts but it brakes my workspace |
| 08:45 |
|
zaetnick |
it only works with my own version of target.platform |
| 08:45 |
|
zaetnick |
I don't know how to proceed |
| 09:00 |
|
|
olass joined #bioclipse |
| 09:23 |
|
CIA-96 |
bioclipse.core: Arvid Berg 2.5.x * r5b5f2b8 / net.bioclipse.target.platform/target-platform.target : |
| 09:23 |
|
CIA-96 |
bioclipse.core: Changed version of walware feature in target platform |
| 09:23 |
|
CIA-96 |
bioclipse.core: To 201107191712 |
| 09:23 |
|
CIA-96 |
bioclipse.core: and removed source bundle - http://git.io/ftrtRA |
| 09:23 |
|
Gpox |
zaetnick: I updated the target paltform. It can be hard to resolve conflicts in that because it has a tendency to move things around |
| 09:25 |
|
zaetnick |
ok, so I pull this one and try with it? |
| 09:26 |
|
Gpox |
yes |
| 09:32 |
|
zaetnick |
Gpox: Valentin:bioclipse.core valentingeorgiev$ git pull |
| 09:32 |
|
zaetnick |
Already up-to-date. |
| 09:32 |
|
zaetnick |
so, it's the same version that I have |
| 09:33 |
|
Gpox |
it is in the 2.5 branch |
| 09:33 |
|
Gpox |
2.5.x |
| 09:34 |
|
zaetnick |
hmm, I'm on master, I was always on master… is this right |
| 09:35 |
|
Gpox |
git checkout -b 2.5.x origin/2.5.x |
| 09:36 |
|
egonw_ |
(or just: git checkout -b 2.5.x) |
| 09:37 |
|
Gpox |
yeah you want to have the r stuff in the 2.6 release so it should be based on the 2.5x branch of core |
| 09:40 |
|
zaetnick |
ok, I'm there now and everything seems to work |
| 09:41 |
|
zaetnick |
thanks for the help Gpox |
| 09:41 |
|
Gpox |
egonw_: realy? doesn't it just create a copy of your current branch |
| 09:44 |
|
zaetnick |
I was just wondering the same |
| 09:45 |
|
egonw_ |
Gpox: sorry, yeah, with the -b it does |
| 09:45 |
|
egonw_ |
I should have written: git checkout 2.5.x |
| 09:45 |
|
egonw_ |
zaetnick: sorry! |
| 10:40 |
|
|
samuell joined #bioclipse |
| 11:10 |
|
egonw |
hi samuell |
| 11:11 |
|
egonw |
samuell: how can I debug the SMW factbox not showing up again? |
| 11:11 |
|
egonw |
we have the proper setting... |
| 11:11 |
|
egonw |
and asked to check of monobook was used... |
| 11:11 |
|
samuell |
Hmm ... |
| 11:11 |
|
samuell |
mom |
| 11:11 |
|
egonw |
thanx |
| 11:12 |
|
egonw |
(this is SMW 1.6) |
| 11:12 |
|
samuell |
egonw: Btw, which wiki? :") |
| 11:13 |
|
egonw |
one not public, I'm afraid |
| 11:14 |
|
|
zaetnick joined #bioclipse |
| 11:16 |
|
samuell |
egonw, Yea, so, they are using monobook or vector skin? |
| 11:16 |
|
samuell |
(But I guess it should not matter?) |
| 11:17 |
|
samuell |
egonw: Afraid I don't know any one big trick how to debug that ... hmm ... otherwise than really make sure SMW is upn running |
| 11:17 |
|
samuell |
... and that the config is correct ... and whether the code shows up in html or not (if the box would just be hidden by some css ...) |
| 11:18 |
|
egonw |
if I use Special:ExportRDF the triples show up |
| 11:18 |
|
egonw |
I'll check the CSS... |
| 11:18 |
|
samuell |
... and then maybe try to code in a break, and echo out the value of the variable to set in LocalSettings.php |
| 11:19 |
|
egonw |
mmm... no triples in HTML source it seems |
| 11:19 |
|
samuell |
And no text string anything like "factbox"? |
| 11:19 |
|
samuell |
How does the relevant LocalSettings.php lines look? |
| 11:20 |
|
samuell |
Where are they placed? After the main SMW configs? |
| 11:21 |
|
samuell |
Hmm, maybe we should have taken it in the smw list, in case anybody else could help |
| 11:21 |
|
samuell |
(maybe some common caveat) |
| 11:22 |
|
egonw |
already asked on IRC... |
| 11:22 |
|
egonw |
no reply yet... |
| 11:22 |
|
egonw |
htanx for your help! |
| 13:02 |
|
CIA-96 |
bioclipse.ds: Ola Spjuth modeling * r754949a / plugins/net.bioclipse.ds.modeling/src/net/bioclipse/ds/modeling/handlers/CDKHelper.java : Fixed standardization bug - http://git.io/Ro1aag |
| 13:02 |
|
CIA-96 |
bioclipse.ds: Ola Spjuth modeling * rc1458ba / plugins/net.bioclipse.ds.sdk/src/net/bioclipse/ds/sdk/libsvm/SignModel.java : Removed some outcommented code - http://git.io/tdEhVQ |
| 13:07 |
|
CIA-96 |
bioclipse.ds: Ola Spjuth modeling * rbe5fdb5 / (52 files in 14 dirs): Renamed modeling to modeling.ui - http://git.io/PXn8WQ |
| 14:43 |
|
|
egonw joined #bioclipse |
| 14:59 |
|
CIA-96 |
bioclipse.ds: Ola Spjuth modeling * r193bbe8 / (39 files in 10 dirs): Refactored to modeling plugin + added header - http://git.io/-CAkig |
| 15:23 |
|
|
egonw_ joined #bioclipse |
| 15:50 |
|
|
egonw__ joined #bioclipse |
| 15:54 |
|
|
egonw joined #bioclipse |
| 16:22 |
|
|
egonw joined #bioclipse |
| 18:42 |
|
|
sneumann joined #bioclipse |
| 19:38 |
|
|
egonw joined #bioclipse |
