Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,540 Commits 1 Branch 0 Tags
f8cfdf0d83606ac09bcdfdace425bc28d02f0c3f
Commit Graph

3074 Commits

Author SHA1 Message Date
jsa
168445f7c8 i18n: extract strings from underscore templates 
JIRA: FOR-400
 2014-01-22 11:07:35 -05:00
Greg Price
e634586882 Merge pull request #2222 from edx/gprice/forum-new-post-buttons 
Fix forum buttons
 2014-01-22 08:04:35 -08:00
Greg Price
f5bdec8ae9 Merge pull request #2204 from edx/gprice/mustache-i18n 
Internationalize forums mustache templates
 2014-01-21 13:49:41 -08:00
Greg Price
f75a7e08cd Internationalize forums mustache templates 2014-01-21 15:57:57 -05:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release 
Merging Release 2014-01-21
 2014-01-21 12:41:05 -08:00
Diana Huang
d220aaca66 Minor copy change requested by linkedin. 2014-01-21 09:14:00 -05:00
Greg Price
60fb3cfbb2 Make forum New Post buttons behave as buttons 
JIRA: FOR-205
 2014-01-17 16:38:51 -05:00
Diana Huang
f051e33064 New copy and styling. 2014-01-17 16:23:13 -05:00
Adam Palay
013549a39e removes unsure button (ORA-254) 2014-01-17 14:41:54 -05:00
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting 
one more faulty login regarding ENABLE_MKTG_SITE=true situations
 2014-01-16 17:04:17 -05:00
Diana Huang
0726211a30 Use S3 uploaded image for e-mail button. 
Add in a tracking pixel.

Add in alt text for profile image
 2014-01-16 17:03:15 -05:00
Diana Huang
469fab5875 Update copy for LinkedIn e-mail. 2014-01-16 17:03:15 -05:00
Diana Huang
ed64817644 Use correct linkedin button. 2014-01-16 17:03:15 -05:00
Diana Huang
f37001275a Clean up the e-mail settings. 2014-01-16 17:03:15 -05:00
Diana Huang
a3f1f6600d Integrate new LinkedIn e-mail template 2014-01-16 17:03:15 -05:00
Giulio Gratta
9280f89f86 Merge pull request #2157 from edx/giulio/remove-ice 
Removed ice.min.js completely as ORA is changing anyway
 2014-01-16 10:37:58 -08:00
Don Mitchell
3885e6cf78 Merge branch 'release' 
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
 2014-01-16 12:51:22 -05:00
Greg Price
9075dcefb6 Merge pull request #2186 from edx/gprice/timeago-i18n 
Internationalize our use of jquery.timeago
 2014-01-15 14:23:52 -08:00
Giulio Gratta
31caba3a2a Removed ice.min.js and removed piping code 2014-01-15 14:06:19 -08:00
Greg Price
0f09a3093e Internationalize our use of jquery.timeago 
Also get rid of an unused template and extra copies of jquery.timeago.
 2014-01-15 16:46:38 -05:00
jsa
dfa4a03daa i18n: externalize strings in discussion forums templates and python code. 
JIRA: FOR-398, FOR-399
 2014-01-15 14:26:22 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting 
Verified Certificate Reports
 2014-01-15 06:18:17 -08:00
Julia Hansbrough
1664452a14 Final iteration 2014-01-15 13:06:50 +00:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00:00
Jason Bau
e5215d72b1 Merge pull request #2165 from edx/jbau/course_about_better_errormsg 
add FAQ link to course_about error msg
 2014-01-14 14:10:29 -08:00
Jason Bau
1b2aa4543c add FAQ link to course_about error msg 
use double-quotes, not single
 2014-01-14 14:09:03 -08:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org 
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
 2014-01-14 14:36:01 -05:00
Greg Price
3c3ef50e13 Merge pull request #2168 from edx/gprice/forum-coffee-i18n 
Internationalize forums CoffeeScript code
 2014-01-14 10:55:08 -08:00
Greg Price
a1dc49cc9b Remove defunct forum post tagging code 2014-01-14 13:03:56 -05:00
Brian Talbot
3faf7456b9 Merge pull request #2159 from edx/talbs/lms-fix-certificate-button 
LMS: FIX - Add Styling Back to Certificate Download Button
 2014-01-14 09:59:16 -08:00
Sarina Canelake
129c24477f Merge pull request #2062 from jazkarta/feature-idde2 
Individual Due Date Extension feature
 2014-01-14 08:00:14 -08:00
Chris Rossi
831f907c79 Add individual due dates feature. 
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
 2014-01-14 10:19:02 -05:00
Brian Talbot
e475f835cf Merge pull request #2164 from edx/talbs/update-copyright 
Copyright Notice Updates
 2014-01-14 07:17:04 -08:00
Sarina Canelake
9ce10493ad Remove references to old university images 2014-01-14 09:27:03 -05:00
Brian Talbot
367d2dc2ae Studio/LMS: Updates copyright notices to 2014 2014-01-13 19:59:24 -05:00
Ned Batchelder
c4792e667e Merge pull request #2139 from edx/ned/add-apostrophe-to-lorem 
Add apostrophe to lorem and fix single-quoted strings
 2014-01-13 13:48:23 -08:00
Brian Talbot
fd94be6a01 LMS: resolves missing certificate download button styling 
* adds in Sass placeholder to mirror older/inherited button styling used in LMS
* uses light theming Sass variables for button styling
* adds specific selector for certificate download button
 2014-01-13 16:26:36 -05:00
Ned Batchelder
fd13908b90 Fix single-quoted translated strings to be double-quoted. 2014-01-10 14:40:34 -05:00
Usman Khalid
864267a286 Removed stripped-main.html since it is not being used anymore. 
LMS-1584
 2014-01-10 17:29:52 +05:00
Usman Khalid
a336ae7df6 edge.html inherits from main.html 
LMS-1584
 2014-01-10 17:29:24 +05:00
Sarina Canelake
9363dba535 Merge pull request #2121 from edx/sarina/neuter-static-files 
Edit template for unused edx.org pages
 2014-01-09 15:46:20 -08:00
David Baumgold
96558c85f9 Merge pull request #2113 from edx/db/enable-theme-in-startup 
Do theme post-processing in startup hook
 2014-01-09 12:19:17 -08:00
Sarina Canelake
b7eb3406e1 Edit template for unused edx.org pages 2014-01-09 13:32:28 -05:00
Sarina Canelake
c285bd11d5 Merge pull request #2108 from edx/jtauber/neuter-static-files 
remove edx.org-specific content no longer used
 2014-01-09 10:06:44 -08:00
David Ormsbee
ff192935d8 Removing JS gettext() in favor of server-side substitution. 
[LMS-1680]
 2014-01-09 10:24:09 -05:00
David Baumgold
08c9fd94d9 Do theme post-processing in startup hook 2014-01-08 13:27:30 -05:00
James Tauber
5ef94f1496 removed edx.org-specific content no longer used 2014-01-08 17:51:28 +08:00
Greg Price
afaa463f7f Merge pull request #2093 from edx/gprice/forum-vote-button-a11y 
Improve accessibility of forum vote buttons
 2014-01-07 10:54:17 -08:00
frances botsford
1adc4fe253 Merge pull request #2092 from tusbar/course-bottom-university-span 
Use <span> for course preview’s university #os
 2014-01-07 08:24:33 -08:00
Ned Batchelder
209f8cc3db Lorem is now fancy, and HTML tags are recognized with single-quote attributes. 2014-01-07 09:43:46 -05:00