| amayer | hello all | 01:45 |
|---|---|---|
| amayer | ...does this thing work? kinda new at this | 01:47 |
| === peterm-ubuntu is now known as Peter-phone | ||
| === LjL is now known as VemSkaSegra | ||
| daker-cloud | cjohnston: have you been able to fix the branch https://code.launchpad.net/~chrisjohnston/loco-team-portal/theme-update/+merge/108713/comments/235008 ? | 21:16 |
| cjohnston | daker-cloud: let me work on it now | 21:18 |
| daker-cloud | ok tyt | 21:18 |
| daker-cloud | just get those fixes there then we can merge it | 21:19 |
| daker-cloud | brb | 21:19 |
| cjohnston | daker-cloud: maybe I'm missing something.. i dont see <script src="//code.jquery.com/jquery-1.7.2.min.js"></script> | 21:27 |
| cjohnston | unless its in the theme branch | 21:27 |
| daker-cloud | cjohnston: yes it is | 21:37 |
| daker-cloud | so just remove the one in the LTP templates | 21:38 |
| daker-cloud | cjohnston: something is wrong with your branch | 21:47 |
| daker-cloud | === renamed file 'loco_directory/media/css/newstyle.css' => 'loco_directory/media/css/newstyle.css.THIS' | 21:47 |
| daker-cloud | some merge conflicts ? | 21:47 |
| cjohnston | yes there was | 22:06 |
| cjohnston | and im not sure why | 22:06 |
| cjohnston | .44 | 22:06 |
| cjohnston | pushed revno 534 | 22:08 |
| daker-cloud | cjohnston:ok | 22:27 |
| daker-cloud | two more things: | 22:27 |
| daker-cloud | base.html /media/css/styles.css => /media/ sould be {{ MEDIA_URL }} | 22:27 |
| daker-cloud | /teams/team_reapprovals.html => {% block extrahead %}{{ block.super }}{% endblock %} ? | 22:27 |
| cjohnston | i just removed the newstyle.css | 22:31 |
| daker-cloud | ouch! LP diff viewer is hurting me :/ | 22:33 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!