6c7d2685fd
Current and Longest streak calculation fixed
...
Minor refactoring and unit tests added
After CR: user-stats file moved to util folder, export keywork added to exported functions, new line added at the end of gulp file
User-stats-test file moved to replicate user-stats path in test folder
2015-12-15 18:33:04 -05:00
cf65c698bb
Merge pull request #5121 from gasperno/feature/skip-step-in-step-challenge
...
Skip Button/Go to next step functionality enhancement
2015-12-09 19:03:06 -08:00
a443c2bd37
Go to next step is enabled after user finishes step challenge
2015-12-09 20:25:43 -05:00
73bcdde4e5
Merge pull request #5110 from ltegman/fix/bf-truncate-string-typo
...
Fix Bonfire Truncate a String Typo
2015-12-09 15:38:04 -08:00
a30c87db0c
Merge pull request #5098 from ltegman/fix/wp-use-comments-tests
...
Fix Waypoint Use Comments Test
2015-12-09 14:50:28 -08:00
0dbf56e23a
Merge pull request #5117 from FreeCodeCamp/landing-change
...
Update landing icons and copy to reflect React and D3
2015-12-09 14:38:50 -08:00
33b1ba08f1
Merge pull request #5090 from FreeCodeCamp/fix/bonfire-not-saving
...
Fix remove bonfire save endpoint
2015-12-09 14:20:10 -08:00
5d1ab89a1a
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-12-09 15:01:17 -06:00
41c0bf1f0e
Merge branch 'CodeNonprofit-add/commitnonprofit' into staging
2015-12-09 15:00:58 -06:00
8c06293df3
update json for commit
2015-12-09 14:59:56 -06:00
66431753b3
Merge branch 'add/commitnonprofit' of https://github.com/CodeNonprofit/FreeCodeCamp into CodeNonprofit-add/commitnonprofit
2015-12-09 14:14:21 -06:00
747dbfe750
update landing icons
2015-12-09 14:13:18 -06:00
aea2eaf2e7
Added 3 new nonprofits to Commit
2015-12-09 14:27:02 -05:00
22ef7fa3da
Merge pull request #5069 from FreeCodeCamp/fix/reduce-header-size
...
Reduce header size
2015-12-09 11:19:35 -08:00
0f75aa3b88
Add freecatphotoapp to csp
2015-12-09 11:02:06 -08:00
9822cc67f9
Reduce header size
...
This is needed to move to cloudFlare
2015-12-09 10:56:40 -08:00
172d0f0207
Fix Bonfire Truncate a String Typo
2015-12-09 09:12:50 -08:00
0c8bf2dd9f
Fix Waypoint Use Comments Test
2015-12-09 00:01:54 -08:00
4bcdb3d286
Merge pull request #5091 from LenaBarinova/fix/test-cases-do-not-catch-obvious-critcal-errors
...
Fix tests on Use Conditional Logic with If and Else to fail on wrong if
2015-12-08 16:45:04 -08:00
f709ee30ee
Fix for completedDate missing
2015-12-08 16:17:45 -08:00
579c569d15
Fix remove bonfire save endpoint
...
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
9774638d43
Fix waypoints are not bonfires
2015-12-08 16:17:45 -08:00
6b7a314205
Merge pull request #5076 from FreeCodeCamp/update-ziplines
...
Update ZIpline and Basejump code review instructions, remove gist export
2015-12-08 16:13:58 -08:00
da491ed374
Merge pull request #5088 from LenaBarinova/fix/free-code-camp-map
...
Challenge numbering in Map fixed to work properly on IE.
2015-12-08 15:47:42 -08:00
c2e025ca23
Merge pull request #5094 from FreeCodeCamp/fix/history-semvar
...
Use same history as react-router
2015-12-08 15:39:42 -08:00
e5bf30ce12
Use same history as react-router
2015-12-08 15:34:45 -08:00
c900850256
Merge pull request #5092 from gasperno/fix/step-challenge-mobile
...
step challenge button block in mobile version fixed
2015-12-08 15:07:17 -08:00
d3f1829931
step challenge button block in mobile version fixed
2015-12-08 17:45:30 -05:00
104552b85c
Fix tests on Use Conditional Logic with If and Else to fail on wrong if implemenmtation
2015-12-08 14:28:49 -08:00
285d7cbf50
Merge pull request #5086 from FreeCodeCamp/fix/replace-tags
...
Make tag replacement more robust
2015-12-08 12:42:12 -08:00
0f51dcfdf4
add comma to 1000
2015-12-08 14:35:25 -06:00
025a1269eb
remove additional gist button
2015-12-08 14:34:05 -06:00
96375bb643
Challenge numbering in Map fixed to work properly on IE.
2015-12-08 11:46:35 -08:00
5270f0e42e
Make tag replacement more robust
...
Some challenges are incorrectly saved with no solutions
2015-12-08 11:30:47 -08:00
eb740482ec
Merge pull request #5075 from FreeCodeCamp/fix/run-first-time
...
Fix run first time
2015-12-08 08:52:01 -08:00
6b9f320285
Merge pull request #5079 from dtraid/grammar
...
Fix grammar in Waypoint: Prefilter JSON (who's/whose)
2015-12-08 08:38:31 -08:00
2a0d84cc63
Fixed grammar: who's -> whose
2015-12-08 16:50:52 +01:00
7a912c355b
Merge pull request #5062 from KrishnaYeolekar/fix/improved-test-for-override-css
...
Fix/improved test for overriding css style
2015-12-08 07:10:44 -08:00
7807c2453d
Improve tests for overriding css challenge
2015-12-08 15:19:59 +05:30
9409945ee7
Merge branch 'staging' into update-ziplines
...
Conflicts:
client/commonFramework/bindings.js
2015-12-08 01:17:03 -06:00
e12e49e25e
Fix run first time
...
Now called `only-once`
but will not throw if run more than once
also, uses node to create file
2015-12-07 23:16:33 -08:00
c23367f62b
Merge pull request #5038 from bugron/fix/common-improvements
...
Some common code improvements
2015-12-07 06:48:47 -08:00
1aa470b184
Merge pull request #5024 from gasperno/fix/multiple-lines-img-tag-regex
...
Modified regex in test case for passing img tag spanning multiple lines
2015-12-07 06:40:33 -08:00
92928b552b
update user stories and sharing instructions for basejumps and ziplines
2015-12-07 00:51:37 -06:00
f585b846bf
Merge pull request #5055 from QuincyLarson/fix/better-zipline-and-basejump-copy
...
improve introductory challenges for ziplines and bonfires
2015-12-06 20:41:53 -08:00
34ac4e2e71
improve introductory challenges for ziplines and bonfires
2015-12-06 22:06:26 -06:00
a051d8cc93
Modified regex in test case for passing img tag spanning multiple lines
2015-12-06 21:08:30 -05:00
6a7f7d9204
Merge pull request #5047 from bogadodiegoh/fix/jQuery-Funhouse-text
...
Updated text from "jQuery Funhouse" to "jQuery Playground"
2015-12-06 11:56:04 -08:00
cbd117c64d
Updated text from "jQuery Funhouse" to "jQuery Playground"
...
This change fixes the issue #5032 .
2015-12-06 16:49:18 -03:00
de302ae925
Merge pull request #5031 from gasperno/fix/multiple-lines-modify-regex
...
fix regex to test h1 tag spanning multiple lines
2015-12-06 10:55:36 -08:00