These are chat archives for CF711/facebookProject

9th
Mar 2015
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 00:00
I'm renaming origin/Development to origin/develop, since that's the convention for this workflow.
So just note that when you go to push.
Christopher Eldridge
@celdridge91190
Mar 09 2015 00:01
Ok sounds good
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 00:12
@celdridge91190, I merged origin/develop into origin/master.
origin/master is updated with new stuff from origin/develop and local/hotfix/pageMargin. I don't advise bothering with deployment of the updates until I have merged my stock stuff.
Matt Metcalf
@mrm9084
Mar 09 2015 00:42
@/all I just pulled and there was a build error. Please fix
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 00:47
@celdridge91190, I'm getting build errors related to the calendar as well.
"Error 7 Source file 'Controllers\CalendarController.cs' could not be found C:\Users\Rober_000\Documents\facebookProject\facebookProject\CSC facebookProject"
@celdridge91190, please fix this.
Matt Metcalf
@mrm9084
Mar 09 2015 00:52
It looks like you forgot to push something
Christopher Eldridge
@celdridge91190
Mar 09 2015 00:59
You guys might laugh, I forgot that in Git you have to speficially add files, the source control I use at work doesn't require that :X
towhidabsar
@towhidabsar
Mar 09 2015 00:59
Ya i got that error as well lol
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:00
Lol.
Matt Metcalf
@mrm9084
Mar 09 2015 01:00
I thought as much. As a TA I see that a lot.
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:00
Okay. Just go ahead and git add --all and then commit.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:00
it's pushed to the development branch
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:01
After future commits, try checking your status with git status. You'll see problems like this right away.
Thanks, Chris.
I'll merge that right now.
@celdridge91190, please note that origin/Development is now replaced with origin/develop.
I will fix it this time.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:06
oh it didn't show up as an option, I used Tortoise, I'll do it through command line so it does it right next time
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:06
(It might seem arbitrary, but the reason behind it is that it helps with certain Git tools that rely on conventional branch names.)
(For instance, Git Flow, which comes with SourceTree, which I use.)
If you have no outstanding changes on your local/Development, you could delete that branch and create a new local/develop to track origin/develop.
towhidabsar
@towhidabsar
Mar 09 2015 01:09
I still get build errors with the CalendarController stuff
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:11
I'll get that changed up
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:13
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:13
you might have to add DayPilot.Web.Mvc to your references in your project. It's in the bin folder
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:14
You should be doing that if you're adding it.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:14
I added it to references on mine
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:14
How?
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:15
right click on references, add, reference
I would have thought delivering the .sln would do it for you guys but m/b not
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:16
I see a big list of names, some of which have check boxes.
What am I looking for?
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:16
you have to go to browse and find the file in the bin folder
DayPilot.Web.Mvc.dll
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:18
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:19
blob
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:19
towhidabsar
@towhidabsar
Mar 09 2015 01:19
Can't find that file
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:19
blob
blob
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:20
That file is not on my machine.
I looked in facebookProject/bin
Where did you get it?
towhidabsar
@towhidabsar
Mar 09 2015 01:21
Ya it's not in my machine either
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:22
ohhh crap
the bin folder is ignored
in SC
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:22
Right, so don't unignore it.
Instead, tell us your procedure.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:22
we're going to need to get the file on the VM somehow
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:22
That folder is supposed to be ignored.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:22
I understand that
but how do we get it on the VM?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:23
The answer to that question is the same as the answer to the question "how did you get that file on your machine?".
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:23
the VM has odd security settings, I"m not sure you can email and download it or anything like that
and we don't have FTP set up
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:24
Oh no.
Dude, bin is supposed to be generated.
You're not supposed to just put things in it.
A script is supposed to fill bin.
So there should be some dependency defined somewhere that causes VS to put a file in bin upon building the project.
Putting stuff in bin manually will always cause this problem.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:26
I took it from an online tutorial for the Calendar library
said to put that file in bin
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:26
:(
Ugh.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:26
probably doens't really matter where it is as long as the reference can find it
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:26
That's some tutorial. >:(
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:26
bin if just a place where compiled libraries lie
it doesn't hurt anything putting things in there
towhidabsar
@towhidabsar
Mar 09 2015 01:26
Lol
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:26
just that it won't come through vcs of course lol
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:27
Except for this exact problem.
Basically, bin should be able to be generated from scratch based on stuff in the project settings and in the other folders.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:28
yes
it wasn't on my mind as I was going through the tutorial
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:28
So that if you deleted it, the build process would regenerate it.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:28
I understand how bin works
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:28
I'm sorry. I'm irritable because I'm working on a weekend.
I'll calm down.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:29
That's good cuz I don't remember the last time I didn't have to work on a weekend and I'm able to be calm
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:32
Okay. Calmer.
I think that moving it to lib would work.
The other references point to lib.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:33
Yeah I'm working on that as we speak
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:33
Sweet.
This message was deleted
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:33
there is no lib
I can put it in Scripts
towhidabsar
@towhidabsar
Mar 09 2015 01:35
Correct me if I am wrong, but don't dll files usually go to bin? Just trying to understand it
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:36
try facebookProject\packages\DayPilot.Web.Mvc\DayPilot.Web.Mvc.dll
towhidabsar
@towhidabsar
Mar 09 2015 01:36
Packages i think is a better idea
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:36
packages is not source controlled
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:36
@towhidabsar, generally, bin is a folder that is supposed to be empty in our repo, and VS fills it with stuff at build time.
Ah. Balls.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:37
I'm assuming it's becavuse it's not supposed to be
Scripts should be fine
it really doesnt matter that much
for this project at least
lol
anything source controlled will work
For some reason I can't see the Develop branch in my tortoise screen
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:38
d
not D
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:38
I can't see either
blob
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:38
Ah.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:38
screenshot coming
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:39
Have you fetched lately?
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:39
yeah after I pushed last
I'll try again
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:39
Hm.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:40
ok it's on develop
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:42
origin/develop?
I don't see it.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:42
yes
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:43
Github.com thinks that there hasn't been an update to develop for 44 minutes.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:43
trying to figure out why
towhidabsar
@towhidabsar
Mar 09 2015 01:44
I pulled, says already up to date
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:44
my Git shows nothing to commit or push
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:44
Do git push -f origin develop
Or did you already? With the -f?
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:44
I did it through the gui
that errored
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:45
Urgh.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:45
blob
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:45
Git is great until it's hard.
Can you show me the result of git remote?
Also, how are you uploading images to chat? I'd like to do the same, but I've had to do it in a stupid way.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:47
copy it to your clipboard
blob
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:48
Oops. I meant git remote -v
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:49
blob
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:50
:(
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:50
that not good?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:50
That's fine. I was hoping that I could just fix that.
I'm sad because I haven't figured out the problem yet.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:51
yeah this is annoying idk what git is doing
the file shows as in source control
if I do a diff my version of JS is different and that's the only difference
nothing to commit or push
blob
blob
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:55
Yo've capitalised it wrong.
Lowercase d.
develop
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:56
its erroring on the Push
that's my local one not the remote one
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:57
If you try to push "develop" when all you have is "Develop", it won't work.
Christopher Eldridge
@celdridge91190
Mar 09 2015 01:57
that is really stupid
why does it let you create the branch like that if it breaks it?
is there an easy way to change that?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 01:59
looking it up
git branch -m <oldname> <newname>
so git branch -m Develop develop
By the way, the answer to "Why is Git stupid?" is kind of all in the name "Git".
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:02
wow, ok I was able to create develop and delete Develop, had to do it a very special way
with the UI
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:02
"git" is synonymous with moron.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:02
I need to learn the command line for git
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:02
It does help. :P
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:02
I also had to push using command line it breaks in the GUI
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:02
Weird.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:02
yeah but it should be on GitHub now I can see it
sorry for the wait guys
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:02
Sweet. Thanks. :)
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:03
btw
amazing screenshot tool
highly recommend
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:04
I like Snippng Tool, which is built into Windows.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:04
it's kind of like Snipping tool, but 1000x better
:)
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:04
blob
And now I know how to push up images directly. :)
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:05
it allows you to edit your snips
can send them directly to a document
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:05
Huh. I'll check it out during the week.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:05
and all you have to do is hit print screen to open it
so you can get what your mouse is pointing to in the shot
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:06
Chris, your develop is not based on origin/develop. :/
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:06
I could have sworn that was what I selected
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:07
could you check out master on your local repo, then delete local/develop, then pull origin/develop?
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:07
unless I selected the local one
yeah
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:07
I'll merge your latest commit into origin/develop.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:09
checked out master
deleted local/develop
wait do I want to dothat?
to do that*
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:10
Stand by.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:10
if I pull origin/develop I will get the crap I just commited
if I pull origin/master I will get everything but the .dll file
then i can add the .dll and recommit
I'll wait to make sure you haven't already done something
Matt Metcalf
@mrm9084
Mar 09 2015 02:14
@/all sp wjere dp we stand?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:14
I am resolving merge conflicts. Stand by
Chris, there is a serious problem with your git workflow.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:17
?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:17
I'm having to resolve merge conflicts in files that you didn't touch.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:18
that's odd, I must have messed something up when I created the branch
I think I'm gonna lay off the UI
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:18
It looks like you didn't merge origin/develop into local/develop before pushing.
But then your local/develop wasn't even based on origin/develop.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:19
it may have based off the local/Develop
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:19
Yeah.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:19
if I pull from origin/master
add in my dll
and push to origin/Develop
and you take that it should be the correct one
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:19
Wait. No.
Don't.
I've almost got this solved.
Never mind.
This is very borked. I don't know how to fix it other than blowing away the last commit.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:24
yeah do that
then I'll pull from Develop
develop*
add my dll
commit
then it'll have the right stuff
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:26
Done.
Okay.
Could you actually just reclone it.
?
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:26
yeah could do that too
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:26
That way we can be sure that it's right.
Matt Metcalf
@mrm9084
Mar 09 2015 02:27
Did you push out to master?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:27
Not yet.
I'll @ you when we have that.
Okay. @celdridge91190, do this: git checkout --track origin/develop
That will create a local branch develop that is based on origin/develop.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:30
do that after I clone?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:30
Yes.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:30
for some reason I lost everything when I cloned
no Calendar stuff at all
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:31
git status
see if you're on master.
develop has calendar stuff
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:31
nvm hang on
ok, phew, on there
develop should now be correct
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:38
Excellent. Testing now.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:39
works on my end, crossing my fingeres...
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:39
Nope. Fixing.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:39
what's wrong on that end?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:40
The DLL was not included in the project. The file was present, though.
I included it.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:40
oh, hmm
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:40
That might work.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:40
m/b it didn't detect a change to the .sln that time
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:40
By the way, what URL should I visit.
?
/Calendar or something?
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:40
/Calendar/Inde
/Index*
there's a week and a month link
no I don't plan on keeping it the way it is just have to have the views working for R1
lol
it was quick and dirty for the demo
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:41
Cool.
It's working.
I'm committing and pushing the change.
Then I will merge it into master and push that.
And then Ill ping Matt.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:41
awesome
Matt Metcalf
@mrm9084
Mar 09 2015 02:42
I am here
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:42
I'll tell you when Eldridge's changes are merged into origin/master.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:43
on the plus side I think ik a lot more about Git
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:44
lol
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:44
best way to learn it is to break it
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:45
Okay, @mrm9084.
origin/develop has Eldridge's changes.
And they compile.
On my machine, anyway.
Er.. I meant that so does origin/master.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:46
phew
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:46
@celdridge91190, in the future, try to make a feature branch, so as not to bork develop.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:47
I started out with a feature branch, idk why I was going right to develop
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:47
So right now check out develop, then pull origin/develop, then git branch calendar
Then in the future one of us can merge calendar into develop.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:47
yeah that's actually what I started with
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:48
Ah.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:48
I'm on that now
Matt Metcalf
@mrm9084
Mar 09 2015 02:48
I don't see any changes...
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:49
@mrm9084
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:49
try refreshing :P
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:49
blob
Matt Metcalf
@mrm9084
Mar 09 2015 02:50
Everything on my end is up to date.
This is current master
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:51
looks good
there's no link from the hompage to Calendar, gotta go to /Calendar/Index
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:52
Ah. I see. Yeah. There are no visible changes to the home page. I will do that.
I will add a link from the home page to the calendar page.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:52
I was gonna work on that but it took me time to get the Calendar working with our project and it was a busy weekend
Matt Metcalf
@mrm9084
Mar 09 2015 02:52
I thought that the calendar was going to be on the front page.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:52
forgot to add something to the homepage
no, the front page will only have a view of the current days events
but I wasn't planning to get to that to R1
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:53
Eldridge mentioned at our last class session that he would not add the component to the home page for R1.
Matt Metcalf
@mrm9084
Mar 09 2015 02:54
List of R1 requirements
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:54
And at the Sunday meeting, I think.
Matt Metcalf
@mrm9084
Mar 09 2015 02:55
-Virtual machines
-Deployment process
-Bug Tracking
-Version control system
-Main page setup
-Facebook tie in
-You may leave all of your source code in your Version Control System. There is no need to submit.
-Small .pdf document containing:
-Your version control system link & any appropriate logins
-Links to your production and staging applications (which are properly tagged as R1)
-Stock ticker (Retrieve information from existing external API’s)
-Updated documentation (design & requirements).
-Your staging & production environments should be mirrors of each other.
-Create a virtual directory for the release titled R1.
-This means that the release should be http://vm549-x.se.rit.edu/R1/
-Make sure that your website is publicly accessible to the outside world. This is required for -the 1st deliverable and I encourage you to test your application early & often.
-“Final” deliverable is on the production website.
-Other items as will be defined by customer,
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 02:55
I questioned it, Eldridge said that it was in line with the requirements, and nobody else said anything.
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:55
It says the main page has to be set up, it's stubbed out
I think the links being there is proof enough, it doesn't say anything has to be complete
Matt Metcalf
@mrm9084
Mar 09 2015 02:57
Items we have left:
Bug Tracking
Main page setup
Facebook tie in (I still need to push out, was waiting on your stuff to finish u)
Small .pdf document containing:
- Your version control system link & any appropriate logins
- Links to your production and staging applications (which are properly tagged as R1)
  • Stock ticker (Retrieve information from existing external API’s)
  • Updated documentation (design & requirements).
  • Your staging & production environments should be mirrors of each other.
  • Create a virtual directory for the release titled R1. This means that the release should be http://vm549-x.se.rit.edu/R1/
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:58
I'm not sure what tha means
the piece you highlighted, don't we have that?
Matt Metcalf
@mrm9084
Mar 09 2015 02:58
The highlighted part was indented. So that is the items in the pdf
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:58
do we have a pdf made for that?
Matt Metcalf
@mrm9084
Mar 09 2015 02:59
I don't think so
Christopher Eldridge
@celdridge91190
Mar 09 2015 02:59
so we we need our github link and our product link
ok
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:00
I added a link from home to calendar on develop.
Working on stock component now. So much for being done two hours ago.
Christopher Eldridge
@celdridge91190
Mar 09 2015 03:01
our /R1 link doesn't work
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:01
I don't know how to fix that.
Christopher Eldridge
@celdridge91190
Mar 09 2015 03:01
@mrm9084
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:01
Currently our product lives at /Home/Index.
Matt Metcalf
@mrm9084
Mar 09 2015 03:01
I set that I wrong I can fix that
I want to do that last
Christopher Eldridge
@celdridge91190
Mar 09 2015 03:02
ok, just wanted to test the link before I put it in the pdf
I can do that tomorrow morning though so I can be sure to test it
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:02
@mrm9084, please do so on a feature branch based on develop, not on develop.
Christopher Eldridge
@celdridge91190
Mar 09 2015 03:03
or do it on master
jk jk jk
Matt Metcalf
@mrm9084
Mar 09 2015 03:03
? that is not a C# thing. That is all iis
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:03
If I have to fix another merge conflict caused by improper basing, I'll hang myself.
Matt Metcalf
@mrm9084
Mar 09 2015 03:03
That is why I want to wait
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:03
Oh. Really?
Okay.
So it doesn't touch the repo?
Matt Metcalf
@mrm9084
Mar 09 2015 03:04
nope. Are you talking about the R1 change or the facebook items?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:05
Moving /Home/Index to /R1.
But yes please also do your facebook chnges on a feature branch.
Matt Metcalf
@mrm9084
Mar 09 2015 03:05
Yeah, that is all server side
What does doing it on a feature branch give us?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:05
No work should ever be done on develop or master. The only commits to those two branches should be merges from other branches.
If two people have develop checked out and happen to make local commits without pulling before each one, then the ancestor relationships between commits get really screwed up.
Matt Metcalf
@mrm9084
Mar 09 2015 03:07
Pull often fixes that
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:07
Basically, proper usage of git dictates that no two people should have the same branch checked out at once.
That doesn't keep lots of people from doing it.
Christopher Eldridge
@celdridge91190
Mar 09 2015 03:08
I normally keep to that, idk what I was thinking today lol
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:08
So when you go to work on a feature, check out develop, pull origin/develop, branch off of develop into your new feature branch, and then begin work.
Then, when your work is done, commit everything, pull origin/develop into your feature branch, resolve any conflicts, check out develop, merge your feature branch into it, and push to origin/develop.
If everyone abides by that procedure, it saves a lot of headaches that could happen when commits are not properly based
Matt Metcalf
@mrm9084
Mar 09 2015 03:11
Or you can pull as you work, pull before you push.
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:11
Yes, but it's really, really awful practice to do work on develop.
develop and master should only ever be merged into, not worked on.
Matt Metcalf
@mrm9084
Mar 09 2015 03:12
This a really small project. That is not needed. My senior project does not even do that.
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:12
I could just stand back next time there's a conflict on develop and let you handle it, Matt. :P
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:34
I finally figured out how to get our custom scripts into the home page.
Chris
@CF711
Mar 09 2015 03:41
@RobertWarrenGilmore that's what my team is doing for senior project as well. it might be helpful here
Also I'll be updating the slides when I get back and looking them over for any issues we may have
Matt Metcalf
@mrm9084
Mar 09 2015 03:43
So, what do we want for facebook stuff for this release?
I have log in working. I also can post to there wall, but only predefined thing at log in. I would have to add a bit of html to do anything else
Matt Metcalf
@mrm9084
Mar 09 2015 03:48
?
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 03:51
I don't know what Facebook stuff we need.
Matt Metcalf
@mrm9084
Mar 09 2015 03:52
I have it right now so that if they go to our page it will force them to log in. I then automatically post a message on there wall.
I can change that by adding a text field and a button so they can post whatever they want.
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 04:41
Okay. I've got a really ugly version of the stock ticker working. I might tinker with it tomorrow, but don't count on it.
Merging.
Robert Warren Gilmore
@RobertWarrenGilmore
Mar 09 2015 04:51
Tested, merged, and pushed. Good night.
Chris
@CF711
Mar 09 2015 06:39
Hey guys so I went to the site and am getting a runtime error in the web config files
Matt Metcalf
@mrm9084
Mar 09 2015 06:51
Hey, I am working on things. What Rob pushed does not work on the server. I have been debugging it.
It seems to not like react...
try now.
To make it work I had to comment out the react line in stock.js and all of StockTransationView.js
I don't know what is happening. It all works locally for me, but not on the server.
Chris are you having any luck?
Chris
@CF711
Mar 09 2015 06:57
It's working again. I can see the calendar and stuff, but we don't have stocks or fb
Matt Metcalf
@mrm9084
Mar 09 2015 06:58
I don't want to push out my stuff while we have issues with stock still, but what do you think?
I could try my stuff.
Chris
@CF711
Mar 09 2015 06:58
can't hurt.
Matt Metcalf
@mrm9084
Mar 09 2015 06:58
Just a note, don't log in with your own facebook account right now...
Chris
@CF711
Mar 09 2015 06:59
wasn't planning on it
Matt Metcalf
@mrm9084
Mar 09 2015 06:59
use the test user
Chris
@CF711
Mar 09 2015 06:59
I'll take your word that it's working. I'm heading to bed in a few minutes
Matt Metcalf
@mrm9084
Mar 09 2015 07:04
Hey can you do a pull?
I am running into the same issues as his code did, but with facebook.
Matt Metcalf
@mrm9084
Mar 09 2015 07:13
I figured it out. Seems it will not run on local, but will run.
Try logging in
pass: test1
towhidabsar
@towhidabsar
Mar 09 2015 12:36
hey I am trying to login using facebook, it just gives me a given URL not allowed error
towhidabsar
@towhidabsar
Mar 09 2015 12:41
never mind works
Matt Metcalf
@mrm9084
Mar 09 2015 13:18
It will only work with the test user for you. I have not been able to add you as a developer yet on facebook.
towhidabsar
@towhidabsar
Mar 09 2015 13:22
how come? hold up I will add you on facebook