mozilla
/
webmaker.org
зеркало из https://github.com/mozilla/webmaker.org.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
2 000 коммитов 13 Ветки 468 Теги 48 MiB
Граф коммитов

2000 Коммитов

Автор SHA1 Сообщение Дата
gvn lazar suntop 3912b2e502 Merge pull request #1003 from gvn/1083468 
1083468
 2014-10-24 17:07:55 +01:00
Ali Al Dallal 9bd1ba3048 bug1027120 - Remove SHOW_PROFILE flag 2014-10-23 10:51:33 +01:00
Ali Al Dallal 32488440f7 Fix baseURL 2014-10-23 10:32:16 +01:00
Christopher De Cairos 21f586a3e4 Revert "bug1074283 - force locale on all angular routes" 
This reverts commit 8b26ce13b7.

Conflicts:
	public/js/angular/app.js
 2014-10-22 12:04:38 -04:00
Christopher De Cairos afe8002af9 Bug 1086939 - missing semicolons in locale banner controller 2014-10-22 10:46:55 -04:00
Christopher De Cairos 308d4681a2 set up locale suggestion listeners using the ng-click directive 2014-10-22 10:29:21 -04:00
Ali Al Dallal ada40deb85 bug1074913 - Remix your school, Private eye and Music Video 2014-10-20 11:09:03 -04:00
Gvn Lazar Suntop 6a4d4e73a4 copy edit 2014-10-17 10:05:49 -07:00
Ali Al Dallal 8b26ce13b7 bug1074283 - force locale on all angular routes 2014-10-15 20:01:11 -04:00
Ali Al Dallal 4671674536 Locale Banner Awareness 2014-10-14 09:59:33 -04:00
Gvn Lazar Suntop 0b41299563 v1.1.70 2014-10-13 10:17:44 -07:00
gvn lazar suntop 5b457b83f1 Merge pull request #1000 from gvn/1079397 
1079397
 2014-10-13 10:00:52 -07:00
Gvn Lazar Suntop 409c864711 link 'my makes' to profile subview 2014-10-09 16:20:29 -07:00
Aki Rose Braun ae73cc37fa 1.1.69 2014-10-08 20:57:27 -07:00
Aki 0220240168 Merge pull request #999 from keyboardkat/weblit-design-changes 
Fixes Bug 1058349 - Add more resources to Web Literacy: Design and Accessibility page
 2014-10-08 20:57:11 -07:00
Aki Rose Braun 9ba4ba73a3 1.1.68 2014-10-08 20:54:44 -07:00
Aki 5560c63cad Merge pull request #998 from keyboardkat/remix-change 
Fixes Bug 1058342 - Add more resources to Web Literacy: Remixing page
 2014-10-08 20:54:18 -07:00
keyboardkat 2136dbc4f9 Fixed comma ;) 
Sigh.
 2014-10-08 17:02:23 -07:00
keyboardkat bb7297ec06 Image added to [Design] competency page 
Image of Frank Chimero
 2014-10-08 16:55:51 -07:00
keyboardkat 4fc8d5ba8f Added video embed to "Remix" 
Added Max Capacity vid embed to “Remix” section, under “Make” - first
time we’ve embedded a vid in this section of content.
 2014-10-08 16:22:58 -07:00
Gvn Lazar Suntop cf8f6e29cb v1.1.67 2014-10-08 10:41:14 -07:00
Gvn Lazar Suntop 72cf0d75fb v1.1.66 2014-10-08 10:19:18 -07:00
gvn lazar suntop 3c20e04280 Merge pull request #997 from gvn/1072468 
1072468
 2014-10-08 10:17:15 -07:00
Gvn Lazar Suntop e60be37d92 adding "skill sharer" badge to subnav 2014-10-07 13:57:41 -07:00
Ali Al Dallal dfb96460b0 Update translation file 2014-10-06 15:02:23 -04:00
Ali Al Dallal d056bc3ed3 Update webmaker.org.json 2014-10-06 14:56:45 -04:00
Akshay Tiwari 0717b8c816 Bug 1041732 - Make Details username should link to profile page 2014-10-06 09:53:43 -04:00
Aki Rose Braun 61740938c9 1.1.65 2014-10-02 15:24:30 -07:00
Aki a20dd25c89 Merge pull request #995 from gesa/1063035/fix-competency-media-gen 
Bug 1063035 - Add new media and content to [Web Literacy: Search] page
 2014-10-02 15:21:50 -07:00
Aki Rose Braun 8bed8528f9 Bug 1063035 - Add new media and content to [Web Literacy: 
Search] page
 2014-10-02 13:12:42 -07:00
Aki 0b97c4541f Merge pull request #993 from keyboardkat/search-change-test 
Bug 1063035 - Add new media and content to [Web Literacy: Search] page
 2014-10-02 13:12:22 -07:00
keyboardkat 77ae48b6a5 Edit to content.json under [search] #2 
with comma.
 2014-10-02 12:29:06 -07:00
keyboardkat b59820d773 Edit to content.json under [search] 
Added image to “explore” and teaching kit to “teach” under Search
section. Fixed Aki multimedia array issue (I think? First time i’m
adding an image like this.)
 2014-10-01 17:25:35 -07:00
Erik Christensen fa08fd8109 1.1.64 2014-10-01 14:28:04 -04:00
Erik Christensen 18542a691e Merge pull request #991 from christensenep/fix-issue-bug 
Bug 1075692 - Fixing bug with single badge issuing
 2014-10-01 14:26:32 -04:00
Erik Christensen 61462ce1ab Merge pull request #992 from christensenep/1075682 
Bug 1075682 - Fix badge display for logged out users
 2014-10-01 14:22:24 -04:00
Erik Christensen 69cc5c9f91 Adding error if neither email nor emails provided 2014-10-01 14:21:06 -04:00
Erik Christensen 4c4f3bba4e Fixing missing null check 2014-10-01 13:31:38 -04:00
Erik Christensen f4fdf841a7 Fixing bug with single badge issuing 2014-10-01 12:53:53 -04:00
Errietta Kostala 439aec7e84 Merge pull request #990 from errietta/bug1069400 
Don't use a global object
 2014-09-30 21:47:31 +01:00
Errietta Kostala 30a66d07da Don't use a global object 2014-09-30 20:41:48 +00:00
Aki ee64e9d71f Merge pull request #988 from gesa/1071616/privacy 
Fixes Bug 1071616 - Convert /privacy to angular + makerstrap
 2014-09-29 12:52:02 -07:00
Jon Buckley dcb9ac7b2f 1.1.63 2014-09-29 12:58:45 -04:00
Jon Buckley edc0aa05f2 Bug 1074266 - Update to webmaker-locale-mapping v0.0.5 2014-09-29 12:58:45 -04:00
Aki Rose Braun afc57131ba Bug 1071616 - Convert /privacy to angular + makerstrap 2014-09-28 14:46:31 -07:00
Errietta Kostala d119212325 Merge pull request #987 from errietta/1063934 
Show events in menu
 2014-09-27 10:26:59 +01:00
Errietta Kostala fd85ab3763 Show my events in menu 2014-09-25 22:31:43 +00:00
Erik Christensen 113346d9ce 1.1.62 2014-09-25 12:04:26 -04:00
Erik Christensen 9e3993f4cb Merge pull request #982 from christensenep/1003998 
Bug 1003998 - Bulk badge issuing
 2014-09-24 17:05:01 -04:00
Erik Christensen 14f4c9e32e Changing badge issuing copy 2014-09-24 16:57:11 -04:00