1 2013-09-21T00:13:07 *** uuliyan
2 2013-09-21T02:17:55 *** uuliyan
3 2013-09-21T03:43:55 *** sunumonster
4 2013-09-21T03:44:17 *** sunumonster
5 2013-09-21T04:59:04 *** uuliyan
6 2013-09-21T05:23:25 *** uuliyan
7 2013-09-21T07:34:28 *** uuliyan
8 2013-09-21T08:37:45 <sharky93> moin
9 2013-09-21T08:37:54 <sharky93> how do we usually resolve merge conlficts?
10 2013-09-21T08:37:58 <sharky93> im facing this @ http://i.imgur.com/EmAyDnF.png
11 2013-09-21T08:38:27 <sharky93> this is while merging the main repo to one of my forks
12 2013-09-21T08:42:19 <sharky93> TheSheep: why do we want to serve bootstrap to all themes? @ https://bitbucket.org/thomaswaldmann/moin-2.0/src/e58f8d21b373aedf4e40c4f5e61e344a52fa97e6/MoinMoin/templates/base.html?at=default#cl-45
13 2013-09-21T10:48:42 *** uuliyan
14 2013-09-21T11:26:52 *** uuliyan
15 2013-09-21T11:32:23 *** uuliyan
16 2013-09-21T12:01:31 *** uuliyan
17 2013-09-21T12:01:58 <TheSheep> sharky93: I'm not sure
18 2013-09-21T13:08:24 <sharky93> TheSheep: i got rid of it.
19 2013-09-21T14:26:31 *** greg_f
20 2013-09-21T15:06:36 *** RogerHaase
21 2013-09-21T15:39:18 *** ashutosh1461
22 2013-09-21T16:33:12 <ThomasWaldmann> ashutosh1461: there is nothing yet documenting about how moin has to be configured for multiple namespaces (not the simple mapping), right?
23 2013-09-21T16:37:19 <ashutosh1461> ThomasWaldmann, I will do it, anything other than defining the rules for default root mapping ?
24 2013-09-21T16:43:21 *** ashutosh1461
25 2013-09-21T17:18:21 *** ashutosh1461
26 2013-09-21T17:18:34 <TheSheep> sharky93: some serious cleanup, very good!
27 2013-09-21T17:20:06 <TheSheep> sharky93: if only basic theme uses bootstrap now, and it has to come with its own version anyways (because it uses all this LESS class inheritance), then we don't need the x-static stuff anymore either, right?
28 2013-09-21T17:23:51 <ThomasWaldmann> ashutosh1461: http://rn0.ru/show/U5y3YW3zl9vSyFKG3Pql/ i have used this for testing
29 2013-09-21T17:25:23 <ashutosh1461> ThomasWaldmann, are there any problems ?
30 2013-09-21T17:25:48 <ThomasWaldmann> well, ui is lacking a lot
31 2013-09-21T17:26:39 <ThomasWaldmann> foobar theme doesn't show namespace switcher (modernized does)
32 2013-09-21T17:27:18 *** sharky993
33 2013-09-21T17:28:04 <ThomasWaldmann> ashutosh1461: so, did you just update one of the themes and if so, which shall i use for evaluation?
34 2013-09-21T17:28:59 <ashutosh1461> ThomasWaldmann, modernized.
35 2013-09-21T17:30:25 <ThomasWaldmann> hmm, crash on +usersettings when trying to switch back :|
36 2013-09-21T17:30:45 <ThomasWaldmann> fqname is undefined
37 2013-09-21T17:34:08 <ashutosh1461> ThomasWaldmann, are you talking about http://localhost:8080/+usersettings ?
38 2013-09-21T17:35:56 <ThomasWaldmann> yes
39 2013-09-21T17:36:43 <ashutosh1461> it's opening fine here, and i tested on a new env, plus i did diff from the repo, which comes out to be zero ?
40 2013-09-21T17:37:42 <ThomasWaldmann> i created fresh storage from scratch, using the stuff i pasted as wikiconfig_editme.py
41 2013-09-21T17:38:03 <ThomasWaldmann> and it's latest code from your public repo
42 2013-09-21T17:38:34 <ThomasWaldmann> and it only happens after having switched to foobar theme and then trying to switch back
43 2013-09-21T17:39:32 <ThomasWaldmann> i'll file bugs, too much for irc
44 2013-09-21T17:39:36 <ashutosh1461> hmm ok.
45 2013-09-21T17:46:55 <ThomasWaldmann> how do i get the really-global history ("all" namespace)?
46 2013-09-21T17:49:14 <ashutosh1461> /all/+history
47 2013-09-21T17:51:19 <ThomasWaldmann> NotImplementedError
48 2013-09-21T17:51:48 <ThomasWaldmann> (and also i didn't mean to enter a url manually, but how I reach that view from the UI)
49 2013-09-21T17:55:20 <ashutosh1461> where should i give the link ?
50 2013-09-21T17:55:30 <ashutosh1461> to global views
51 2013-09-21T17:57:13 <ThomasWaldmann> guess it is a bit late to discuss about such stuff now
52 2013-09-21T17:57:21 <sharky993> TheSheep, should I add the ACL edit box to the templates for foobar and modernized or simply make it optional for now?
53 2013-09-21T17:58:00 <TheSheep> sharky993: it should appear in all themes
54 2013-09-21T17:58:26 <TheSheep> sharky993: possibly in the global moin's template
55 2013-09-21T17:59:04 <sharky993> TheSheep, sure
56 2013-09-21T17:59:33 <ashutosh1461> ThomasWaldmann, i will add them, anyways the relation doesn't end with end of gsoc campaign :D
57 2013-09-21T18:00:24 * ThomasWaldmann filed a bug about it
58 2013-09-21T18:15:53 <sharky993> TheSheep, added to global template.
59 2013-09-21T18:17:09 *** eSyr
60 2013-09-21T18:32:59 <ThomasWaldmann> lots of issues...
61 2013-09-21T18:33:36 <ThomasWaldmann> ashutosh1461: did you ever try to actually use your code?
62 2013-09-21T18:34:56 <ThomasWaldmann> (some stuff works, but a lot of crashing and burning still)
63 2013-09-21T18:35:26 <ashutosh1461> ThomasWaldmann, i tested it several times, but as it happens always with me, some issues remain unseen :(
64 2013-09-21T18:36:59 <ashutosh1461> btw i am fixing the issues should not take more than 1 day.
65 2013-09-21T18:41:20 *** greg_f
66 2013-09-21T18:44:22 <ThomasWaldmann> i'ld guess it takes much longer, but I'll be happy if it's done quicker.
67 2013-09-21T19:05:50 <ashutosh1461> ThomasWaldmann, where do we want the links to global namespace independent views appear ?
68 2013-09-21T19:07:41 <sharky993> TheSheep, im facing a strange issue, the "Locale" in UserSettings is being loaded as "Deutsch", same for you?
69 2013-09-21T19:07:59 <sharky993> TheSheep, this is when everything is rendered in English.
70 2013-09-21T19:22:01 <ThomasWaldmann> ashutosh1461: you could add "all" to the namespaces dropdown, link to /all/ and render some stuff there...
71 2013-09-21T19:26:46 <ashutosh1461> maybe link the namespace "all" in the dropdown to a new view like /+all and define the stuff there.
72 2013-09-21T19:30:28 <ThomasWaldmann> or that...
73 2013-09-21T19:36:03 <ashutosh1461> ThomasWaldmann, about the '%40' in the urls, flask quotes '@' to %40 .. so how can we avoid that ??
74 2013-09-21T19:46:46 <sharky993> TheSheep, but once set to some value, it shows up correctly.
75 2013-09-21T20:01:07 *** ashutosh1461
76 2013-09-21T20:12:51 *** ashutosh1461
77 2013-09-21T20:16:10 <TheSheep> sharky993: looks like a bug somewhere, but it's not related to your work
78 2013-09-21T20:44:46 *** RogerHaase
79 2013-09-21T22:07:37 * sharky993 says gn
80 2013-09-21T22:14:42 *** sharky993
81