| Time |
S |
Nick |
Message |
| 00:11 |
|
|
kathryn joined #koha |
| 00:12 |
|
|
jamesb_ joined #koha |
| 00:31 |
|
|
caboose-afk joined #koha |
| 00:33 |
|
|
Francesca joined #koha |
| 00:34 |
|
|
caboose-afk joined #koha |
| 00:49 |
|
|
stozza joined #koha |
| 01:03 |
|
|
stozza joined #koha |
| 01:04 |
|
|
caboose-afk joined #koha |
| 01:24 |
|
|
caboose joined #koha |
| 01:37 |
|
|
Francesca joined #koha |
| 01:38 |
|
|
Francesca joined #koha |
| 01:40 |
|
|
Francesca joined #koha |
| 01:48 |
|
|
stozza joined #koha |
| 02:03 |
|
|
stozza joined #koha |
| 02:38 |
|
|
JoshB joined #koha |
| 02:50 |
|
|
stozza joined #koha |
| 03:03 |
|
|
stozza joined #koha |
| 03:08 |
|
|
deb-CSPL joined #koha |
| 03:09 |
|
|
Scott-CSPL joined #koha |
| 03:49 |
|
|
JoshB joined #koha |
| 04:03 |
|
|
stozza joined #koha |
| 04:35 |
|
|
stozza joined #koha |
| 04:37 |
|
|
Francesca joined #koha |
| 04:49 |
|
|
JoshB joined #koha |
| 05:16 |
|
|
cait joined #koha |
| 05:44 |
|
|
sameee joined #koha |
| 05:44 |
|
sameee |
hi #koha |
| 05:57 |
|
|
liw joined #koha |
| 05:57 |
|
* cait |
waves |
| 06:16 |
|
|
LibraryClaire joined #koha |
| 06:16 |
|
magnuse |
happy star wars day, #koha! |
| 06:17 |
|
* LibraryClaire |
is having a star wars marathon tonight |
| 06:17 |
|
|
fridolin joined #koha |
| 06:17 |
|
LibraryClaire |
morning #koha |
| 06:18 |
|
fridolin |
hie there |
| 06:24 |
|
magnuse |
hiya LibraryClaire and fridolin |
| 06:24 |
|
LibraryClaire |
hei magnuse |
| 06:27 |
|
fridolin |
yop |
| 06:27 |
|
fridolin |
#coffeeeeeeee |
| 06:32 |
|
cait |
mveron++ |
| 06:37 |
|
|
marcelr joined #koha |
| 06:37 |
|
marcelr |
hi #koha |
| 06:39 |
|
|
mveron joined #koha |
| 06:40 |
|
mveron |
Good morning / daytime #koha |
| 06:41 |
|
|
laurence joined #koha |
| 06:41 |
|
marcelr |
goedemorgen mveron |
| 06:41 |
|
mveron |
goedemorgen marcelr |
| 06:43 |
|
mveron |
marcelr: If you have time - QA-comments are needed for bug 18472 bug18483 :-) |
| 06:43 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18472 enhancement, P5 - low, ---, veron, Signed Off , Add system preferences to manage online help system |
| 06:44 |
|
marcelr |
mveron: i was just looking at 18472 |
| 06:44 |
|
mveron |
bug 18483 |
| 06:44 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18483 enhancement, P5 - low, ---, veron, Signed Off , Customised help: Enhance staff client with news based, easily editable help system |
| 06:44 |
|
mveron |
Great! |
| 06:45 |
|
* mveron |
will be back in about 2 hours |
| 06:49 |
|
|
paul_p joined #koha |
| 06:52 |
|
|
reiveune joined #koha |
| 06:52 |
|
reiveune |
hello |
| 06:53 |
|
|
AndrewIsh joined #koha |
| 07:09 |
|
|
josef_moravec joined #koha |
| 07:09 |
|
josef_moravec |
morning #koha |
| 07:09 |
|
marcelr |
hi josef_moravec |
| 07:10 |
|
josef_moravec |
hi marcelr |
| 07:12 |
|
josef_moravec |
looking into bug 8612 |
| 07:12 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]w_bug.cgi?id=8612 enhancement, P5 - low, ---, remi.mayrand-provencher, Failed QA , CSV export profile to have custom fields in export csv basket |
| 07:12 |
|
josef_moravec |
but I have to refresh my memory a bit first ;) |
| 07:12 |
|
marcelr |
yes it was already some time ago |
| 07:15 |
|
josef_moravec |
first I rebased, now I am going to look what can i do ;) |
| 07:15 |
|
marcelr |
ok |
| 07:29 |
|
|
alex_a joined #koha |
| 07:29 |
|
alex_a |
bonjour |
| 07:29 |
|
wahanui |
hi, alex_a |
| 07:31 |
|
marcelr |
alex_a: please submit a follow-up on 12063 today |
| 07:31 |
|
marcelr |
i will not be able to look at it tomorrow |
| 07:37 |
|
|
gaetan_B joined #koha |
| 07:38 |
|
gaetan_B |
hello |
| 07:41 |
|
|
paul_p joined #koha |
| 07:48 |
|
|
irma joined #koha |
| 08:07 |
|
|
mveron joined #koha |
| 08:07 |
|
mveron |
Hi again #koha |
| 08:09 |
|
LibraryClaire |
hi mveron |
| 08:09 |
|
mveron |
Hi LibraryClaire :-) |
| 08:10 |
|
LibraryClaire |
:) |
| 08:14 |
|
* mveron |
wonders how to mark comments as obsolete in Bugzilla. Adding a tag 'obsolete' does not stick. No tag sticks. |
| 08:16 |
|
|
baptiste joined #koha |
| 08:16 |
|
marcelr |
you should type obsolete in the tag and press enter |
| 08:24 |
|
mveron |
Silly me, I tried to save... |
| 08:24 |
|
ashimema |
i had the same issue a little while back mveron |
| 08:24 |
|
marcelr |
i found it not very intuitive too |
| 08:24 |
|
mveron |
:-) |
| 08:25 |
|
|
Francesca joined #koha |
| 08:25 |
|
* mveron |
will obsolete all the silly things he said and did during his life... At least the comments... |
| 08:31 |
|
|
paul_p joined #koha |
| 08:35 |
|
eythian |
hi |
| 08:35 |
|
wahanui |
niihau, eythian |
| 08:50 |
|
|
Infra_3600 joined #koha |
| 08:57 |
|
alex_a |
marcelr: patch sent |
| 08:57 |
|
marcelr |
thx alex_a; will have a look |
| 09:01 |
|
|
stozza joined #koha |
| 09:01 |
|
josef_moravec |
marcelr: I just sent follwups for bug 8612 too, if you have few seconds, it would be nice ;) |
| 09:01 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]w_bug.cgi?id=8612 enhancement, P5 - low, ---, remi.mayrand-provencher, Signed Off , CSV export profile to have custom fields in export csv basket |
| 09:04 |
|
* alex_a |
keeps his fingers crossed |
| 09:06 |
|
|
Scott-CSPL joined #koha |
| 09:08 |
|
|
stozza_ joined #koha |
| 09:09 |
|
|
deb-CSPL joined #koha |
| 09:14 |
|
|
paul_p joined #koha |
| 09:21 |
|
|
cait joined #koha |
| 09:21 |
|
|
cait left #koha |
| 09:22 |
|
|
atheia joined #koha |
| 09:24 |
|
|
fridolin joined #koha |
| 09:24 |
|
atheia |
good morning! |
| 09:24 |
|
wahanui |
well, it's morning somewhere, yes |
| 09:25 |
|
atheia |
Fair point wahanui, fair point. |
| 09:25 |
|
LibraryClaire |
hi atheia |
| 09:25 |
|
* atheia |
waves |
| 09:34 |
|
|
stozza joined #koha |
| 09:34 |
|
|
irma joined #koha |
| 09:45 |
|
|
fridolin joined #koha |
| 09:48 |
|
|
Kafilini joined #koha |
| 09:54 |
|
magnuse |
kia ora atheia! |
| 09:54 |
|
magnuse |
any chance you can provide followups for the two issues i pointed out on bug 7317 |
| 09:54 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]w_bug.cgi?id=7317 new feature, P5 - low, ---, alex.sassmannshausen, Failed QA , Add an Interlibrary Loan Module to Circulation and OPAC |
| 10:12 |
|
|
alexbuckley_ joined #koha |
| 10:18 |
|
magnuse |
oops, scared hi away... |
| 10:18 |
|
LibraryClaire |
lol |
| 10:22 |
|
eythian |
http://ultimateclassicrock.com[…]-wars-sgt-pepper/ this is brilliant |
| 10:28 |
|
|
jenkins joined #koha |
| 10:31 |
|
|
jenkins joined #koha |
| 10:36 |
|
* kidclamp_away |
waves |
| 10:37 |
|
|
atheia joined #koha |
| 10:45 |
|
|
baptiste joined #koha |
| 10:48 |
|
|
cait joined #koha |
| 10:48 |
|
* cait |
waves from new work laptop :D |
| 10:54 |
|
alexbuckley_ |
hi cait |
| 10:54 |
|
josef_moravec |
hi cait ;) |
| 10:55 |
|
cait |
:) |
| 11:00 |
|
magnuse |
congrats cait |
| 11:03 |
|
|
Imad joined #koha |
| 11:04 |
|
|
janPasi joined #koha |
| 11:08 |
|
|
Imad joined #koha |
| 11:16 |
|
|
baptiste joined #koha |
| 11:32 |
|
|
JoshB joined #koha |
| 11:33 |
|
|
caboose joined #koha |
| 11:33 |
|
|
janPasi joined #koha |
| 11:34 |
|
|
janPasi joined #koha |
| 11:35 |
|
|
JoshB joined #koha |
| 11:41 |
|
|
meliss joined #koha |
| 11:43 |
|
|
imad joined #koha |
| 11:47 |
|
imad |
hello, not sure if this is the right place, but looking to talk with someone on the Koha product team |
| 11:54 |
|
|
jzairo joined #koha |
| 11:55 |
|
|
gp joined #koha |
| 12:00 |
|
|
oleonard joined #koha |
| 12:01 |
|
oleonard |
Howdy. |
| 12:01 |
|
LibraryClaire |
jo |
| 12:01 |
|
marcelr |
o/ |
| 12:01 |
|
oleonard |
Hey LibraryClaire long time no see |
| 12:02 |
|
* LibraryClaire |
lurks in the shadows |
| 12:02 |
|
LibraryClaire |
I have emerged for the celebration of star wars day |
| 12:03 |
|
oleonard |
Oh you're early. It's on May 25th :P |
| 12:04 |
|
|
alex_a joined #koha |
| 12:11 |
|
|
nengard joined #koha |
| 12:12 |
|
LibraryClaire |
I'll have to celebrate twice then ;) |
| 12:12 |
|
LibraryClaire |
all the films won't wit in tonight anyway :D |
| 12:13 |
|
oleonard |
Yeah 5 in a row is a lot. |
| 12:13 |
|
gp |
Hi, I'm new this Koha and I'm still trying to understand the very basics. I got this error when im trying to access the admin page on the testing/development site of the library for my company : "Template process failed: file error - cssinclude: not found at /usr/share/koha_sqccdev/lib/C4/Templates.pm line 121." |
| 12:13 |
|
oleonard |
gp: Did you install Koha yourself? |
| 12:14 |
|
gp |
I've navigated to that location and this is the line of code i saw " $template->process( $self->filename, $vars, \$data )" |
| 12:14 |
|
gp |
No sir, I just started as their IT guy |
| 12:15 |
|
oleonard |
Is it a new installation? |
| 12:15 |
|
gp |
and Koha was setup and runinng, but one day the librarian said he got that message when trying to made changes on the development site |
| 12:15 |
|
gp |
nope |
| 12:16 |
|
oleonard |
W |
| 12:17 |
|
oleonard |
What version of Koha? |
| 12:17 |
|
kidclamp |
what is in the opaclayoutstylesheet or OpacAdditionalStylesheet system preferences |
| 12:17 |
|
kidclamp |
gp - maybe a file that got moved/deleted? |
| 12:17 |
|
gp |
Honestly, I'm so new to all this, all i can tell you is that its running on a linux server |
| 12:18 |
|
gp |
i suspect that, but idk where to start |
| 12:19 |
|
kidclamp |
if you can't access the staff site maybe you can check in the sql database for those preferences |
| 12:19 |
|
|
nengard joined #koha |
| 12:19 |
|
gp |
and the user/person who edits the site swears he didnt change anything |
| 12:21 |
|
gp |
i honeslty dont know where to start to find any of that info. |
| 12:21 |
|
oleonard |
gp do you have access to the MySQL database? |
| 12:22 |
|
gp |
i would think so, but i wouldnt know how to access it |
| 12:22 |
|
gp |
Heres what i have: access to location where all the files are found |
| 12:22 |
|
kidclamp |
if it was a package install you might be able to us "sudo koha-mysql sqccdev" |
| 12:23 |
|
kidclamp |
if not you will need the user and password from the koha-conf.xml file |
| 12:23 |
|
gp |
kidclamp: i'm going to run that command now! thanks! )linux isnt one of my skills |
| 12:24 |
|
oleonard |
gp: Who installed Koha? Was it done in-house? |
| 12:26 |
|
gp |
yea, its hosted locally on site; the installer? some guy that i've never met and was contracted only to build |
| 12:26 |
|
oleonard |
:( |
| 12:26 |
|
|
paul_p joined #koha |
| 12:28 |
|
gp |
i feel the say way :( |
| 12:28 |
|
|
andreashm joined #koha |
| 12:28 |
|
* andreashm |
waves |
| 12:28 |
|
gp |
so im in and i see server version: 5.5.43 |
| 12:29 |
|
gp |
but i think thats the linux version |
| 12:31 |
|
andreashm |
Yay, bug 12063 Passed QA! Great work alex_a and marcelr! |
| 12:31 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=12063 enhancement, P5 - low, ---, alex.arnaud, Passed QA , Change date calculation for reserve expiration to skip all holidays |
| 12:32 |
|
marcelr |
hi andreashm |
| 12:32 |
|
andreashm |
alex_a++ |
| 12:32 |
|
andreashm |
marcelr++ |
| 12:32 |
|
alex_a |
marcelr++ |
| 12:33 |
|
marcelr |
alex_a++ :) |
| 12:33 |
|
andreashm |
++ party! |
| 12:33 |
|
LibraryClaire |
party++ |
| 12:33 |
|
andreashm |
=) |
| 12:33 |
|
gp |
oleonard: it is 5.5.43 |
| 12:33 |
|
kidclamp |
gp: do "SELECT variable,value FROm systempreferences WHERE variable LIKE "%sheet";" |
| 12:37 |
|
gp |
i see both opacAdditionalstylesheet |
| 12:37 |
|
gp |
and opac layoutstylesheet |
| 12:38 |
|
oleonard |
Do they have something in the value column? |
| 12:39 |
|
gp |
my apologies, sqcc.css and opac.css respectively |
| 12:41 |
|
oleonard |
opaclayoutstylesheet has the correct value |
| 12:41 |
|
oleonard |
sqcc.css must be a custom stylesheet. If you have access to the file system, can you locate that file? |
| 12:45 |
|
gp |
yep, found it in two locations in the Koha_sqccdev folder and one in the koha folder |
| 12:47 |
|
magnuse |
meanwhile, in norway http://www.andalsnes-avis.no/nyheter/2017/05/03/Nå-brøytes-Trollstigen-14676120.ece |
| 12:47 |
|
|
fridolin joined #koha |
| 12:47 |
|
|
JoshB joined #koha |
| 12:48 |
|
oleonard |
magnuse: If you're going to celebrate Star Wars day, Hoth is as good a place as any. |
| 12:49 |
|
magnuse |
apt, since the scenes from Hoth were filmed in norway ;-) |
| 12:49 |
|
oleonard |
I can't believe I did not know that. |
| 12:51 |
|
magnuse |
oleonard: start planning your next holiday now http://www.starwars.com/news/g[…]g-real-world-hoth |
| 12:52 |
|
magnuse |
i have not been there (but i have been to an old location/set in Tunisia) |
| 12:54 |
|
oleonard |
gp: Is sqcc.css in the same location, in each case, as opac.css? |
| 12:58 |
|
gp |
the opac.css is missing from a folder where the sqcc.css is (so there's 3locations with the sqcc.css and 2locations with the opac.css) |
| 12:58 |
|
gp |
Should i add opac.css to the missing location? |
| 13:00 |
|
gp |
Also, is there a way to get a log to see who deleted a file or modified a file? I know from the Koha admin portal on the live site - there's a feature to view logs |
| 13:08 |
|
kidclamp |
that would have to be tracked at OS level gp. You can try clearing those prefs to see if it helps - the opac prefs shouldn't be affectin gstaff client though I would think. Staff client is not loading any pages? |
| 13:09 |
|
gp |
ok. not sure what you mean by staff client |
| 13:10 |
|
gp |
as far as i know, there's the live site and then the development/testing site. The librarian is able to login to the admin portal on the live site. But when he tries it on the development site - there's where there's an error |
| 13:14 |
|
oleonard |
gp: Koha consists of a public interface, the OPAC, and an staff/administrative interface, the staff client. |
| 13:17 |
|
|
tcohen joined #koha |
| 13:17 |
|
gp |
ok, well the live site - all opens and runs well |
| 13:17 |
|
gp |
its only when trying to load the admin login page for the development site (koha_dev) folder |
| 13:20 |
|
|
barton joined #koha |
| 13:21 |
|
gp |
should i ensure that the opac.css and sqcc.css are both in the same location in each case? |
| 13:22 |
|
oleonard |
It couldn't hurt I guess, though I don't know that this is the cause of your problem |
| 13:23 |
|
eythian |
magnuse: that snow video is great |
| 13:27 |
|
|
NateC joined #koha |
| 13:27 |
|
gp |
darn it! didnt work - thanks for your efforts though |
| 13:27 |
|
gp |
I know i didnt help much since i was clueless |
| 13:28 |
|
oleonard |
I wonder why the Patron Clubs feature didn't come with a system preference to turn it off |
| 13:30 |
|
kidclamp |
if there are no clubs it doesn't show anywhere - except on admin page |
| 13:31 |
|
kidclamp |
gp: make sure your cache is cleared? https://bugs.koha-community.or[…]_bug.cgi?id=10309 |
| 13:31 |
|
oleonard |
gp: I can recreate the error you're seeing by modifying (breaking) a template in the OPAC. But that error isn't happening when I access the staff client. |
| 13:31 |
|
huginn_ |
Bug 10309: new feature, P5 - low, ---, oleonard, CLOSED FIXED, New OPAC theme based on Bootstrap |
| 13:31 |
|
kidclamp |
not sure what could be causing it - was it upgraded at any point? |
| 13:31 |
|
|
kmlussier joined #koha |
| 13:32 |
|
|
cait joined #koha |
| 13:35 |
|
|
Dyrcona joined #koha |
| 13:44 |
|
|
imad left #koha |
| 13:47 |
|
tcohen |
morning |
| 13:48 |
|
* tcohen |
left the keys inside the locked car... |
| 13:48 |
|
marcelr |
hi tcohen : security above all |
| 13:49 |
|
tcohen |
he |
| 13:49 |
|
tcohen |
touche |
| 13:49 |
|
marcelr |
tcohen: if you add that missing files on the report of yesterday, feel free to put my signoff there and pass qa |
| 13:50 |
|
marcelr |
i will not be here tomorrow |
| 13:50 |
|
tcohen |
ok |
| 13:50 |
|
tcohen |
i'll do it right now |
| 13:50 |
|
tcohen |
so you can sign it :-P} |
| 13:50 |
|
marcelr |
too late already |
| 13:50 |
|
tcohen |
ok |
| 13:51 |
|
|
paul_p joined #koha |
| 13:54 |
|
eythian |
https://twitter.com/JoeLazausk[…]59848664864489472 <-- I hope all libraries get this. |
| 14:05 |
|
oleonard |
eythian: I'm more likely to find a real fried chicken leg being used as a bookmark. |
| 14:07 |
|
LibraryClaire |
it's best not to ask about what gets found in the library |
| 14:07 |
|
|
fridolin left #koha |
| 14:07 |
|
tcohen |
hi LibraryClaire |
| 14:07 |
|
LibraryClaire |
hi tcohen |
| 14:07 |
|
|
kholt joined #koha |
| 14:08 |
|
tcohen |
bug 14332 |
| 14:08 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=14332 enhancement, P5 - low, ---, z.tajoli, RESOLVED FIXED, Skip title articles on Opac using ind2 of tag 245 (MARC21 only) |
| 14:13 |
|
tcohen |
that patches introduced a problem on the XSLTs |
| 14:13 |
|
tcohen |
does fiel 245 have any use in UNIMARC? |
| 14:16 |
|
|
kellym joined #koha |
| 14:22 |
|
|
baptiste joined #koha |
| 14:28 |
|
|
rsantellan joined #koha |
| 14:29 |
|
|
rocio joined #koha |
| 14:30 |
|
|
LibraryClaire left #koha |
| 14:31 |
|
Joubu |
tcohen: hea.koha-community.org : does it work for you with FF? |
| 14:31 |
|
Joubu |
and anybody else? |
| 14:31 |
|
Joubu |
please compare the behaviour with chromium if it does not work with FF |
| 14:33 |
|
|
stozza joined #koha |
| 14:36 |
|
oleonard |
Looks okay to me at first glance Joubu |
| 14:37 |
|
oleonard |
FF 53 and Chrome 57 on Windows. |
| 14:38 |
|
oleonard |
In Chrome the gradient doesn't appear behind the "Welcome to Hea" block, but that's not a big deal. |
| 14:39 |
|
Joubu |
thx oleonard |
| 14:39 |
|
Joubu |
someone elst? |
| 14:43 |
|
|
paul_p joined #koha |
| 14:46 |
|
|
cait joined #koha |
| 14:47 |
|
eythian |
Joubu: "Internal Server Error" on FF53.0 Linux. It's a properly formed error page, however. |
| 14:48 |
|
Joubu |
eythian: you hit it at the wrong time :) |
| 14:48 |
|
kidclamp |
Joubu: I confirm oleonard's findings |
| 14:49 |
|
eythian |
OK, now it's less error, more graphs and stuff |
| 14:49 |
|
|
Infra_3600 joined #koha |
| 14:50 |
|
Joubu |
ok so it just does not work for cait and me with FF... very weird |
| 14:52 |
|
oleonard |
Different FF version? |
| 14:52 |
|
misilot |
is there a way to not have the Koha Saved Reports add a ' ' around values on the input fields generated by << enter list of barcodes >> ? |
| 14:53 |
|
Joubu |
oleonard: sounds my version of FF is a bit old, I am upgrading to try |
| 14:53 |
|
Joubu |
the behaviour is: I open a new tab, fill the url, press enter. There is the loading icon during 1/2sec, then blank "new tab". |
| 14:54 |
|
|
talljoy joined #koha |
| 14:54 |
|
Joubu |
Network tab of debug says "Aborted", and I do not see the request in the access log |
| 14:54 |
|
Joubu |
it never reaches the server |
| 14:54 |
|
Joubu |
I have never seen that |
| 14:54 |
|
eythian |
huh |
| 14:54 |
|
eythian |
proxy? |
| 14:55 |
|
eythian |
or the https redirect? |
| 14:57 |
|
Joubu |
no proxy |
| 14:57 |
|
Joubu |
what could be the problem with the redirect? |
| 14:59 |
|
eythian |
Oh, I'm just throwing out possible things. |
| 14:59 |
|
eythian |
though, if your server never sees it, that's unlikely |
| 15:05 |
|
reiveune |
bye |
| 15:05 |
|
|
reiveune left #koha |
| 15:11 |
|
|
jac joined #koha |
| 15:21 |
|
|
jbeno joined #koha |
| 15:27 |
|
|
bapt_w joined #koha |
| 15:27 |
|
|
paul_p_ joined #koha |
| 15:29 |
|
tcohen |
Joubu: what shoudl I be looking for? |
| 15:29 |
|
Joubu |
https://hea.koha-community.org with FF |
| 15:29 |
|
tcohen |
yes |
| 15:30 |
|
tcohen |
but what I'm looking for? |
| 15:30 |
|
Joubu |
if you see something, nothing, just tell me "it works" |
| 15:30 |
|
Joubu |
alexbuckley: around? |
| 15:30 |
|
tcohen |
Joubu: it works as I would expect |
| 15:30 |
|
tcohen |
on firefox |
| 15:30 |
|
wahanui |
i heard on firefox was the same thing |
| 15:31 |
|
Joubu |
thx |
| 15:41 |
|
|
bapt_woj joined #koha |
| 15:41 |
|
|
paul_p__ joined #koha |
| 15:49 |
|
|
stozza joined #koha |
| 15:59 |
|
|
laurence left #koha |
| 16:08 |
|
|
stozza joined #koha |
| 16:08 |
|
|
mveron joined #koha |
| 16:26 |
|
|
CrispyBran joined #koha |
| 16:26 |
|
* CrispyBran |
waves |
| 16:37 |
|
|
laurence joined #koha |
| 16:37 |
|
|
laurence left #koha |
| 16:47 |
|
|
atheia left #koha |
| 17:52 |
|
oleonard |
Anyone know of any work being done to make AutomaticItemReturn more granular? A circ & fine rules setting for instance? |
| 17:55 |
|
|
baptiste joined #koha |
| 18:01 |
|
|
JoshB joined #koha |
| 18:08 |
|
tcohen |
@later tell matts fixed! please let me know if there's any issue |
| 18:08 |
|
huginn_ |
tcohen: The operation succeeded. |
| 18:10 |
|
|
JoshB joined #koha |
| 18:10 |
|
|
jenkins joined #koha |
| 18:22 |
|
tcohen |
jenkins: nice to have you back |
| 18:22 |
|
jenkins |
tcohen you may not issue bot commands in this chat! |
| 18:23 |
|
eythian |
wow, naughty tcohen |
| 18:47 |
|
oleonard |
Oh yay, the US House of Representatives just voted to take health insurance away from millions of Americans in order to pay for a tax cut for the rich. |
| 18:49 |
|
eythian |
sounds in keeping with what I'd expect from them. |
| 18:56 |
|
|
baptiste joined #koha |
| 19:17 |
|
|
kmlussier joined #koha |
| 19:50 |
|
|
kathryn joined #koha |
| 19:51 |
|
|
kellym joined #koha |
| 19:52 |
|
|
stozza joined #koha |
| 19:54 |
|
|
kathryn joined #koha |
| 20:04 |
|
|
cait joined #koha |
| 20:08 |
|
|
Kafilini joined #koha |
| 20:08 |
|
|
JoshB joined #koha |
| 20:11 |
|
|
jac joined #koha |
| 20:14 |
|
|
oleonard joined #koha |
| 20:16 |
|
|
kellym_ joined #koha |
| 20:59 |
|
|
Francesca joined #koha |
| 21:04 |
|
|
Francesca joined #koha |
| 21:06 |
|
jenkins |
Project Koha_Master_D8 build #163: STILL UNSTABLE in 1 hr 40 min: https://jenkins.koha-community[…]ha_Master_D8/163/ |
| 21:06 |
|
jenkins |
* kyle: Bug 18409: Make the controller for holds use Koha::Holds |
| 21:06 |
|
jenkins |
* kyle: Bug 18468 - When adding from a staged file order discounts are not |
| 21:06 |
|
jenkins |
* kyle: Bug 18435 - Language entered in Materials Specified does not display |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18409 critical, P5 - low, ---, tomascohen, Pushed to Master , Error when updating pickup library on patron pages |
| 21:06 |
|
jenkins |
* kyle: Bug 18457 - process_message_queue.pl will die if a patron has no |
| 21:06 |
|
jenkins |
* kyle: Bug 18457: Add tests |
| 21:06 |
|
jenkins |
* kyle: Bug 15702: Add test cases for modified code |
| 21:06 |
|
jenkins |
* kyle: Bug 15702: Recommended Counter-patch |
| 21:06 |
|
jenkins |
* kyle: Bug 18466: article requests box outline in opac |
| 21:06 |
|
jenkins |
* kyle: Bug 15815: Reword confirm message when removing patrons from card batch |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18468 major, P5 - low, ---, nick, Pushed to Master , When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices |
| 21:06 |
|
jenkins |
* kyle: Bug 18452: Correcting 'url' to say 'URL' in catalog detail |
| 21:06 |
|
jenkins |
* jonathan.druart: Bug 18066: Remove warnings from translate script |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18435 major, P5 - low, ---, nick, Pushed to Master , Message about Materials specified does not display when items are checked out and checked in |
| 21:06 |
|
jenkins |
* kyle: Bug 18461: Make tests break on wrong UTF8 data handilng |
| 21:06 |
|
jenkins |
* kyle: Bug 18461: (bug 13757 follow-up) Do not mix decode_json and to_json |
| 21:06 |
|
jenkins |
* kyle: Bug 18471 - Receiving order with unitprice greater than 1000 processing |
| 21:06 |
|
jenkins |
* kyle: Bug 18467: Handle orders with deleted biblio when viewing a basket |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18457 major, P5 - low, ---, kyle, Pushed to Master , process_message_queue.pl will die if a patron has no sms_provider_id set but sms via email is enabled for that patron |
| 21:06 |
|
jenkins |
* kyle: Bug 18179: Forbid list context calls for Koha::Objects->find |
| 21:06 |
|
jenkins |
* kyle: Bug 18179: Update existing calls |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=15702 normal, P5 - low, ---, mtompset, Pushed to Master , Trim whitespace from patron details upon submission |
| 21:06 |
|
jenkins |
* kyle: Bug 18482 False duplicates detected on adding a batch from a stage file |
| 21:06 |
|
jenkins |
* kyle: Bug 15738: Show rental fees on OPAC summary page |
| 21:06 |
|
jenkins |
* kyle: Bug 18419 - Broken patron-blank image in viewlog.tt |
| 21:06 |
|
jenkins |
* kyle: Bug 17916 - "Delete MARC modification template" fails to actually delete |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18466 trivial, P5 - low, ---, ephetteplace, Pushed to Master , No article requests breaks the opac-user-views block |
| 21:06 |
|
jenkins |
* kyle: Bug 18453: Hide the export column when needed |
| 21:06 |
|
jenkins |
* kyle: Bug 18453: Remove exports_enabled in circulation_batch_checkouts.tt |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=15815 enhancement, P5 - low, ---, aleisha, Pushed to Master , improve wording in popup warning when deleting patron from patron-batch |
| 21:06 |
|
jenkins |
* kyle: Bug 18479 - Holds 'Placed on' column in opac-user.pl not sorting |
| 21:06 |
|
jenkins |
* kyle: Update Italian installer sample files for 17.05 |
| 21:06 |
|
jenkins |
* kyle: Bug 13835: Popup with searches: results hidden by language menu in |
| 21:06 |
|
jenkins |
* kyle: Bug 17855: Onboarding tool |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18452 enhancement, P5 - low, ---, aleisha, Pushed to Master , Should say 'URL' instead of 'url' in catalog detail |
| 21:06 |
|
jenkins |
* kyle: Bug 17855 - Reverted back to original step 3 in the web installer so |
| 21:06 |
|
jenkins |
* kyle: Bug 17855 - Followup patch following requests in comments 176 and 177 |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18066 enhancement, P5 - low, ---, jonathan.druart, Pushed to Master , Hea - Version 2 |
| 21:06 |
|
jenkins |
* kyle: Bug 17855: perltidy onboarding.pl |
| 21:06 |
|
jenkins |
* kyle: Bug 17855: Do not create a new dbh, get it from C4::Context->dbh |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18461 critical, P5 - low, ---, jonathan.druart, Pushed to Master , Internal server error while approving OPAC-edited patron attributes containing umlauts (äöü) |
| 21:06 |
|
jenkins |
* kyle: Bug 17855: Redirect to the installer if installation process is not done |
| 21:06 |
|
jenkins |
* kyle: Bug 17855: No need to resend the library list to the template |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=13757 enhancement, P5 - low, ---, tomascohen, RESOLVED FIXED, Make patron attributes editable in the opac if set to 'editable in OPAC' |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18471 major, P5 - low, ---, kyle, Pushed to Master , Receiving order with unitprice greater than 1000 processing incorrectly |
| 21:06 |
|
jenkins |
* kyle: Bug 17855: Simplify the onboarding tool |
| 21:06 |
|
jenkins |
* kyle: Bug 12461 - Add patron clubs feature |
| 21:06 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18467 major, P5 - low, ---, jonathan.druart, Pushed to Master , Error calling count on undefined bib in basket.pl if order cancelled and record deleted |
| 21:07 |
|
jenkins |
* kyle: Bug 12461 [QA Followup] |
| 21:07 |
|
jenkins |
* kyle: Bug 12461 - (QA Followup) |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18179 major, P5 - low, ---, jonathan.druart, Passed QA , Koha::Objects->find should not be called in list context |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18482 major, P5 - low, ---, koha, Pushed to Master , False duplicates detected on adding a batch from a stage file |
| 21:07 |
|
jenkins |
* kyle: Bug 14143 - Patron cards: Crash (confusion between table names |
| 21:07 |
|
jenkins |
* kyle: Bug 12461 - DBRev 16.12.00.027 |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=15738 normal, P5 - low, ---, aleisha, Pushed to Master , Summary page says item has no fines, but Fines tab says otherwise |
| 21:07 |
|
jenkins |
* kyle: Bug 18110: Add a field FR to the syspref AddressFormat |
| 21:07 |
|
jenkins |
* kyle: Bug 18110: Corrected display address format |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18419 normal, P5 - low, ---, oleonard, Pushed to Master , Broken patron-blank image in viewlog.tt |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=17916 normal, P5 - low, ---, oleonard, Pushed to Master , "Delete MARC modification template" fails to actually delete it |
| 21:07 |
|
jenkins |
* kyle: Bug 18110: Removed unwanted spaces |
| 21:07 |
|
jenkins |
* kyle: Bug 18110: Folllowup to fix alternative address and add missing class |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18453 normal, P5 - low, ---, jonathan.druart, Pushed to Master , "Export" column is not hidden when ExportCircHistory is off |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18479 normal, P5 - low, ---, oleonard, Pushed to Master , Holds 'Placed on' column in opac-user.pl not sorting correctly |
| 21:07 |
|
jenkins |
* kyle: Bug 18110: Update addressFormat in atomicupdate |
| 21:07 |
|
jenkins |
* kyle: Bug 18110: Do not update value for existing installs |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=13835 trivial, P5 - low, ---, veron, Pushed to Master , Popup with searches: results hidden by language menu in footer |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=17855 new feature, P5 - low, ---, jonathan.druart, Pushed to Master , New onboarding tool feature to guide users through setting up Koha, and minor web installer UI improvements |
| 21:07 |
|
jenkins |
* kyle: Bug 18110 - DBRev 16.12.00.028 |
| 21:07 |
|
jenkins |
* kyle: Bug 18401: Add new method Koha::Checkout->patron |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=12461 new feature, P5 - low, ---, kyle, Pushed to Master , Add patron clubs feature |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=14143 major, P5 - low, ---, veron, Pushed to Master , Patron cards: Crash (confusion between table names creator_templates and club_template_enrollment_fields |
| 21:07 |
|
jenkins |
* kyle: Bug 18402: Add the Koha::Item->checkout method |
| 21:07 |
|
jenkins |
* kyle: Bug 18484 - opac-advsearch.tt missing closing div tag for |
| 21:07 |
|
rangi |
holy crap! |
| 21:07 |
|
* wahanui |
blesses crap |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18110 enhancement, P5 - low, ---, baptiste.wojtkowski, Pushed to Master , Adds FR to the syspref AddressFormat |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Allow patron notes about item shown at check in |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Do not reintroduce GetItemIssue, it's dying |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18401 enhancement, P5 - low, ---, jonathan.druart, Pushed to Master , Add the Koha::Checkout->patron method |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18402 enhancement, P5 - low, ---, jonathan.druart, Pushed to Master , Add the Koha::Item->checkout method |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Reintroduce previous copyright |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Remove SQL query in svc script |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18484 enhancement, P5 - low, ---, oleonard, Pushed to Master , opac-advsearch.tt missing closing div tag for .container-fluid |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=14224 new feature, P5 - low, ---, aleisha, Pushed to Master , patron notes about item shown at check in |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Fix prevent submit |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Make strings translatable |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Replace AllowIssueNotes with AllowCheckoutNotes |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Update Copyright |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Improve escaped characters |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Check if the columns do not exist before creating them |
| 21:07 |
|
jenkins |
* kyle: Bug 14224: Use encode_json instead of to_json |
| 21:07 |
|
jenkins |
* kyle: Bug 14424: DBIC Schema changes |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=14424 normal, P5 - low, ---, nengard, CLOSED FIXED, Update Help Files for 3.20 |
| 21:07 |
|
jenkins |
* kyle: Bug 14224 - DBRev 16.12.00.029 |
| 21:07 |
|
jenkins |
* kyle: Bug 16344: Add a circ rule to limit the auto renewals given a specific |
| 21:07 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=16344 enhancement, P5 - low, ---, jonathan.druart, Pushed to Master , Add a circ rule to limit the auto renewals given a specific date |
| 21:07 |
|
jenkins |
* kyle: Bug 16344: Fix alignment between top and bottom columns |
| 21:07 |
|
jenkins |
* kyle: Bug 16344 - Update Schema |
| 21:07 |
|
jenkins |
* kyle: Bug 16344 - DBRev 16.12.00.030 |
| 21:07 |
|
jenkins |
* kyle: Revert "Bug 18179: Update existing calls" |
| 21:07 |
|
jenkins |
* kyle: Revert "Bug 18179: Forbid list context calls for Koha::Objects->find" |
| 21:07 |
|
rangi |
i guess jenkins is working agaiin :) |
| 21:09 |
|
|
andreashm joined #koha |
| 21:11 |
|
* andreashm |
waves |
| 21:17 |
|
|
baptiste joined #koha |
| 21:26 |
|
|
stozza joined #koha |
| 21:48 |
|
CrispyBran |
Joubu: are you here? |
| 21:49 |
|
|
alexbuckley_ joined #koha |
| 21:50 |
|
CrispyBran |
alexbuckley: got a moment? |
| 21:51 |
|
CrispyBran |
alexbuckley_ ^ |
| 21:53 |
|
CrispyBran |
I need some advice on submitting a patch. Anyone available? |
| 21:54 |
|
wizzyrea |
go ahead |
| 21:54 |
|
CrispyBran |
What are the steps to write a patch that depends on another patch? It doesn't seem to be as straight forward as I thought. |
| 21:55 |
|
CrispyBran |
I couldn't find anything in the guidelines |
| 21:55 |
|
wizzyrea |
You make a branch, apply the first patch |
| 21:55 |
|
wizzyrea |
do your development on top of that |
| 21:55 |
|
wizzyrea |
commit the new stuff |
| 21:55 |
|
wizzyrea |
make a bug for your patch, set a depends for the other bug |
| 21:56 |
|
wizzyrea |
it can be pretty awkward, especially when you get to the part where the first patch gets pushed |
| 21:56 |
|
wizzyrea |
or your work branch diverges from master. |
| 21:56 |
|
wizzyrea |
you might need to give a concrete example of what you are dealing with |
| 21:57 |
|
wizzyrea |
and what kind of problem you are having with the process. |
| 21:57 |
|
wizzyrea |
(i.e. which part is hanging you up) |
| 21:57 |
|
wizzyrea |
CrispyBran ^ |
| 21:58 |
|
CrispyBran |
I'm testing a patch a wrote. Depends on another patch I wrote. I'm testing application by creating a clean patch. The first patch applies, but the second gtives me an error... |
| 21:59 |
|
CrispyBran |
Apply? [(y)es, (n)o, (i)nteractive] y |
| 21:59 |
|
CrispyBran |
Applying: Bug 18355: Modifies location on detail pages. |
| 21:59 |
|
CrispyBran |
Using index info to reconstruct a base tree... |
| 21:59 |
|
CrispyBran |
M catalogue/detail.pl |
| 21:59 |
|
CrispyBran |
M opac/opac-detail.pl |
| 21:59 |
|
CrispyBran |
Falling back to patching base and 3-way merge... |
| 21:59 |
|
CrispyBran |
No changes -- Patch already applied. |
| 21:59 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18355 enhancement, P5 - low, ---, cbrannon, Needs Signoff , Permanent location should show with cart location |
| 21:59 |
|
wizzyrea |
did you rebase the 2nd patch into the first? |
| 21:59 |
|
CrispyBran |
oh wait.... |
| 21:59 |
|
wahanui |
is Godot coming? |
| 21:59 |
|
CrispyBran |
wrong patch! |
| 21:59 |
|
wizzyrea |
:) |
| 22:07 |
|
CrispyBran |
how does one remove patches from a branch? Basically reset the branch. |
| 22:08 |
|
wizzyrea |
there are a few ways |
| 22:08 |
|
wizzyrea |
1. reset to the upstream version, i.e. git reset origin/master (to checkout master) |
| 22:09 |
|
wizzyrea |
if you want to absolutely nuke the patches, reset --hard origin/master |
| 22:09 |
|
wizzyrea |
2. Reset to a commitid, i.e. git reset (--hard, if you want) commitid |
| 22:10 |
|
wizzyrea |
3. reset using pointers, i.e. git reset (--hard) HEAD^ (to reset one patch back, HEAD^^ for two, etc.) |
| 22:10 |
|
wizzyrea |
but basically |
| 22:10 |
|
wahanui |
basically is all but closed/wontfix/invalid |
| 22:10 |
|
wizzyrea |
git reset. |
| 22:12 |
|
|
JoshB joined #koha |
| 22:15 |
|
wizzyrea |
forget basically |
| 22:15 |
|
wahanui |
wizzyrea: I forgot basically |
| 22:16 |
|
wizzyrea |
but basically |
| 22:16 |
|
wizzyrea |
ya |
| 22:16 |
|
wizzyrea |
yay |
| 22:17 |
|
CrispyBran |
wizzrea: thanks |
| 22:17 |
|
CrispyBran |
wizzyrea ^ |
| 22:17 |
|
wizzyrea |
:) |
| 22:17 |
|
wizzyrea |
np |
| 22:18 |
|
CrispyBran |
I was doing it right. Now I just have to update my patch. Getting a 3-way merge. |
| 22:18 |
|
wizzyrea |
yeah that stuff is kinda basic git stuff |
| 22:18 |
|
wizzyrea |
well not basic. |
| 22:18 |
|
wizzyrea |
but it's git stuff, not koha stuff. |
| 22:18 |
|
CrispyBran |
Do I basically goto the branch I created the patch in and rebase? |
| 22:19 |
|
CrispyBran |
or at least start there? |
| 22:19 |
|
wizzyrea |
what I'd probably do in your case |
| 22:19 |
|
wizzyrea |
is make a new branch off of master |
| 22:19 |
|
wizzyrea |
apply the 1st patch |
| 22:19 |
|
wizzyrea |
then get the commitid of the patch you want |
| 22:19 |
|
wizzyrea |
and cherry pick it on to the new branch |
| 22:20 |
|
wizzyrea |
that way you're certain you've got what you want |
| 22:20 |
|
wizzyrea |
if *that* doesn't apply, you at least haven't messed up the branch your work is on |
| 22:22 |
|
|
baptiste joined #koha |
| 22:23 |
|
wizzyrea |
so like |
| 22:23 |
|
wizzyrea |
git checkout -b new-branch origin/master |
| 22:23 |
|
wizzyrea |
git bz apply xxxxxx |
| 22:23 |
|
wizzyrea |
git cherry-pick commitid of your new patch from the other branch |
| 22:25 |
|
wizzyrea |
if that makes sense? |
| 22:25 |
|
wizzyrea |
git is fiddly |
| 22:25 |
|
CrispyBran |
what is the commitid? |
| 22:25 |
|
wizzyrea |
oh |
| 22:25 |
|
wizzyrea |
right, so |
| 22:25 |
|
wahanui |
i guess right, so is the merge_authority.pl cronjob started by default? Or did I misunderstand what it is saying. |
| 22:26 |
|
pastebot |
"wizzyrea" at 127.0.0.1 pasted "for crispybran" (3 lines) at http://paste.koha-community.org/396 |
| 22:26 |
|
wizzyrea |
when you do git log |
| 22:26 |
|
wizzyrea |
on a branch |
| 22:26 |
|
wizzyrea |
it shows you something like in the paste |
| 22:26 |
|
wizzyrea |
at the top of each commit |
| 22:26 |
|
wizzyrea |
b4901dce598e94d0732428e98273c8101428487d < this is the commitid |
| 22:27 |
|
wizzyrea |
you can use the first 8 only as well |
| 22:27 |
|
wizzyrea |
but it's easier to copy the whole thing :P |
| 22:31 |
|
wizzyrea |
so for example, to get the commitid |
| 22:31 |
|
wizzyrea |
say your work branch was called feature |
| 22:31 |
|
wizzyrea |
git checkout feature |
| 22:31 |
|
wizzyrea |
git log |
| 22:31 |
|
wizzyrea |
grab the commitid from the patch you want |
| 22:31 |
|
wizzyrea |
make a new branch |
| 22:32 |
|
wizzyrea |
git checkout -b feature1 origin/master |
| 22:32 |
|
wizzyrea |
git bz apply xxxxx |
| 22:32 |
|
wizzyrea |
git cherry-pick commitid |
| 22:32 |
|
wizzyrea |
(which hopefully works) |
| 22:33 |
|
CrispyBran |
I can copy the commitid, but I don't know how to paste it in the command line |
| 22:33 |
|
wizzyrea |
right click -> paste? |
| 22:33 |
|
wizzyrea |
middle button on linux, if that's your jam. |
| 22:33 |
|
wizzyrea |
middle mouse* button |
| 22:33 |
|
CrispyBran |
ah! |
| 22:34 |
|
CrispyBran |
nothing to commit |
| 22:34 |
|
wahanui |
hmmm... nothing to commit is ok after applying the patch |
| 22:34 |
|
wizzyrea |
so hm, is your work included in the upstream patch already then? |
| 22:34 |
|
CrispyBran |
vagrant kohadevbox:circ(18503)$ git cherry-pick 13b9539fef0a5d2c112d12f51c926dca1c70cfcc |
| 22:34 |
|
CrispyBran |
On branch 18503 |
| 22:34 |
|
CrispyBran |
You are currently cherry-picking commit 13b9539. |
| 22:34 |
|
CrispyBran |
nothing to commit, working directory clean |
| 22:34 |
|
CrispyBran |
The previous cherry-pick is now empty, possibly due to conflict resolution. |
| 22:34 |
|
CrispyBran |
If you wish to commit it anyway, use: |
| 22:34 |
|
CrispyBran |
git commit --allow-empty |
| 22:34 |
|
CrispyBran |
Otherwise, please use 'git reset' |
| 22:34 |
|
CrispyBran |
vagrantkohadevbox:circ(18503|CHERRY-PICKING)$ |
| 22:35 |
|
wizzyrea |
the only time this really happens is when the code you are trying to apply is already in the branch |
| 22:35 |
|
wizzyrea |
so either it's been pushed to master already |
| 22:35 |
|
wizzyrea |
or the bz apply has it |
| 22:36 |
|
CrispyBran |
I'm confused. This is what I get when I apply to a clean branch: |
| 22:36 |
|
CrispyBran |
vagrantkohadevbox:circ(18503)$ git bz apply 18503 |
| 22:36 |
|
CrispyBran |
Bug 18503 Depends on bug 18490 |
| 22:36 |
|
CrispyBran |
Follow? [(y)es, (n)o] y |
| 22:36 |
|
CrispyBran |
Bug 18490 - Transfer message confusing, cancel button missing |
| 22:36 |
|
CrispyBran |
62649 - [Bug 18490] Change transfer message/show cancel |
| 22:36 |
|
CrispyBran |
Apply? [(y)es, (n)o, (i)nteractive] y |
| 22:36 |
|
CrispyBran |
Applying: Change transfer message/show cancel |
| 22:36 |
|
wahanui |
CrispyBran: that doesn't look right |
| 22:36 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18503 normal, P5 - low, ---, cbrannon, In Discussion , Confusing hold and transfer dialog |
| 22:36 |
|
CrispyBran |
Bug 18503 - Confusing hold and transfer dialog |
| 22:36 |
|
CrispyBran |
62990 - Bug 18503: Fixes confusing dialog and other minor |
| 22:36 |
|
huginn_ |
Bug http://bugs.koha-community.org[…]_bug.cgi?id=18490 enhancement, P5 - low, ---, cbrannon, Needs Signoff , Transfer message confusing, cancel button missing |
| 22:36 |
|
CrispyBran |
Apply? [(y)es, (n)o, (i)nteractive] i |
| 22:36 |
|
CrispyBran |
Applying: Bug 18503: Fixes confusing dialog and other minor |
| 22:36 |
|
CrispyBran |
Using index info to reconstruct a base tree... |
| 22:36 |
|
CrispyBran |
M koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt |
| 22:36 |
|
CrispyBran |
Falling back to patching base and 3-way merge... |
| 22:36 |
|
CrispyBran |
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt |
| 22:36 |
|
wizzyrea |
hm, paste probably better for that kind of thing :) |
| 22:38 |
|
CrispyBran |
http://paste.koha-community.org/397 |
| 22:38 |
|
wizzyrea |
yay ty |
| 22:39 |
|
wizzyrea |
question, have you pulled master recently? |
| 22:40 |
|
CrispyBran |
Yes. Before I did I was able to apply the patch. Then I did a pull and tried to apply to a new clean branch and this is what I get. |
| 22:40 |
|
wizzyrea |
http://paste.koha-community.org/398 |
| 22:40 |
|
wizzyrea |
this is what it says to me for that first patch on 18503 |
| 22:40 |
|
wizzyrea |
so it looks like the patch is based on a different version |
| 22:40 |
|
wizzyrea |
and needs to be rebased onto current master |
| 22:41 |
|
wizzyrea |
you did say that it depended on something else though? |
| 22:41 |
|
CrispyBran |
yes. 18490 |
| 22:41 |
|
wizzyrea |
oh I see |
| 22:41 |
|
wizzyrea |
yeah ok 2 shakes |
| 22:42 |
|
wizzyrea |
http://ohshitgit.com/ you might like this |
| 22:43 |
|
CrispyBran |
City filter is blocking it. Comes up as a parked site. |
| 22:43 |
|
wizzyrea |
heh |
| 22:43 |
|
wizzyrea |
because it's sweary likely. |
| 22:43 |
|
wizzyrea |
well it's not really sweary. |
| 22:43 |
|
wizzyrea |
i mean, it is, but it isn't. |
| 22:43 |
|
wizzyrea |
it's nothing the average developer hasn't said whilst working with git. |
| 22:44 |
|
wizzyrea |
anyway, bookmark that for a time when you have internet access that doesn't suck. |
| 22:44 |
|
ibeardslee |
which is probably swearyer than the average church service |
| 22:44 |
|
bag |
@later tell pianohacker there is nothing like a sous vided softboiled egg and a nice glass of scotch |
| 22:44 |
|
huginn_ |
bag: The operation succeeded. |
| 22:45 |
|
CrispyBran |
wizzyrea, so should I go to the branch I created the patch in and do git rebase? |
| 22:46 |
|
wizzyrea |
that should work yes, just git rebase origin/master |
| 22:46 |
|
wizzyrea |
in theory |
| 22:46 |
|
wizzyrea |
you could, if you were feeling freaked out |
| 22:46 |
|
wizzyrea |
make a branch off of your work branch |
| 22:46 |
|
wizzyrea |
so |
| 22:46 |
|
wizzyrea |
git checkout feature |
| 22:47 |
|
wizzyrea |
git checkout -b feature-rebase |
| 22:47 |
|
wizzyrea |
and do your rebase there |
| 22:47 |
|
wizzyrea |
again, because that way you won't mess up your branch where the work is |
| 22:48 |
|
CrispyBran |
so if I create a branch while in a branch I have altered, it will create a new branch based off my changes? |
| 22:48 |
|
wizzyrea |
exactly |
| 22:48 |
|
CrispyBran |
nice to know |
| 22:48 |
|
wizzyrea |
<pulpit time> |
| 22:48 |
|
wizzyrea |
that is why I keep an utterly clean master branch |
| 22:49 |
|
wizzyrea |
and do branches (either wip-xxxxx or qa-xxxxx) that are checked out off of a master that is automatically updated |
| 22:49 |
|
wizzyrea |
this way I know when I start, that I am working off of the most recent upstream |
| 22:49 |
|
wizzyrea |
and if it doesn't work, to find out why. |
| 22:50 |
|
wizzyrea |
but I always know where my base is. |
| 22:50 |
|
wizzyrea |
</pulpit time> |
| 22:50 |
|
wizzyrea |
(sometimes I mess up and accidentally do something on my master branch |
| 22:50 |
|
CrispyBran |
http://paste.koha-community.org/399 |
| 22:50 |
|
wizzyrea |
so I just make a branch off of it, and reset master back to origin/master) |
| 22:51 |
|
wizzyrea |
hey that looks working-ish |
| 22:51 |
|
CrispyBran |
Not sure what to do with it from here. |
| 22:51 |
|
wizzyrea |
what are you trying to do? |
| 22:51 |
|
wizzyrea |
get it to apply on top of the patch from bz? |
| 22:52 |
|
wizzyrea |
it may just not work in an automatic way |
| 22:52 |
|
CrispyBran |
No |
| 22:52 |
|
wizzyrea |
i mean, the patch for 18490 |
| 22:52 |
|
wizzyrea |
so you have this patch, and it depends on 18490 |
| 22:53 |
|
wizzyrea |
or 18490 and 18503 |
| 22:53 |
|
wahanui |
36993 |
| 22:53 |
|
wizzyrea |
thank you maths wizard. |
| 22:53 |
|
CrispyBran |
18530 depends on 18490. |
| 22:54 |
|
wizzyrea |
and 18530 won't apply because of this sha1 problem? |
| 22:55 |
|
wizzyrea |
i mean, that's what I see here anyway |
| 22:55 |
|
wizzyrea |
* won't apply from bugzilla anyway |
| 22:57 |
|
|
Francesca joined #koha |
| 23:11 |
|
|
CrispyBran joined #koha |
| 23:12 |
|
CrispyBran |
wizzyrea, sorry. Lost internet temporarily. I think it was that sweary link you sent me. :) |
| 23:12 |
|
wizzyrea |
I've contacted the person who runs that site |
| 23:12 |
|
wizzyrea |
it's dumb that people can't see it because of the swears. |
| 23:12 |
|
wizzyrea |
because it's actually the very best resource for when you've gotten yourself into git trouble |
| 23:13 |
|
CrispyBran |
Anyway, I have to clock out. I apprecaite your help. |
| 23:13 |
|
wizzyrea |
well I'm sorry we didn't sort it out |
| 23:13 |
|
CrispyBran |
I'll try again soon. |
| 23:13 |
|
wizzyrea |
it probably *can* be fixed, in time. :) |
| 23:48 |
|
|
caboose-afk joined #koha |
| 23:54 |
|
|
dilan joined #koha |
