mozilla
/
CSOL-site
зеркало из https://github.com/mozilla/CSOL-site.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
936 коммитов 6 Ветки 101 Тег 14 MiB
Граф коммитов

936 Коммитов

Автор SHA1 Сообщение Дата
Chris McAvoy 25cee173ea adds search bar, and other nice things. includes the sharing and STEAM / iremix stuff that can't go to prod yet. staging only. 2013-06-20 09:33:37 -05:00
Chris McAvoy f78b85f755 Merge remote-tracking branch 'origin/master' into adds-social-and-iremix 2013-06-20 09:15:47 -05:00
Chris McAvoy db2a503e4b Merge pull request #662 from andrewhayward/tweaks 
Removing legacy template `user` objects
 2013-06-20 07:13:34 -07:00
Chris McAvoy b6a644543f Merge pull request #663 from andrewhayward/search 
Adding 'search' to `/earn` and `/explore` filters
 2013-06-20 07:13:03 -07:00
Andrew Hayward 6e446e9bdc Fixing `getBadges` test to allow for `search` 2013-06-20 14:38:42 +01:00
Andrew Hayward bb0d076056 Adding 'search' to `/earn` and `/explore` filters 
Resolves #616
 2013-06-20 12:43:14 +01:00
Andrew Hayward d5e7aefece Removing legacy template `user` objects 2013-06-20 09:09:53 +01:00
Chris McAvoy 9bd85e4244 Merge pull request #658 from stenington/572-program-cta 
Better program detail call to action and bug fixes
 2013-06-19 15:06:47 -07:00
Mike Larsson 40e5c3782e Fix tests: url -> localUrl for programs 2013-06-19 17:20:27 -04:00
Chris McAvoy 7c6ef894be bumping for staging, no difference from 22 2013-06-19 15:58:18 -05:00
Chris McAvoy 1381646b74 adds social sharing back and iremix, plus many other fixes. this is only for staging to test iremix 2013-06-19 14:33:34 -05:00
Chris McAvoy ebd4c107e6 Merge remote-tracking branch 'stenington/590-591-twitter-facebook' into adds-social-and-iremix 2013-06-19 14:32:49 -05:00
Chris McAvoy 14760ac036 Merge remote-tracking branch 'erik/197-steam-badge-email' into adds-social-and-iremix 2013-06-19 14:32:22 -05:00
Chris McAvoy aa983d1db4 Merge pull request #648 from andrewhayward/auth 
Overhauling user sign-up flow
 2013-06-19 12:29:49 -07:00
Mike Larsson 5260ee443f Correcting program urls and enhancing call to action: 
org urls, program urls, and local urls were getting conflated
programs now have url (coming from openbadger) and localUrl (the CSOL-site url)
program detail pages display an email, program url link, or phone number
  depending on available data
 2013-06-19 15:14:33 -04:00
Chris McAvoy 710ae43ec7 Merge pull request #641 from andrewhayward/dictionary 
Removing problematic words from noun list
 2013-06-19 11:59:11 -07:00
Chris McAvoy f6fe465512 Merge pull request #653 from andrewhayward/claims 
Testing for badge existence during 'claim' process
 2013-06-19 11:58:42 -07:00
Chris McAvoy c8ac2c6343 Merge pull request #655 from curlee/master 
upated application status descriptions
 2013-06-19 11:57:38 -07:00
Chris McAvoy 24f45825aa Merge pull request #656 from andrewhayward/applications 
Adding notification for in-progress applications
 2013-06-19 11:57:12 -07:00
Andrew Hayward e57157fc09 Adding notification for in-progress applications 
Fixes #647
 2013-06-19 18:32:54 +01:00
Joe Curlee 5907740b34 updated state descriptions for application status. fixes #280 2013-06-19 12:10:14 -05:00
Chris McAvoy 23170df058 removes facebook twitter sharing and iremix notification, adds many small fixes 2013-06-19 11:53:08 -05:00
Chris McAvoy f0ed63c7b6 removes facebook / twitter sharing and iremix notification, adds many small fixes 2013-06-19 11:51:53 -05:00
Chris McAvoy 327a1fe71b Merge pull request #652 from curlee/master 
copy updates
 2013-06-19 09:49:56 -07:00
