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

9289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chugh
def2d8adf2 fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable 2013-01-24 14:20:18 -05:00
Kevin Chugh
1bd9366e40 Merge remote-tracking branch 'origin/master' into feature/kevin/groups 2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2 lms producing grouped content 2013-01-23 16:25:26 -05:00
chrisndodge
fe8e25e72d Merge pull request #1341 from MITx/feature/christina/tiny-mce 
Toggling of code should mark editor as dirty.
 2013-01-23 13:25:01 -08:00
cahrens
2969a9e48d Toggling of code should mark editor as dirty. 2013-01-23 16:19:17 -05:00
chrisndodge
548f3de508 Merge pull request #1340 from MITx/fix/zoldak/fix_jenkins 
Do not run the lms jasmine tests on jenkins for now, until we fix them.
 2013-01-23 13:05:50 -08:00
Jay Zoldak
29c4e6c066 Do not run the lms jasmine tests on jenkins for now, until we fix them. 2013-01-23 16:03:25 -05:00
Christina Roberts
2ed5fdf76b Merge pull request #1338 from MITx/fix/cdodge/remove-hide-progress-tab 
Fix/cdodge/remove hide progress tab
 2013-01-23 12:20:54 -08:00
chrisndodge
247199d699 Merge pull request #1337 from MITx/feature/cale/fix-staff-debug-link 
Feature/cale/fix staff debug link
 2013-01-23 12:17:17 -08:00
Chris Dodge
9c3e727889 add unit test to assert that the flag is not set on course metadata 2013-01-23 15:14:36 -05:00
Chris Dodge
9d5ac308b1 remove flag to hide progress tab 2013-01-23 15:11:41 -05:00
Christina Roberts
cd78b27b50 Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu 
studio - resolved bug with .header CSS inheritance and problem editor
 2013-01-23 11:40:24 -08:00
Calen Pennington
ae2a8e0c58 Whitespace cleanup 2013-01-23 14:37:42 -05:00
Calen Pennington
6c181470c6 staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it 2013-01-23 14:37:36 -05:00
Brian Talbot
25df02fedd studio - syncing cheatsheet language with new class name for heading 1 again 2013-01-23 13:04:16 -05:00
Brian Talbot
0e061ca726 studio - syncing cheatsheet language with new class name for heading 1 2013-01-23 13:02:33 -05:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
Don Mitchell
6a4c6ad4d8 Merge pull request #1333 from MITx/feature/christina/misc 
Import requireJS.
 2013-01-23 09:35:50 -08:00
cahrens
a1eeb56839 Import requireJS. 2013-01-23 12:30:06 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-23 09:14:42 -08:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Don Mitchell
c7d9eb23f1 Merge pull request #1328 from MITx/fix/cdodge/subsection-crash-no-display-name 
use property rather than referencing the metadata dictionary. This is be...
 2013-01-23 07:40:52 -08:00
Don Mitchell
966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items 
add optional course_id parameter to DraftMongoStore.get_items()
 2013-01-23 07:39:36 -08:00
David Ormsbee
eab9511466 Merge pull request #1295 from MITx/feature/jarv/certificate-force-update 
Feature/jarv/certificate force update
 2013-01-23 06:32:41 -08:00
Chris Dodge
0042131588 use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name 2013-01-23 09:12:24 -05:00
Victor Shnayder
07785e3c07 Merge pull request #1327 from MITx/bugfix/brian/openid_provider_post 
Fix handling of openid provider requests that use POST
 2013-01-23 05:53:54 -08:00
Brian Wilson
9d28c37724 add more test coverage for openid provider. 2013-01-23 04:23:30 -05:00
Brian Wilson
ba62a657bf Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post 2013-01-22 23:50:38 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
David Ormsbee
ae6dd4965b Merge pull request #796 from MITx/feature/cale/cms-master 
CMS Master
 2013-01-22 14:47:01 -08:00
Don Mitchell
1f261e6556 Removed unused and stylistically incorrect class defs 2013-01-22 17:34:45 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478 studio html editor - matched up styles for <pre> elements 2013-01-22 16:16:30 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 
Conflicts:
	cms/static/css/tiny-mce.css
 2013-01-22 16:15:27 -05:00
Brian Talbot
b381881a02 studio html editor - adding in font references to tinyMCE css 2013-01-22 16:05:06 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
cahrens
13945994f0 change class on right element! 2013-01-22 15:47:09 -05:00
cahrens
b554eb5afe Cleanup of format dropdown, toolbar buttons. 2013-01-22 15:28:47 -05:00
Brian Talbot
e3a2749ff8 studio html editor - added in styles for TinyMCE table elements 2013-01-22 15:20:25 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Calen Pennington
82eee4af84 Merge pull request #1325 from MITx/feature/cale/anon-user-bugfix 
Anonymous users don't have an email attribute, and shouldn't be checked ...
 2013-01-22 11:11:07 -08:00
Calen Pennington
bbcab7314a Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed 2013-01-22 14:10:01 -05:00
Chris Dodge
9520290018 add optional course_id parameter to DraftMongoStore.get_items() 2013-01-22 11:55:36 -05:00
Don Mitchell
edda80d485 New style base python classes and basestring type. 2013-01-22 11:30:24 -05:00
Brian Wilson
9653631e9a Add initial openid_provider tests (covers xrds and authentication requests) 2013-01-22 11:15:30 -05:00
ichuang
5d6c5de8e9 Merge pull request #1324 from MITx/pbaratta/symmath 
Added some symmath comments
 2013-01-22 05:01:48 -08:00
Peter Baratta
45f2a690d0 Commented on high level functions 2013-01-22 01:40:13 -07:00
Victor Shnayder
26f7b984a7 Merge pull request #1323 from MITx/content/rocha/lewin-announcement 
Content/rocha/lewin announcement
 2013-01-21 14:19:54 -08:00
Carlos Andrés Rocha
183721ecf5 Correct last screenshot caption of media-kit page. 
[#159]
 2013-01-21 16:58:35 -05:00