[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 483: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 112: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/bbcode.php on line 112: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead
[phpBB Debug] PHP Warning: in file [ROOT]/includes/functions.php on line 4697: Cannot modify header information - headers already sent by (output started at [ROOT]/includes/functions.php:3823)
[phpBB Debug] PHP Warning: in file [ROOT]/includes/functions.php on line 4699: Cannot modify header information - headers already sent by (output started at [ROOT]/includes/functions.php:3823)
[phpBB Debug] PHP Warning: in file [ROOT]/includes/functions.php on line 4700: Cannot modify header information - headers already sent by (output started at [ROOT]/includes/functions.php:3823)
[phpBB Debug] PHP Warning: in file [ROOT]/includes/functions.php on line 4701: Cannot modify header information - headers already sent by (output started at [ROOT]/includes/functions.php:3823)
indielib.com • View topic - Possible bug and a suggestion

indielib.com

IndieLib Forum
It is currently Wed Feb 24, 2021 10:49 pm

All times are UTC




Post new topic Reply to topic  [ 9 posts ] 
Author Message
PostPosted: Mon Oct 21, 2013 5:14 pm 
Offline

Joined: Sat Mar 16, 2013 7:11 pm
Posts: 36


Top
 Profile  
 
PostPosted: Thu Oct 24, 2013 8:58 pm 
Offline
Site Admin

Joined: Thu Jul 16, 2009 1:52 pm
Posts: 250
Location: London, UK
Great thanks!

I suggest you make a pull request in github, you already fixed an issue and we will be very happy to add it :)

Ah and about timer we may have bug there. I will think about it more carefully as now i dont know what to say.


Top
 Profile  
 
PostPosted: Fri Oct 25, 2013 2:55 pm 
Offline

Joined: Sat Mar 16, 2013 7:11 pm
Posts: 36
Please tell me if I did it right. I never used git before :D

Also I'm sorry for posting this thread it here, I just noticed there was a bug/suggestion forum :?


Top
 Profile  
 
PostPosted: Sun Oct 27, 2013 5:13 pm 
Offline
Site Admin
User avatar

Joined: Sun Jan 02, 2011 2:06 pm
Posts: 222
Location: Denmark
Hi faybe,
I think it is ok, - sorry for the slow handling of the pull-request, - I think DarthMike is really busy at the moment ( havn't heard from him lately, - but he will surface again, - he allways do :wink: ). Usually he does the merging into the main branch (I have a branch that needs merging to, so be sure I will nag him about your pull-request).

Again, thank for the pull-request it is really great of you =)

Regards.
MFK

_________________
Cross-platform repository: https://github.com/DarthMike/indielib-crossplatform
Cross-platform roadmap: http://www.indielib.com/wiki/index.php? ... eloper_FAQ


Top
 Profile  
 
PostPosted: Sun Oct 27, 2013 7:51 pm 
Offline
Site Admin

Joined: Thu Jul 16, 2009 1:52 pm
Posts: 250
Location: London, UK
Hi i was in a short trip during weekend, no work :) i will manage it on Monday. I had suggestion to have some unit test for it, if you feel like it. If not I will merge anyway.

Thanks!


Top
 Profile  
 
PostPosted: Mon Oct 28, 2013 5:43 pm 
Offline

Joined: Sat Mar 16, 2013 7:11 pm
Posts: 36


Last edited by faybe on Mon Oct 28, 2013 6:06 pm, edited 1 time in total.

Top
 Profile  
 
PostPosted: Mon Oct 28, 2013 6:03 pm 
Offline
Site Admin

Joined: Thu Jul 16, 2009 1:52 pm
Posts: 250
Location: London, UK
If you use a GUI, I don't really know too much. I prefer sourcetree anyway.

Regarding your question, you need to pull changes from the upstream repository. Meaning, you have 3 repos in structure for github:

UPSTREAM (ORIGINAL INDIELIB)
|
|
ORIGIN (YOUR FORK)
|
|
YOUR LOCAL REPO

So If I want to pull your changes from merge request, instead of doing it automatically via github, I can do:
Merging via command line

Step 1: Check out a new branch to test the changes — run this from your project directory
git checkout -b faybe-master master
Step 2: Bring in faybe's changes and test
git pull git://github.com/faybe/indielib-crossplatform.git master
Step 3: Merge the changes and update the server
git checkout master
git merge faybe-master
git push origin master


You can configure upstream repository. Check this post http://gitready.com/intermediate/2009/0 ... anges.html
Does it make sense?


Top
 Profile  
 
PostPosted: Mon Oct 28, 2013 8:04 pm 
Offline

Joined: Sat Mar 16, 2013 7:11 pm
Posts: 36
Thank you I think I understand. I created some private test repos to try it out. So basically I fork your repo. Pull it to to my my local repo. Then I do some work and push it to my fork. Now if you make an update I add an remote of your repo pull it and then try to merge it. If everything works fine I push it to my fork. Please correct me if I'm wrong :D


Top
 Profile  
 
PostPosted: Mon Oct 28, 2013 10:28 pm 
Offline
Site Admin

Joined: Thu Jul 16, 2009 1:52 pm
Posts: 250
Location: London, UK
Yes you got it :)


Top
 Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 9 posts ] 

All times are UTC


Who is online

Users browsing this forum: No registered users and 1 guest


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
cron
Powered by phpBB® Forum Software © phpBB Group