Joe Curlee e5aaf96431 added pre-wrap and break-word to p.description. fixes #651 2013-06-19 11:13:09 -05:00
Andrew Hayward 00a36f1196 Testing for badge existence during 'claim' process 2013-06-19 17:12:32 +01:00
Joe Curlee fe121b1383 changed no data tet for my applications. fixes #632 2013-06-19 10:57:19 -05:00
Joe Curlee b308778629 changed "my csol" to "my portfolio". fixes #631 2013-06-19 10:16:45 -05:00
Joe Curlee b1b98d6cde changed "playlist" to "my playlist" in my csol nav. fixes #637 2013-06-19 10:15:23 -05:00
Andrew Hayward a9dc9f3834 Adding in option to allow deselection of ethnicity 2013-06-19 14:43:32 +01:00
Andrew Hayward 35b31634f5 Tidying date entry inputs given extra space 2013-06-19 14:43:01 +01:00
Andrew Hayward dde8c37dcd Adding 'go back/restart' buttons to sign-up forms 2013-06-19 14:21:32 +01:00
Andrew Hayward b5f26e81ff Overhauling user sign-up flow 
Allowing users to restart sign-up, and go back in the process should they need to.
Fixes second item in #621
 2013-06-19 14:20:09 +01:00
Mike Larsson 973d0076cc Attach shareTokens to badge objects for backpack.html page, and use correct share url for social sharing 2013-06-18 21:54:30 -04:00
Mike Larsson f4b1e892a1 Move template off items 2013-06-18 21:36:45 -04:00
Chris McAvoy 87b52606c5 Merge pull request #646 from andrewhayward/auth 
Using `FieldError` for unavailable username
 2013-06-18 17:00:07 -07:00
Erik Christensen 47242849b7 Fixing openbadger test by adding fake environment variables for iRemix. 2013-06-18 16:23:32 -07:00
Chris McAvoy a675fa320f several small fixes 2013-06-18 18:13:59 -05:00
Chris McAvoy 4df14de663 Merge pull request #643 from andrewhayward/tweaks 
Fixing display error for separate 'log-in/sign-up'
 2013-06-18 16:13:31 -07:00
Erik Christensen a831830d2b Removing call to health check stub for iRemix, so that it doesn't lie to us about how incredibly healthy it is. 2013-06-18 15:59:44 -07:00
Erik Christensen 8ae47f465b Documenting new environment variables. 2013-06-18 15:51:20 -07:00
Andrew Hayward a3674647cd Using `FieldError` for unavailable username 2013-06-18 23:42:18 +01:00
Erik Christensen 0f6fecc6e5 Implemented communication with iremix when auto-awarded a STEAM badge, as well as emails to learners/guardians when awarded a STEAM badge. 2013-06-18 15:38:23 -07:00
Andrew Hayward a952075f98 Fixing display error for separate 'log-in/sign-up' 2013-06-18 23:36:36 +01:00
Andrew Hayward e42b19ae7d Removing problematic words from noun list 2013-06-18 23:18:17 +01:00
Mike Larsson bc5096957d This adds Twitter and Facebook sharing using the "Build your own Tweet button" 
and Share Dialog methods, respectively. Both are javascript and iframe free;
instead you link to a specified url. For Twitter customization arguments
are sent through query parameters. Facebook requires you to put open graph
meta tags at the shared url.

Right now the user has to ensure their badge is made public before sharing.
Nothing stops you from sharing a private badge, but that link will be broken
when people try to visit it.
 2013-06-18 18:18:08 -04:00
Chris McAvoy dda04c1492 many fixes for <13 messaging 2013-06-18 17:15:19 -05:00
Chris McAvoy a51a2a7275 updating version number in package 2013-06-18 17:11:37 -05:00
Chris McAvoy e2d0d7f971 Merge pull request #627 from andrewhayward/auth 
Auth updates
 2013-06-18 15:07:44 -07:00
Chris McAvoy e85da8a01b Merge pull request #629 from andrewhayward/tweaks 
Various bits and pieces
 2013-06-18 15:06:57 -07:00