Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,140 Commits 1 Branch 0 Tags
3aba8d465629b9ff48b2f54221cbb0613dd0fbd7
Commit Graph

26140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hoeber
3aba8d4656 Revert "Update to use UTC time in course dates" 2014-10-07 13:34:23 -04:00
Stephen Sanchez
743326d26b Merge pull request #5497 from edx/sanchez/update-message-styles 
Adding new styles for dashboard notifications.
 2014-10-07 13:29:39 -04:00
Mark Hoeber
1c2913dc8f Merge pull request #5440 from edx/markhoeber-doc1060 
Update to use UTC time in course dates
 2014-10-07 11:49:14 -04:00
Mark Hoeber
8680d6ce44 Update to use UTC time in course dates 2014-10-07 11:48:24 -04:00
stephensanchez
afaaca969a Adding new styles for dashboard notifications. 
Change the reverification failure message styling.

Changing templates so new styles do not appear in courseware.

Removing unused aria tag.

PR comments on cleaning up SASS

Fix signup LMS test.

Copy changes per review on PR

Updating based on PR comments

Style and HTML changes for notifications
 2014-10-07 15:44:47 +00:00
Jesse Zoldak
f34b57ad45 Merge pull request #5485 from edx/zoldak/disable-flaky-js-tests 
Disable flaky JS FileUploader SystemFeedback and NotificationView tests
 2014-10-07 10:29:23 -04:00
Alison Hodges
3ec1309ccc Merge pull request #5493 from edx/ahodges/doc/nochanges 
Consequences of changing configuration
 2014-10-07 10:11:20 -04:00
Alison Hodges
7b3510c52d Consequences of changing configuration 2014-10-07 10:11:02 -04:00
Alison Hodges
f4873e8f6c Merge pull request #5492 from edx/ahodges/doc/cohort_discuss 
Info for moderators
 2014-10-07 09:54:10 -04:00
Alison Hodges
faeb7378c0 Info for moderators 2014-10-07 09:53:49 -04:00
jmclaus
31d26e7b88 Merge pull request #5480 from edx/jmclaus/change-default-post-to-discussion 
Changed default post type to discussion.
 2014-10-07 15:32:01 +02:00
jmclaus
2196461d0d Changed default post type to discussion. 2014-10-07 14:16:22 +02:00
Will Daly
8d60a8b4ec Merge pull request #5482 from edx/will/cybersource-donations 
CyberSource donations (back-end)
 2014-10-07 07:57:58 -04:00
David Baumgold
324a1da60c Merge pull request #5474 from edx/openedx-jira-reference 
Reformat seq_module.py
 2014-10-06 13:01:12 -04:00
David Baumgold
6f47e5d4e9 Reformat seq_module.py 2014-10-06 12:55:35 -04:00
Carlos Andrés Rocha
b9cfd7b6e0 Merge pull request #5486 from rocha/list-all-visible-courses 
Use all courses during OAut2/OpenID Connect
 2014-10-06 11:16:15 -04:00
Alison Hodges
5c82d6eabc Merge pull request #5327 from edx/ahodges/doc/cohorts 
Ahodges/doc/cohorts
 2014-10-03 17:39:28 -04:00
Alison Hodges
e0f3004f8d Overview and configuration for cohorts feature 2014-10-03 17:39:05 -04:00
Will Daly
26bcfe5869 Create Donation order item 
Add tax-deductible messaging to the confirmation email and receipt pages.
Update receipt page to make the course URL optional
 2014-10-03 14:35:21 -04:00
brianhw
0e46eebf73 Merge pull request #5478 from edx/brian/fix-user-track 
Add _get_request_value to safely access request.REQUEST for browser events.
 2014-10-03 14:28:12 -04:00
David Baumgold
376c111169 Merge pull request #5111 from edx/shib-tests-ddt 
Use ddt for shib tests
 2014-10-03 14:18:46 -04:00
Carlos Andrés Rocha
9cd26e551a List all courses during OAut2/OpenID Connect 
Previously, only courses respective to the branded instance were returned.

AN-3610
 2014-10-03 14:15:41 -04:00
jmclaus
588979d5e5 Merge pull request #5308 from edx/jmclaus/forum-thread-type 
Change the thread type of a previously posted post. [TNL-172]
 2014-10-03 19:53:37 +02:00
Don Mitchell
e270196f51 Merge pull request #5419 from edx/split/acceptance_split 
Get acceptance tests to run on split
 2014-10-03 13:24:16 -04:00
