ckeditor changes
|/
* c4c0e09 fixed ckeditor formatting
* 1747b84 ckeditor, contenteditable false???
* 1f1540b edit event formatting
On Sunday, 8 December 2013 07:41:59 UTC+11, Peter J Weisberg wrote:
On Dec 7, 2013 11:32 AM, Phillip Tutt phil...@gmail.com javascript:
wrote:
Yes it does
That makes sense. I was trying the do until works strategy. Thanks for
your help.
On Saturday, 7 December 2013 14:59:03 UTC+11, Huu Da Tran wrote:
On Friday, December 6, 2013 10:48:29 PM UTC-5, Phillip Tutt wrote:
For sure. This is where I was fumbling to try to get it all working:
1
accurate than my memory.
On Sunday, 8 December 2013 07:41:59 UTC+11, Peter J Weisberg wrote:
On Dec 7, 2013 11:32 AM, Phillip Tutt phil...@gmail.com javascript:
wrote:
Yes it does. That commit is just prior to commencing work on the
laptop. What Huu said about using git clone instead
:25 UTC+11, Peter J Weisberg wrote:
On Dec 6, 2013 7:32 PM, Phillip Tutt phil...@gmail.com javascript:
wrote:
This is the bit that doesn't make sense:
1. Remote last log entry:
2013-11-04
Phil
ticketing and questions working
admintemplate
4a09c3
2. Desktop last log entries
and questions working
On Saturday, 7 December 2013 02:12:39 UTC+11, Huu Da Tran wrote:
On Thursday, December 5, 2013 7:08:14 AM UTC-5, Phillip Tutt wrote:
What I would expect is the code now on the desktop would be the same as
what was on the laptop...however, I found that some kind of merge
December 2013 12:08:14 UTC, Phillip Tutt wrote:
Hi guys,
I am pretty new to git, but I have found that it doesn't work as I would
expect.
I work sometimes from my laptop and other times from my desktop, each
having a local git repository.
I have set up a remote, which I push the changes
Sorry...here's the log from the laptop. However, it has a couple of
commits that have not been pushed to the remote yet:
commit c21b88e665603310b74b8f3c80f23782ebb4d562
Author: Phil x...@gmail.com
Date: Tue Nov 19 20:17:18 2013 +0800
payment progress
commit
Hi guys,
I am pretty new to git, but I have found that it doesn't work as I would
expect.
I work sometimes from my laptop and other times from my desktop, each
having a local git repository.
I have set up a remote, which I push the changes from my branches to.
Now, what I would expect is
