Commit Graph

20700 Commits

Author SHA1 Message Date
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
9f6d2410c1 added optional space to the editor match in OOP challenges.
closes #3331
2015-10-06 20:37:32 -04: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
ba8a06cf4b 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
ccd7fcc32d More test and copy fixes. Removed weird bugged challenge 2015-10-06 22:54:20 +01:00
a27aa2d9f6 More test and copy fixes. Removed weird bugged challenge 2015-10-06 22:54:20 +01:00
5efdf3178d 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
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
b0ee678af8 renamed -you- to -your- ; fixes #3607 - grammar bug 2015-10-06 17:30:27 -04:00
a6789b8511 renamed -you- to -your- ; fixes #3607 - grammar bug 2015-10-06 17:30:27 -04:00
733d46b252 Fixed tests 2015-10-06 21:47:29 +01: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
668852fdc7 Fix Waypoint: Find Whitespace spelling and grammar. 2015-10-06 08:45:21 -07:00
c8f69d2110 Merge pull request #3593 from formap/fix/2467-missing-bootstrap
Fix bootstrap fluid containers wording issue
2015-10-06 19:20:51 +04:00
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
71621a01cb Merge pull request #3572 from ahstro/fix/truncate-typo
Truncate a string: Minor typo
2015-10-06 18:25:14 +04:00
57b9e25285 Merge pull request #3572 from ahstro/fix/truncate-typo
Truncate a string: Minor typo
2015-10-06 18:25:14 +04:00
1fe18ba4a5 Merge pull request #3605 from ahstro/fix/whitespace-test
'Regular Expressions'-waypoint improvements
2015-10-06 17:52:54 +04:00
39b4a73efb '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
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
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
57d0e5750b 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
e404e74187 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-05 22:44:29 -07:00
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
d78d7a3fa1 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-05 22:43:17 -07:00
9a0505f782 add github linking enforcement 2015-10-05 22:42:42 -07:00
e6afda62c7 Add 5 dollar option to commit 2015-10-05 22:19:56 -07:00
e16efc832c Move commit to separate router 2015-10-05 22:19:56 -07:00
f02b3ffd4c update commit copy 2015-10-05 22:19:56 -07:00
030c858274 minor improvements to onboarding and create skeleton commit page 2015-10-05 22:19:55 -07:00
68b12caf48 minor improvements to onboarding and create skeleton commit page 2015-10-05 22:19:55 -07:00
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
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
c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
b3ee546e65 start adding clementine challenge 2015-10-05 21:57:15 -07:00