f3c99d90a7
Merge pull request #406 from QuincyLarson/auth
...
potentially fix the too many redirects issue
2015-05-01 21:32:57 -07:00
ec5c542d07
potentially fix the too many redirects issue
2015-05-01 21:32:24 -07:00
4729ef31b4
Get rid of duplicate field guide for mac keyboard shortcuts
2015-05-01 17:17:12 -04:00
1fc3595145
Fix twitter link in bonfire/show
2015-05-01 16:56:09 -04:00
1347a8ba30
Use forcedomain express middleware
2015-05-01 16:34:07 -04:00
a9b2e546de
Fix twitter link on bonfire
2015-05-01 16:33:49 -04:00
665e43d85e
Merge remote-tracking branch 'upstream/staging' into staging
2015-05-01 16:26:51 -04:00
c907b2abc5
Merge pull request #405 from QuincyLarson/master
...
make / path redirect to landing in case of old account issue
2015-05-01 10:20:38 -07:00
18d9f06c14
make / path redirect to landing in case of old account issue
2015-05-01 10:18:24 -07:00
322fce8c3e
Merge remote-tracking branch 'upstream/staging' into staging
2015-05-01 07:52:50 -04:00
6c9a039a01
Merge pull request #403 from QuincyLarson/master
...
Unsubscribe mechanism for email campaigns
2015-05-01 00:10:05 -07:00
d8b5028619
update announcement modal
2015-05-01 00:07:34 -07:00
1ec3ef7433
remove errant console.log
2015-04-30 23:42:46 -07:00
19456f2e23
add unsubscribe path
2015-04-30 23:41:40 -07:00
55afd8518c
Add missing semi-colon
2015-04-29 20:55:47 -04:00
1e21d5d7aa
Fix some linting errors in app.js and highlight questionable code with todo comments
2015-04-29 19:30:51 -04:00
c71514cc81
Merge pull request #390 from alex-dixon/fieldguide-hotfix
...
Revert Mac keyboard shortcuts in field guide
2015-04-29 10:46:14 -04:00
ddb93897bc
Revert Mac keyboard shortcuts
2015-04-29 07:16:17 -07:00
9e8a618491
Twitter fixes.
2015-04-28 20:40:02 -04:00
2487f0421b
Fix tweeting in challenges
2015-04-28 19:35:12 -04:00
a8e215c74e
Check everything for undefined in email reply logic for story.js
2015-04-27 20:03:37 -04:00
11c887c55f
Merge branch 'QuincyLarson-pmi' into staging
2015-04-27 19:40:07 -04:00
cef70a67a9
Fix broken url
2015-04-27 19:39:58 -04:00
fd456ec9be
make new landing pages and forms for project managers and nonprofits
2015-04-27 16:17:29 -07:00
c50ce70749
minor updates to coursewares and field guides
2015-04-26 12:46:48 -07:00
03c407c3ce
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-04-25 19:00:30 -07:00
4dab70d5a6
Merge branch 'Maximization-maximization-352' into t push origin stagingstaging
2015-04-25 18:59:57 -07:00
b8bffae47b
@terakilobyte cleaned up event handlers
2015-04-25 18:59:15 -07:00
20c2b7a0ac
Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352
2015-04-25 18:17:46 -07:00
4e9f8b9458
Merge pull request #369 from terakilobyte/staging
...
Bug fixes to stories and fieldguides
2015-04-25 18:14:43 -07:00
c47c783b10
Merge branch 'terakilobyte-stat push origin staginging' into staging
2015-04-25 18:08:29 -07:00
ce84f3eeb1
Fully remove remnant of errant debug statement
2015-04-25 14:36:34 -04:00
7c8e5e60f4
Modification to script.
2015-04-25 12:44:34 -04:00
2fce595e89
Add story cleanup script to ensure all story links are proper.
2015-04-25 12:40:07 -04:00
a9feb269f6
Remove some debug/console.log statements.
...
Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes #367 .
2015-04-25 12:28:14 -04:00
1539708613
Fix Camper News email notification logic
2015-04-25 16:05:36 +02:00
a6f6d7e1cf
Merge branch 'master' of github.com:QuincyLarson/freecodecamp
...
Conflicts:
README.md
2015-04-24 21:39:36 -07:00
76ca1c6c5f
Merge pull request #364 from QuincyLarson/field-guide-fixes
...
Field guide fixes
2015-04-25 00:33:39 -04:00
e49c9ca87e
make some improvements to the field guide articles and move the bonfire styleguide into field guides
2015-04-24 21:30:22 -07:00
252f955285
Merge pull request #360 from benmcmahon100/patch-1
...
slight tidy and example
2015-04-24 20:58:32 -07:00
e327df95ac
Merge branch 'master' into staging
2015-04-24 19:25:42 -04:00
15ea7f3473
Merge pull request #363 from FreeCodeCamp/root
...
Root
2015-04-24 19:16:43 -04:00
b6d1a097c3
Merge pull request #362 from terakilobyte/staging
...
Configure for production on DO.
2015-04-24 19:12:12 -04:00
e7371b0a7b
Configure for production on DO.
2015-04-24 19:11:17 -04:00
96d119f22d
update gitignore to ignore builtAssets/
2015-04-24 16:10:11 -07:00
8c0d9de962
Merge pull request #359 from terakilobyte/staging
...
Site speed
2015-04-24 19:02:16 -04:00
f79834bec9
Greatly increase the speed of sitemap by a factor of at least 10 (Nathan, Quincy, and Berkeley pairing).
2015-04-24 18:57:55 -04:00
8c10f4efcc
make improvements to coursewares.json
2015-04-24 13:57:50 -07:00
eaf81fd3f7
Closes #333
2015-04-24 16:04:25 -04:00
096edd553b
Factor out $('title') to a re-usable variable to make the linter happy and remove old database lookup based on old challenge architecture.
2015-04-24 15:53:22 -04:00
