Berkeley Martinez
6c48395868
separate main manifest generation from sub manifests
...
in dev mode always pull manifest on each request
add manifest build to gulp build task
add react bundle to manifest generation
2015-08-28 15:56:58 -07:00
Berkeley Martinez
376b58cc15
combine sandbox into commonFramework
...
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
Berkeley Martinez
306c441ae7
add revisioning to js/css files to break caching
...
This moves the location of javascript files, commonFramework,
iFrameScript, sandbox, plugin, and all the less files.
On gulp or gulp build these files are moved and revisioned.
Places where they are references in jade/html are now removed and
replaced with the use of a helper function `rev`. This function will
take the required file and return a string referencing the revisioned
file. This should alleviate the need for hard refreshing and will break
caches when files change, so fixes for firefox caching issue as well.
NOTE: @benmcmahon @quincylarson, This means files will need to be build
on the server in production before doing a server restart/reload
In production: 'npm run build' To build and revision js/css files
`gulp` and `gulp build` will used in development
npm install also needs to be run in production on initial deploy
2015-08-26 23:30:33 -07:00
Berkeley Martinez
39f636ae91
add loader to challenge submit
2015-08-26 15:17:38 -07:00
benmcmahon100
7c3f650521
Bump up cFW version number to ensure eveyone is on te latest version
2015-08-26 22:37:54 +01:00
Berkeley Martinez
2c9ed16b7a
fix only submit on user click
2015-08-26 13:09:38 -07:00
benmcmahon100
306551848c
Update cFW version no
2015-08-26 20:45:50 +01:00
benmcmahon100
a63d6bd00b
Fixed my stupid mistake that almost killed the server again
2015-08-26 20:22:29 +01:00
benmcmahon100
695ad48778
Fixed version number
2015-08-26 12:26:01 +01:00
benmcmahon100
9f9f151a6f
Re add init run
2015-08-26 12:24:44 +01:00
benmcmahon100
8cdd49e7f1
Fix caching issue with frameworks
2015-08-26 01:13:17 +01:00
Berkeley Martinez
851af506b5
Merge pull request #2691 from QuincyLarson/alt-text
...
Add more alt text to onboarding page.
2015-08-25 15:21:44 -07:00
Berkeley Martinez
14d1d1db02
fix left panel jitter jump
2015-08-25 14:49:19 -07:00
benmcmahon100
b1b07a5b9e
Fixed major Fudge up with challenges without functions
2015-08-25 22:25:00 +01:00
Quincy Larson
56b18f313b
update get-started alt text
2015-08-25 14:23:47 -07:00
Ben McMahon
c913e9bbf7
Merge pull request #2679 from FreeCodeCamp/staging
...
update framework to remove merge conflicts
2015-08-25 19:41:29 +01:00
benmcmahon100
14cc6a7cef
Final touch up to the framework before merge
2015-08-25 19:28:13 +01:00
Quincy Larson
50f1705cbc
start updating alt text
2015-08-25 08:59:42 -07:00
Quincy Larson
a94c919374
update cost calculator
2015-08-24 19:19:47 -07:00
Berkeley Martinez
67681d41f6
Merge pull request #2487 from bugron/bugron-news_more_btn_fix
...
Fixes info buttons' text in Camper News search results
2015-08-24 11:12:12 -07:00
benmcmahon100
1477f56f97
Merge of the frameworks: the desolation of the views
2015-08-23 22:26:02 +01:00
benmcmahon100
ede956e1d6
Merge of the frameworks: an unexpected merge
2015-08-23 21:59:29 +01:00
Isabell Long
d85eded058
Consistently capitalize GitHub in the account settings text
...
- Also remove the capital D from Delete in the confirmation line—it's
not the start of a sentence.
2015-08-23 13:52:14 +01:00
benmcmahon100
38397fa5f7
Fixed help modal part 3: the modal strikes back
2015-08-22 23:18:10 +01:00
Quincy Larson
73eb6ec2d1
kind of got the modals working - Ben will finish this
2015-08-22 12:10:08 -07:00
Arsen Melikyan
37b4530df2
Fixes info buttons' text in Camper News search results
...
In Camper News search results "more info..." buttons' text changes to "more info.more info...". This commit fixes that.
2015-08-22 17:11:44 +04:00
Quincy Larson
ebb84c9e75
more refinement to simplified profile view
2015-08-21 22:53:38 -07:00
Quincy Larson
d49b303de3
update look of profile
2015-08-21 22:52:09 -07:00
benmcmahon100
901f1a977d
Merge remote-tracking branch 'origin/staging' into staging
2015-08-22 00:59:34 +01:00
benmcmahon100
38a73e392f
Deactivated scroll locking
2015-08-22 00:59:21 +01:00
Berkeley Martinez
0f3acc629c
fix profile linking
2015-08-21 16:09:07 -07:00
Quincy Larson
adc50b764d
uncomment social linking
2015-08-20 19:52:48 -07:00
benmcmahon100
d52a2d8da0
Attempt to sorta fix the scroll locker resetting
2015-08-20 16:48:46 +01:00
Quincy Larson
538e48e237
start updating showZiplineOrBasejump view to function post-angular
2015-08-19 17:56:44 -07:00
Quincy Larson
23b7c4f20f
remove difficulty from bonfires to make things look more consistent
2015-08-19 17:56:14 -07:00
Quincy Larson
a92db3bbf1
remove angular from universal head
2015-08-19 17:44:18 -07:00
Quincy Larson
1dadc48aea
remove angular from user account creation flows
2015-08-19 15:55:40 -07:00
benmcmahon100
f4eecc9127
Merge pull request #1993 from kurzninja/patch-4
...
Potentially missing ;
2015-08-19 21:30:09 +01:00
Quincy Larson
04c9d376f7
remove server maintenance warnings
2015-08-18 23:48:31 -07:00
Berkeley Martinez
bc84a25ff9
add message on emergency maintenance
2015-08-18 23:07:06 -07:00
Berkeley Martinez
478ed3c522
fix should toString userId's
2015-08-18 15:23:26 -07:00
Quincy Larson
9dcf284825
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-18 15:21:38 -07:00
Quincy Larson
b4ae49f915
add challenge type to beginning of challenge in map
2015-08-18 15:21:26 -07:00
Quincy Larson
b667a776ea
add bonfires back in but now they are only visible to their creators
2015-08-18 14:53:18 -07:00
Berkeley Martinez
b2f4e520cb
fix account link failure now flashes
2015-08-18 14:48:52 -07:00
benmcmahon100
366b9e98a7
Merge remote-tracking branch 'origin/staging' into staging
2015-08-18 19:32:04 +01:00
Quincy Larson
0d0528a743
fix LinkedIn link in footer
2015-08-18 11:22:59 -07:00
benmcmahon100
6de1f49a1f
Temp fix for buttons on modals and bonfires exec on load
2015-08-18 19:21:34 +01:00
Berkeley Martinez
112972cfdd
fix enables email login
2015-08-18 01:32:37 -07:00
Brett Guillory
c5d07b9e05
Potentially missing ;
...
My browser was throwing an error:
```Uncaught SyntaxError: missing ) after argument list```
That pointed to this line in the console as far as I could tell.
If this is a fix, w00t. If not, ignore this.
2015-08-17 22:05:16 -05:00
Berkeley Martinez
495aac8233
remove part of note about email signin
2015-08-17 19:21:57 -07:00
benmcmahon100
fe102bdf51
fix #1840
2015-08-17 14:04:12 +01:00
Ionut Costica
c39189eab0
Fix for Issue #1828
2015-08-17 15:04:53 +03:00
Quincy Larson
07dd58d65b
update copy and remove bug warnings
2015-08-16 23:43:57 -07:00
Quincy Larson
2634569e60
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 19:34:44 -07:00
Quincy Larson
21cbbc2233
Update warning messages
2015-08-16 19:34:23 -07:00
benmcmahon100
3be62c5374
Fixed the script issues
2015-08-17 00:04:20 +01:00
Quincy Larson
dfc557f9e6
move refactor all non-jquery JS to load last
2015-08-16 13:49:43 -07:00
Quincy Larson
de10e77645
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 11:02:33 -07:00
Quincy Larson
454e59939e
add wiki to tops of pages
2015-08-16 11:02:22 -07:00
Berkeley Martinez
de7eb3d440
fix email password reset
2015-08-16 09:54:59 -07:00
Quincy Larson
58d86ce2dc
hide linking buttons
2015-08-16 06:07:38 -07:00
Quincy Larson
edb58f6890
add authentication back in
2015-08-16 05:47:13 -07:00
Quincy Larson
63d506c14f
remove beta warning
2015-08-16 04:06:01 -07:00
Quincy Larson
e3404c6564
minor improvements and bug fixes to stories
2015-08-15 14:13:21 -07:00
Berkeley Martinez
bcdda9c62a
fix unexpected syntax error on map
2015-08-14 18:25:34 -07:00
Berkeley Martinez
acf48aa403
show jobs in dev
...
remove old jobs stuff
2015-08-13 15:41:30 -07:00
Quincy Larson
0a8855fb11
Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-13 14:36:41 -07:00
Quincy Larson
1b7195fbc1
replace RSAP with read-search-ask and replace AWS gifs with Imgur
2015-08-13 00:56:05 -07:00
Quincy Larson
bf2db5ff62
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-12 21:25:11 -07:00
Quincy Larson
99d0a58049
update the look of onboarding and change RSAP to RSA
2015-08-12 21:24:57 -07:00
Quincy Larson
315b78fb69
update copy on onboarding
2015-08-12 20:27:46 -07:00
Berkeley Martinez
fc29c1fd9b
linking accounts now works.
...
bug, need to change how loopback generates provider string.
2015-08-12 20:10:11 -07:00
Quincy Larson
8cdc545f71
minor ux improvement to onboarding
2015-08-12 18:25:43 -07:00
benmcmahon100
7910f0ae2c
Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display
2015-08-13 01:20:12 +01:00
Quincy Larson
43e3dc8914
Finish onboarding page
2015-08-10 21:55:13 -07:00
Berkeley Martinez
341d931833
fix streak show days
2015-08-10 21:01:37 -07:00
Quincy Larson
7bfe61731b
give a user a brownie point when they start
2015-08-10 20:55:01 -07:00
Quincy Larson
853c728d9c
improve get-started view and fix duplicate bonfire issue
2015-08-10 20:13:13 -07:00
Quincy Larson
d67c049d5b
make onboarding page the default homepage for authenticated users
2015-08-10 17:40:13 -07:00
Quincy Larson
a44622af82
Merge branch 'staging' into onboarding
2015-08-10 15:42:07 -07:00
Quincy Larson
f8665324ad
simplify user account and profile system for github locking
2015-08-10 15:37:49 -07:00
Quincy Larson
add87ae801
start simplifying account page
2015-08-10 15:10:38 -07:00
Quincy Larson
d7e824ebbe
done adding static images
2015-08-10 00:44:37 -07:00
Quincy Larson
d56ecd1979
add a bunch of new images to onboarding
2015-08-10 00:42:33 -07:00
Berkeley Martinez
1d724f145e
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
2015-08-09 22:58:46 -07:00
Berkeley Martinez
967f92e6f4
fix challenge naming scheme
2015-08-09 22:46:44 -07:00
Quincy Larson
13f08bf037
Merge branch 'staging' into onboarding
2015-08-09 22:00:26 -07:00
Quincy Larson
f3028b0e6a
continue work on get-started
2015-08-09 21:59:49 -07:00
Quincy Larson
4ed041c0db
update curriculum structure again
2015-08-09 21:26:26 -07:00
Quincy Larson
e0bd8c6dd2
remove pair programming Bonfire warm up challenge
2015-08-09 17:03:49 -07:00
Quincy Larson
0994dbaabe
finalize copy on get-started
2015-08-08 22:46:21 -07:00
Quincy Larson
5fb1df0d55
start onboarding page
2015-08-08 16:13:23 -07:00
Berkeley Martinez
013d983c2e
add github refresh button
2015-08-07 18:29:56 -07:00
Berkeley Martinez
611098ba09
if user is github cool navbar links to account show page
2015-08-07 18:26:18 -07:00
Berkeley Martinez
71a02ed8b7
update all instances of progressTimestamp to check for objects
2015-08-07 13:32:30 -07:00
Berkeley Martinez
0ce81bbabb
fix email sign should not require username
2015-08-05 19:29:17 -07:00
Berkeley Martinez
a838a4097d
fix clicking on image or points always takes you to /account
2015-08-05 19:12:54 -07:00
Berkeley Martinez
07e9bbf00a
add link to github waypoint to non github cool campers
2015-08-05 13:54:48 -07:00
Quincy Larson
3c4142c92c
fix profile update button
2015-08-04 18:43:40 -07:00
Quincy Larson
3551cefb3d
simplify account.jade view for github integration
2015-08-04 18:29:05 -07:00
Quincy Larson
5f2ec0aeae
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
...
nto staging
2015-08-04 15:10:15 -07:00
Quincy Larson
7246945b42
remove bonfires from campers' public portfolios
2015-08-04 15:09:20 -07:00
Berkeley Martinez
e01876f3ab
disable username updating when camper is githubCool
2015-08-04 15:03:33 -07:00
Quincy Larson
73f0dcf732
make wiki open in new tab
2015-08-04 14:58:24 -07:00
Quincy Larson
041abd1065
fix beta warning
2015-08-04 14:58:04 -07:00
Quincy Larson
c573caf2e2
remove website links from user model and account view
2015-08-04 14:57:34 -07:00
Quincy Larson
df786eaf2b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-04 14:40:56 -07:00
Quincy Larson
0682857236
remove learn link from navbar
2015-08-04 14:40:47 -07:00
Berkeley Martinez
a1a64435d6
readding twitter auth
...
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
Berkeley Martinez
43d74c2f48
add beta warning banner
2015-08-04 01:34:26 -07:00
Berkeley Martinez
efa73c93ee
remove twitter auth
2015-08-04 01:34:26 -07:00
Berkeley Martinez
7ca1d7cfde
remove facebook/google/linkedin auth from linking
2015-08-03 12:53:23 -07:00
Berkeley Martinez
bf1c2ace00
disable facebook/google/linked auth for testing
2015-08-03 12:38:20 -07:00
Berkeley Martinez
88092f9ed6
Merge pull request #1255 from ahstro/lumenteun-1235
...
Profile pictures in 'Camper News' now link to profiles.
2015-08-01 16:51:56 -07:00
benmcmahon100
0a34dcf6c3
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:25:49 +01:00
benmcmahon100
c075eb0116
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:24:16 +01:00
benmcmahon100
f60bfd5da1
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:22:02 +01:00
benmcmahon100
aef867cc69
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:20:19 +01:00
benmcmahon100
abfab7389b
Added the scrolling editor
2015-08-01 19:55:40 +01:00
Berkeley Martinez
8270cb4103
add github auth
2015-08-01 08:39:13 -07:00
Quincy Larson
feab8b508e
remove field guide cruft and update all field guide links to wiki
2015-07-31 21:55:49 -07:00
Quincy Larson
fd68501e16
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-31 21:13:46 -07:00
Quincy Larson
439849e9d8
start removing field guide and update nonprofits
2015-07-31 21:13:40 -07:00
Berkeley Martinez
ee8776feb3
removes comments
...
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
Quincy Larson
3f49b6288f
move calculator back to its own view and out of field guide
2015-07-31 17:30:27 -07:00
Quincy Larson
2547868854
fix storage and reset functionality for js and html challenge views
2015-07-31 13:37:06 -07:00
Berkeley Martinez
c82b2e3ae6
set and render page title
...
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
Quincy Larson
5fd95c584c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson
fd3374fca7
about to start priority and !important waypoints
2015-07-28 17:11:51 -07:00
Quincy Larson
37d5efed4e
Merge branch 'staging' into js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
Berkeley Martinez
bf64beed5d
Hide body overflow
2015-07-23 16:03:50 -07:00
Berkeley Martinez
eb3f993b3b
update split field guide view into categories
2015-07-23 15:50:47 -07:00
Quincy Larson
60f2bdc685
more minor updates
2015-07-23 15:50:47 -07:00
Berkeley Martinez
94ed227aeb
add video css
2015-07-23 15:49:03 -07:00
Berkeley Martinez
ac35b4bf73
fix some typo's
2015-07-23 15:49:03 -07:00
Berkeley Martinez
c1b0035d17
add bundle to react jade template
2015-07-23 15:49:02 -07:00
Berkeley Martinez
a5e7009a57
initial react app(WIP)
2015-07-23 15:49:00 -07:00
LumenTeun
e05cc3fbb9
Profile pictures in 'Camper News' now link to profiles. #1235
2015-07-11 01:12:17 +02:00
Quincy Larson
8072a4b7f2
fix modal closing a on showJS view
2015-07-10 10:12:53 -07:00
Quincy Larson
41f5325ab6
update landing page
2015-07-07 10:45:56 -07:00
Quincy Larson
db324186da
update showjs view
2015-07-05 17:15:54 -07:00
Quincy Larson
0301d3bc61
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-02 13:59:22 -07:00
Quincy Larson
4fb3b3e7cc
add more cities and move the bootcamp calculator to field guide entries (still untested).
2015-07-02 13:59:13 -07:00
Quincy Larson
10f53bdd49
Merge pull request #1161 from LumenTeun/grammar
...
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
benmcmahon100
71ea26ab96
Implemented scroll-locker
2015-07-02 21:32:20 +01:00
benmcmahon100
8bed9fa7d7
Implemented scroll-locker
2015-07-02 21:31:59 +01:00
benmcmahon100
0a59bd5cfb
Implemented scroll-locker
2015-07-02 21:31:28 +01:00
Berkeley Martinez
580e2e3ebd
add redirect for https
2015-07-01 14:35:15 -07:00
LumenTeun
75948c4bc1
Quite a few spelling and grammar fixes
2015-06-30 04:28:43 +02:00
Quincy Larson
7e2d5c91e2
minor ui improvements
2015-06-26 01:28:02 -07:00
Quincy Larson
378f6da221
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
public/js/main_0.0.3.js
seed/challenges/get-set-for-free-code-camp.json
seed/field-guides.json
2015-06-26 01:08:40 -07:00
Berkeley Martinez
310bf7f6fb
fix navbar should point to /news not /stories
2015-06-25 23:43:02 -07:00
Quincy Larson
6700729658
update emails and refine sponsor view
2015-06-25 23:35:48 -07:00
Berkeley Martinez
82c96ec0ba
bump main.js version
2015-06-25 23:20:16 -07:00
Quincy Larson
e9450b9321
start building sponsor views
2015-06-25 15:15:41 -07:00
Quincy Larson
4d620c5796
comment out feature map modal and camper news notification
2015-06-24 07:06:40 -07:00
Quincy Larson
ce0731df5f
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
server/boot/randomAPIs.js
server/views/coursewares/showBonfire.jade
server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez
8f445b58f2
fix chat links go to Gitter Room
2015-06-20 23:11:33 -07:00
Berkeley Martinez
742a49b70d
fix mainjs resetEditor
2015-06-20 22:48:59 -07:00
Berkeley Martinez
03ea412b4a
major challenges refactor
...
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
Quincy Larson
a0f4f91ec1
remove slack completely and update help and pair actions
2015-06-20 18:40:43 -07:00
Quincy Larson
883a561d73
finishing touches on calculator
2015-06-19 21:24:04 -07:00
Quincy Larson
ccc29b7fcb
improve upon @lemonyandrew pull request
2015-06-19 17:26:04 -07:00
Quincy Larson
d5ea05e448
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
Quincy Larson
0621b8c62b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-16 13:46:37 -07:00
Quincy Larson
2e1babb12d
finalize calculator for release
2015-06-16 13:46:24 -07:00
Quincy Larson
40b5b05ea4
factor JavaScript and JSON into separate files
2015-06-16 13:03:13 -07:00
Quincy Larson
2cb0a3d717
futher improve calculator ux
2015-06-16 12:32:12 -07:00
terakilobyte
0a8356e50f
Configure production to run in https
2015-06-16 14:30:16 -04:00
terakilobyte
b0b236821e
More inspectlet configuring
2015-06-16 12:30:49 -04:00
terakilobyte
308e539e1e
More protocol experimentation
2015-06-16 12:23:49 -04:00
terakilobyte
3546cf4765
Fetch google fonts over https
2015-06-16 12:09:45 -04:00
Quincy Larson
9bc4f0c25c
Merge branch 'master' into staging
2015-06-16 06:08:25 -07:00
Quincy Larson
ef9d6fc55b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-16 06:08:18 -07:00
Quincy Larson
23eb74c762
improve ux on calculator clicking
2015-06-15 21:44:19 -07:00
Quincy Larson
c9ba210afa
factor bootcamp JSON into seperate file
2015-06-15 20:49:55 -07:00
Quincy Larson
6b909d8f59
start refactoring calculator logic
2015-06-15 18:00:13 -07:00
terakilobyte
4fa1f25cc2
Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records.
2015-06-15 20:53:43 -04:00
terakilobyte
40ce1d8162
Refactor to use dashedName for challenges in lookup.
2015-06-15 08:01:43 -04:00
Quincy Larson
6c33d4bf78
calculator works
2015-06-14 21:17:48 -07:00
Quincy Larson
0ef39904a9
major improvements to calculator logic
2015-06-14 17:55:23 -07:00
Quincy Larson
2a98e5c851
fix calculator view file location
2015-06-14 01:39:22 -07:00
Quincy Larson
5e3edf5cda
Merge branch 'master' into staging
2015-06-14 01:10:51 -07:00
Quincy Larson
43f347bae0
Merge branch 'calculator' into staging
...
Conflicts:
app.js
controllers/resources.js
seed/field-guides.json
2015-06-14 01:10:48 -07:00
Quincy Larson
b6fc2551d9
Merge branch 'interview' into staging
...
Conflicts:
app.js
controllers/challenge.js
seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
Quincy Larson
173d46ae01
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/field-guides.json
2015-06-12 12:40:26 -07:00
terakilobyte
34c3fef7d4
Move api hooks to user.js
2015-06-11 19:11:07 -04:00
terakilobyte
f7bb14803e
Update field guides to display properly. Correct models on user object.
2015-06-11 16:19:44 -04:00
Quincy Larson
5fb89cb091
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-11 11:16:31 -07:00
Berkeley Martinez
cd38a2d88e
fix user local signin
2015-06-09 17:22:14 -07:00
Berkeley Martinez
a8494b29da
add user signup through loopback
2015-06-09 16:45:14 -07:00
terakilobyte
5ec532f3d9
Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names.
2015-06-09 16:57:23 -04:00
Quincy Larson
61486c2d7c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
terakilobyte
21b9405f06
Update links for new api model in views for stories.
2015-06-05 14:58:42 -04:00
terakilobyte
8b7bfb23ab
Update story api to use stories instead of news
2015-06-05 09:07:46 -04:00
Quincy Larson
3654bb7e6f
change _id to id everywhere that seems relevant to loopback
2015-06-04 13:20:42 -07:00
Quincy Larson
b2aafd89e7
flatten user object references throughout controllers and views
2015-06-04 12:54:41 -07:00
Quincy Larson
f6596d2654
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
app.js
controllers/challengeMap.js
controllers/resources.js
server/views/partials/field-guide.jade
server/views/partials/github.jade
server/views/partials/nonprofit-application-progress-bar.jade
server/views/partials/nonprofits.jade
2015-06-02 13:44:53 -07:00
terakilobyte
d9c3251f94
Begin shaping codebase for loopback migration.
2015-06-01 18:30:43 -04:00