jmclaus
c2716d470c TNL-172: Change type of a previously posted post. IMPORTANT: this commit depends on commit 774887b in cs_comments_service. 2014-10-03 18:29:25 +02:00
Brian Wilson
0eb190fc61 Add _get_request_value to safely access request.REQUEST for browser events. 2014-10-03 11:45:08 -04:00
Mark Hoeber
76a52acfea Merge pull request #5230 from edx/markhoeber-doc913 
WIP: edXML Doc Draft
 2014-10-03 11:19:44 -04:00
Mark Hoeber
f39a41ba40 Alpha OLX guide 2014-10-03 11:18:41 -04:00
Don Mitchell
4f795f8270 Fix hardcoded course urls 2014-10-03 10:56:00 -04:00
John Eskew
2a8529d37a Change email address detection in TinyMCE link plugin. 
- If link has a "@" and a ":", do not consider it an email address.
Add un-minified version of plugin.js file for link plugin.
Update build instructions to include media plugin.
Commit re-built minified JS.
Add all plugins to Jakefile.js in zip file.
Reason for this commit:
Split acceptance test was failing when TinyMCE detected a Split asset
key as an email address. Fix was to modify email address detection.
 2014-10-03 10:56:00 -04:00
Calen Pennington
139e10d9b8 Teach mongo_connection to retry read operations in the face of AutoReconnect errors 2014-10-03 10:55:59 -04:00
John Eskew
d4927de0f7 Remove unneeded import 2014-10-03 10:55:59 -04:00
Don Mitchell
8e67549484 Fix cms hardcoded keys 2014-10-03 10:55:59 -04:00
John Eskew
fd6c9bed28 Fix course export/updates and upload CMS acceptance tests. 2014-10-03 10:55:59 -04:00
Don Mitchell
edffa73512 Convert acceptance to opaque keys 2014-10-03 10:55:58 -04:00
Jesse Zoldak
9a8753d41e Disable flaky JS FileUploader SystemFeedback and NotificationView tests 
TNL-559
 2014-10-03 10:50:20 -04:00
Don Mitchell
785a3c823d Merge pull request #5469 from edx/split/content_update 
Fix cached definition change detection
 2014-10-03 09:16:01 -04:00
Waheed Ahmed
84e12bdfdf Merge pull request #5479 from edx/waheed/tnl157-fix-incorrect-relative-time 
Fixed incorrect relative time value.
 2014-10-03 16:32:00 +05:00
Waheed Ahmed
3bfe09b821 Fixed incorrect relative time value in time.js. 
TNL-157
 2014-10-03 15:37:46 +05:00
Oleg Marshev
536a815a28 Merge pull request #5433 from edx/oleg/fix-utc-time-studio-details 
Show date and time on Schedules and Details in UTC (TNL-85).
 2014-10-03 12:32:52 +03:00
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
Waqas Khalid
89e89d2a3b Merge pull request #5467 from mlkwaqas/waqas/forum-typo-thread-show 
Additional dollar sign in template
 2014-10-03 13:03:52 +05:00
Nimisha Asthagiri
f8c75b01c6 Merge pull request #5477 from edx/nimisha/update_release_script 
Remove no longer used stage-edge.edx.org.
 2014-10-02 21:30:11 -04:00
Nimisha Asthagiri
ccb503c6a1 Remove no longer used stage-edge.edx.org. 2014-10-02 17:20:44 -04:00
Christina Roberts
5d7b5228f7 Merge pull request #5464 from edx/christina/js-coverage 
Don't put all of xmodule_js as src (changes coverage metrics).
 2014-10-02 17:14:18 -04:00
Piotr Mitros
54731383be Merge pull request #4003 from edx/pmitros/fix-sequential-none 
Fix case where DB gets populated with string None
 2014-10-02 15:09:26 -04:00
cahrens
2286366c90 Remove unused files, add missing spec file. 2014-10-02 15:05:17 -04:00
Waqas Khalid
46abd26e20 Remove extraneous dollar sign in template 2014-10-02 23:28:17 +05:00
Don Mitchell
d723425a83 Fix cached definition change detection 
LMS-11485
 2014-10-02 14:22:07 -04:00
David Baumgold
9c81004fc7 Remove test cleanups 
Since `ddt` should make them unnecessary
 2014-10-02 12:18:16 -04:00