bdb2c2989f
Merge pull request #1114 from NatashaHaggard/1059
...
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
d857bbcc0b
Merge pull request #1149 from JonSonesen/jonathonsonesen-1148
...
fixes issue #1148
2015-06-28 15:21:11 -07:00
68dfa51719
Merge pull request #1074 from SaintPeter/staging
...
Add video link to Symmetric Differences Bonfire
2015-06-28 15:20:06 -07:00
bdb170b0df
fixes issue #1148
2015-06-28 15:03:52 -07:00
0350980c3a
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-27 19:43:13 -07:00
05cfe86cd0
add some additional jquery challenges
2015-06-27 19:42:25 -07:00
7ee4b22a57
update the cities on the field guide
2015-06-27 15:28:37 -07:00
75c77cdb6f
clean up future jquery challenges
2015-06-27 11:56:31 -07:00
4db1f441fe
bump loopback passport
2015-06-26 18:11:44 -07:00
66e4138b36
fix buffer return from database query
2015-06-26 01:51:27 -07:00
e53419bb59
fix should be bufferWithCount
2015-06-26 01:48:21 -07:00
3bac247627
remove stack trace from production
2015-06-26 01:30:51 -07:00
7e2d5c91e2
minor ui improvements
2015-06-26 01:28:02 -07:00
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
8570f9b5e7
fix story upvote should happen at end of stream
2015-06-26 00:35:13 -07:00
9818186afc
fix should redirect to /news when no story is found
2015-06-26 00:16:18 -07:00
310bf7f6fb
fix navbar should point to /news not /stories
2015-06-25 23:43:02 -07:00
549434bdbf
fix should be /news for show views
2015-06-25 23:39:38 -07:00
6700729658
update emails and refine sponsor view
2015-06-25 23:35:48 -07:00
82c96ec0ba
bump main.js version
2015-06-25 23:20:16 -07:00
9c2768591d
fix check for user existence
2015-06-25 23:01:04 -07:00
2422663f34
add comments migration to loopback script
2015-06-25 21:47:25 -07:00
e9450b9321
start building sponsor views
2015-06-25 15:15:41 -07:00
13590a1331
refactor rxify stories
...
fixes many bugs
2015-06-25 15:03:46 -07:00
42eba3becc
Issue 1059 - Wording issue on instructions
...
Second issue to solve states "Each of your Bootstrap buttons should be wrapped within its own a div element with the class "col-xs-4". Removed the word "a" to read "wrapped within its own div".
This closes #1059
2015-06-24 21:52:10 -05:00
95b0884df5
Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036
...
Issue 1036 - Fixed minor grammatical mistake
2015-06-24 10:43:12 -07:00
08c649f3f7
Merge pull request #1093 from LumenTeun/typeerror
...
Fixes misspelling that caused 'undefined is not function' error
2015-06-24 10:34:31 -07:00
c3d9598d18
Merge pull request #1102 from NatashaHaggard/patch-2
...
Issue 1080
2015-06-24 10:32:58 -07:00
c8c03aae10
'Slack' to 'Gitter or Slack'
2015-06-24 10:29:52 -07:00
95f47de9f0
'Slack' to 'Gitter'
2015-06-24 10:29:52 -07:00
8c5cf3ae68
Merge pull request #1101 from NatashaHaggard/patch-1
...
Issue 1094 - Field Guide Error
2015-06-24 10:23:27 -07:00
750a454298
update bootcamp json
2015-06-24 09:37:03 -07:00
c5a31baeda
remove resources.js controller
2015-06-24 09:30:35 -07:00
1f28f877cf
fix remove mongoose specific function
2015-06-24 08:25:34 -07:00
3e24f21828
fix comment model defaults
2015-06-24 08:24:13 -07:00
62d2c40a87
Add read access to all models
2015-06-24 08:23:49 -07:00
82a4afe8ba
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:26:23 -07:00
5bde1839f3
add read authority to all for stories and comments
2015-06-24 07:25:56 -07:00
4871b58904
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:21:22 -07:00
1df962bb07
Merge branch 'master' into staging
...
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
2015-06-24 07:19:54 -07:00
c0c15cf875
fix define story
2015-06-24 07:16:09 -07:00
4d620c5796
comment out feature map modal and camper news notification
2015-06-24 07:06:40 -07:00
3a0ab673f3
Update Gitter badge path
2015-06-23 21:55:24 -07:00
926151ff8b
Add Gitter badge and use map art instead of logo
2015-06-23 21:54:00 -07:00
bd0a517144
Issue 1080
...
Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name
2015-06-23 22:55:52 -05:00
1e84751a0f
Issue 1094 - Field Guide Error
...
"Contact Jason Ruekert - he's @jsonify in Slack."
Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter."
2015-06-23 22:46:28 -05:00
0b1e9ba279
fix mismatch property in challenge controller
2015-06-23 16:45:35 -07:00
31eb81bf2f
fix many queries in story
2015-06-23 16:28:16 -07:00
fb04a022ae
refactor rxify fieldguides
2015-06-23 16:22:07 -07:00
fb1897073c
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
2015-06-23 11:42:41 -07:00
