Commit Graph

6486 Commits

Author SHA1 Message Date
cdbd052b35 Merge branch 'staging' into clementine 2015-10-07 01:29:15 -07:00
1f7141c523 Merge branch 'staging' into clementine 2015-10-07 01:28:41 -07:00
087cfcece7 reverse unnecessary changes 2015-10-07 01:26:54 -07:00
0f6cdf8be1 Merge pull request #3615 from FreeCodeCamp/feature/commit
Add feature Commit
2015-10-07 01:23:24 -07:00
a906b8f411 Fix firstChallenge var should point to new first challenge 2015-10-07 01:14:33 -07:00
adfbdd7f9f more style improvements 2015-10-07 01:06:36 -07:00
f7500c4bb0 improve style 2015-10-07 00:44:46 -07:00
05c5eb8d2c update challenge sequence and break on boarding into two sections 2015-10-07 00:41:43 -07:00
a1b574f768 update camper portfolio page 2015-10-07 00:41:43 -07:00
cd964425f7 add t-shirt banner 2015-10-07 00:41:42 -07:00
241ca8097d Fix link errors in randomAPIs 2015-10-07 00:28:42 -07:00
7a4f5d752c Move labs/stories to server/resources
Rename stories to testimonials to reduce confusion
2015-10-07 00:26:17 -07:00
ea827fda37 Remove unnecessary dangling class 2015-10-07 00:17:18 -07:00
4f26d82f65 add labs and stories 2015-10-07 00:17:18 -07:00
56673d429d add labs 2015-10-07 00:17:17 -07:00
febdc5b0cc hide more info button 2015-10-07 00:17:17 -07:00
987c29e26f add testimonials 2015-10-07 00:17:17 -07:00
189658d825 Merge branch 'feature/commit' of https://github.com/freecodecamp/freecodecamp into feature/commit 2015-10-07 00:07:04 -07:00
92b9f71532 Add commit directory page 2015-10-07 00:05:26 -07:00
1d9a815b35 Merge pull request #3613 from natac13/fix/add-whitespace-to-tests-#3331
added optional space to the editor match in OOP challenges.
2015-10-07 10:49:52 +04:00
a7b2dc71b1 Fix BF Exact Change Tests
Added a test case for when the smallest denomination of change available is larger than the total change required.

Closes #1409
2015-10-06 23:49:08 -07:00
f5966c0959 Change redirect and text on commit 2015-10-06 23:33:17 -07:00
3273593b9c Change order of edit buttons on profile 2015-10-06 23:32:31 -07:00
364f79818f Fix dynamic commit link 2015-10-06 23:26:15 -07:00
780e0ead43 Merge branch 'staging' into feature/commit 2015-10-06 23:20:14 -07:00
b574b2f357 Merge pull request #3618 from FreeCodeCamp/feature/add-isBeta-flag
Add ability to filter beta challenges from production
2015-10-06 23:18:45 -07:00
44fd85dff8 Add ability to filter beta challenges from production
This PR adds the ability to test out challenges in beta
without fear that they will leak to production servers.

In development all challenges will display.

In production all challenges marked 'isBeta' will be filtered out
except in the case the environmental variable `BETA` is set ture,
in which case all challenges will display.
2015-10-06 22:37:08 -07:00
2864f607cc Add on certification, complete goal and stop pledge 2015-10-06 21:12:40 -07:00
49c06b266e Add complete commit endpoint 2015-10-06 19:51:19 -07:00
0b716c0057 Add stop commit functionality 2015-10-06 19:51:19 -07:00
d132978df9 Add ability to edit commit 2015-10-06 19:51:19 -07:00
362efd4365 Add display on user profile when user commits 2015-10-06 19:51:19 -07:00
c8da944caf Add logic to load nonprofit on query
Add logic to model update
2015-10-06 19:51:19 -07:00
bc6a9c6db2 Add redirect to user page on submit 2015-10-06 19:51:19 -07:00
d1c0276f4e fix spiffy up the commit form 2015-10-06 19:51:19 -07:00
3f96490aff Add pledge model 2015-10-06 19:51:19 -07:00
00b54e3d1f added optional space to the editor match in OOP challenges.
closes #3331
2015-10-06 20:37:32 -04:00
914f2ef0b8 Merge pull request #3611 from FreeCodeCamp/fix/replace-script-tag-in-url
Fix replace script tags in URL
2015-10-06 16:48:37 -07:00
b1d8814aed remove angular from views 2015-10-06 16:43:46 -07:00
33e8f35bbf Fix replace script tags in URL
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -07:00
60d059f71e remove angular from bower file and scripts 2015-10-06 16:17:31 -07:00
2b1652942e Merge pull request #3609 from gsvolt/bug3607
renamed -you- to -your- ; fixes a simple grammar bug in english
2015-10-07 01:14:27 +02:00
b8dc81214d Merge branch 'staging' into remove-angular
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
2015-10-06 16:00:59 -07:00
56b7b6f29b improve markup and titles of challenges 2015-10-06 15:37:43 -07:00
6d1c126f2c Merge branch 'staging' into curriculum/JSONAndAJAX 2015-10-06 15:04:19 -07:00
a27aa2d9f6 More test and copy fixes. Removed weird bugged challenge 2015-10-06 22:54:20 +01:00
a0885d4481 Merge remote-tracking branch 'origin/staging' into curriculum/JSONAndAJAX
:ting with '#' will be ignored, and an empty message aborts
:
aad]
dad
2015-10-06 22:34:20 +01:00
a6789b8511 renamed -you- to -your- ; fixes #3607 - grammar bug 2015-10-06 17:30:27 -04:00
9f298cbe94 Fixed tests 2015-10-06 21:47:29 +01:00
a17687116e Fix Waypoint: Find Whitespace spelling and grammar. 2015-10-06 08:45:21 -07:00