gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,006 Commits 9 Branches 0 Tags
a42e4cfd83e1247f994c08d292ed94ff937f66a1
Commit Graph

8006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Berkeley Martinez
d132978df9 Add ability to edit commit 2015-10-06 19:51:19 -07:00
Berkeley Martinez
362efd4365 Add display on user profile when user commits 2015-10-06 19:51:19 -07:00
Berkeley Martinez
c8da944caf Add logic to load nonprofit on query 
Add logic to model update
 2015-10-06 19:51:19 -07:00
Berkeley Martinez
bc6a9c6db2 Add redirect to user page on submit 2015-10-06 19:51:19 -07:00
Berkeley Martinez
d1c0276f4e fix spiffy up the commit form 2015-10-06 19:51:19 -07:00
Berkeley Martinez
3f96490aff Add pledge model 2015-10-06 19:51:19 -07:00
natac13
00b54e3d1f added optional space to the editor match in OOP challenges. 
closes #3331
 2015-10-06 20:37:32 -04:00
Quincy Larson
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
Quincy Larson
b1d8814aed remove angular from views 2015-10-06 16:43:46 -07:00
Berkeley Martinez
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
Quincy Larson
60d059f71e remove angular from bower file and scripts 2015-10-06 16:17:31 -07:00
Anton Strömkvist
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
Quincy Larson
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
Quincy Larson
56b7b6f29b improve markup and titles of challenges 2015-10-06 15:37:43 -07:00
Quincy Larson
6d1c126f2c Merge branch 'staging' into curriculum/JSONAndAJAX 2015-10-06 15:04:19 -07:00
benmcmahon100
a27aa2d9f6 More test and copy fixes. Removed weird bugged challenge 2015-10-06 22:54:20 +01:00
benmcmahon100
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
Gaurav Saxena
a6789b8511 renamed -you- to -your- ; fixes #3607 - grammar bug 2015-10-06 17:30:27 -04:00
benmcmahon100
9f298cbe94 Fixed tests 2015-10-06 21:47:29 +01:00
Logan Tegman
a17687116e Fix Waypoint: Find Whitespace spelling and grammar. 2015-10-06 08:45:21 -07:00
Arsen Melikyan
2c0a705ff5 Merge pull request #3593 from formap/fix/2467-missing-bootstrap 
Fix bootstrap fluid containers wording issue
 2015-10-06 19:20:51 +04:00
Arsen Melikyan
57b9e25285 Merge pull request #3572 from ahstro/fix/truncate-typo 
Truncate a string: Minor typo
 2015-10-06 18:25:14 +04:00
Arsen Melikyan
1fe18ba4a5 Merge pull request #3605 from ahstro/fix/whitespace-test 
'Regular Expressions'-waypoint improvements
 2015-10-06 17:52:54 +04:00
ahstro
7a31cdd922 'Regular Expressions'-waypoint improvements 
* Remove unnecessary `i`-flag from tests and test messages,
  e.g. `/\s+/gi` => `/\s+/g`
* Remove dupliate backslashes from regex test messages,
  e.g. `/\\s+/g` => `/\s+/g`

The two backslashes were probably just an accident caused by how
multiple escapes are necessary with the current way tests are handled.
The `i`-flag was just unnecessary since its purpose is to ignore the
case of alphabetic characters.
 2015-10-06 15:13:53 +02:00
Logan Tegman
91708a3316 Fix Waypoint: Find White Space Explaination 
Changed text description to make it clear that `\s` is used to find all types of whitespace characters, not just `" "`.
Closes #2838
 2015-10-05 22:50:09 -07:00
Quincy Larson
e404e74187 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-05 22:44:29 -07:00
Quincy Larson
ebe0165fba Merge pull request #3601 from FreeCodeCamp/fix/user-certs-edge-cases 
Fix/user certs edge cases
 2015-10-05 22:43:39 -07:00
Quincy Larson
d78d7a3fa1 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-05 22:43:17 -07:00
Quincy Larson
9a0505f782 add github linking enforcement 2015-10-05 22:42:42 -07:00
Berkeley Martinez
e6afda62c7 Add 5 dollar option to commit 2015-10-05 22:19:56 -07:00
Berkeley Martinez
e16efc832c Move commit to separate router 2015-10-05 22:19:56 -07:00
Quincy Larson
f02b3ffd4c update commit copy 2015-10-05 22:19:56 -07:00
Quincy Larson
68b12caf48 minor improvements to onboarding and create skeleton commit page 2015-10-05 22:19:55 -07:00
Quincy Larson
84eb5ac810 Merge pull request #3596 from FreeCodeCamp/fix/500-out-of-range-bug 
Fix 500 out of range bug when completing last challenge
 2015-10-05 22:15:26 -07:00
Quincy Larson
9bce039e7a Merge pull request #3602 from FreeCodeCamp/fix/share-able-url-solution-undefined 
fix shareable challenges solution undefined
 2015-10-05 22:09:03 -07:00
Quincy Larson
c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
Berkeley Martinez
85f2c005cd fix shareable challenges solution undefined 
During challenges when a user tries to navigate to a challenge
and hits the name redirect, the solution is filled with
undefined starting the user with an empty box.
This PR fixes the issue by ignoring the solution param
if it is empty
 2015-10-05 20:18:52 -07:00
Berkeley Martinez
188da02ffc Fix disable cert 
Disable certificate when user is locked to the public
or when they haven't signed academic honesty
 2015-10-05 20:00:25 -07:00
Berkeley Martinez
202d0fa068 Fix add to completed challenges on cert verify 2015-10-05 19:58:44 -07:00
Quincy Larson
bf4ccab586 Merge pull request #3570 from FreeCodeCamp/feature/certificates 
Add certification page
 2015-10-05 17:19:17 -07:00
Quincy Larson
34efc43f6a update copy of certificate flows 2015-10-05 17:18:35 -07:00
Berkeley Martinez
8f84596142 Fix 500 out of range bug when completing last challenge 2015-10-05 16:38:58 -07:00
Quincy Larson
fc17e266fb Merge branch 'staging' into feature/certificates 2015-10-05 16:30:01 -07:00
Berkeley Martinez
8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
benmcmahon100
da09a7b650 Brought in line with staging and added spoofigator! 2015-10-05 23:42:30 +01:00
benmcmahon100
cbb78079f9 resolve difference with the JSON and AJAX differing from staging 2015-10-05 23:40:33 +01:00
Ben McMahon
fdefcae562 Merge pull request #1 from FreeCodeCamp/staging 
update
 2015-10-05 22:52:25 +01:00
benmcmahon100
5b771e18e6 Finished the geolocation waypoint. Ready for QA and copy fixes 2015-10-05 22:46:29 +01:00
Florencia Tarditti
c04832d618 fix bootstrap fluid containers wording issue 
Closes #2467.
 2015-10-05 21:26:18 +02:00
ahstro
e079419367 Confirm the Ending: Add test case 
Add a test case that makes sure the user can't just check the last
character or word.
 2015-10-05 18:01:28 +02:00