Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

5700 Commits

Author SHA1 Message Date
Mat Peterson
6096bae755 Skipping rerun test on feature flag conditional 2014-08-21 12:09:13 -04:00
Mat Peterson
0088978281 Set GlobalStaff permissions on reruns 2014-08-21 12:09:13 -04:00
Mat Peterson
e8763ef715 Do TODOs in test_contentstore.py 2014-08-21 12:09:13 -04:00
Brian Talbot
d695de24dc Studio: addressing course re-run PR feedback 2014-08-21 12:09:13 -04:00
Mat Peterson
8e3b532768 Fixed bug in dismissing rerun failure notification 2014-08-21 12:09:12 -04:00
Brian Talbot
64cc16f1ec Studio: correcting reversion of _base.scss from poor previous rebase 2014-08-21 12:09:12 -04:00
Mat Peterson
497bb39f88 Fixed bug in dismissing errored rerun notification and another with empty reruns fields 2014-08-21 12:09:12 -04:00
Mat Peterson
18a6a0487b added JS to outline page after bulk publishing rewrite 2014-08-21 12:09:12 -04:00
Mathew Peterson
9f8f64cffe Course Reruns UI 
Studio: adding course re-run-centric static template rendering

* initial HTML for dashboard states
* initial HTML for new course re-run view/form
* initial HTML placeholder for outline alert UI

Conflicts:
	cms/templates/index.html

Studio: adding styling for course re-run-centric views

* adding new view/page mast-wizard type
* refactoring create course/element form styling
* adding course re-run view specific styling
* adding courses processing styling (w/ alerts and status)

Course rerun server-side updates: support display_name and DuplicateCourseError.

Studio: further design revisions and tweaks from feedback

* removing new window attribute from re-run control
* removing links from processing courses
* revising look/feel of dismiss action on dashboard + alert
* correcting font-weight of dashboard processing title
* adding extra space to course rerun action on dashboard
* re-wording secondary cancel action on rerun view

Conflicts:
	cms/templates/index.html

Added interation on unsucceeded courses in dashboard

Studio: removing 'rel=external' property from course re-run actions

Studio: removing hover styles for processing courses

Fixed value bug in split and set course listing to display run

moved task.py for rerun
 2014-08-21 12:09:12 -04:00
Tim Babych
a986b46cb1 Merge pull request #4750 from edx/anton/publish-unit-from-course-outline 
Publish sections/subsections/units from course outline.
 2014-08-21 18:19:14 +03:00
polesye
732bcbdeb6 STUD-1911, STUD-1932: Publish sections, subsections and units from course outline. 2014-08-21 17:34:06 +03:00
Brian Talbot
66abd71fbe Studio: correcting font weight/display issues 
* reducing font-weight on component adding menu
* adding in and applying demi-strong font-weight
* adding in $color-copy-emphasized variable
* correcting stateful xblock settings styling nesting
* syncing video player xblock-based controls font-weight

STUD-2109
 2014-08-21 09:48:45 -04:00
Christina Roberts
420ae2da1e Merge pull request #4857 from edx/christina/stud-2093 
Add bok choy tests for bad HTML module content.
 2014-08-21 09:48:24 -04:00
muhammad-ammar
06842be865 Merge pull request #4859 from edx/ammar/bok-choy-video-transcript-tests 
Bok-Choy Video Transcript Tests Batch1
 2014-08-21 12:01:04 +05:00
cahrens
7ce547f0a5 Fix for "ui-sortable" existing in HTML within HTML module. 2014-08-20 15:54:43 -04:00
Brian Talbot
f47aa04151 Studio: breaking longer user/id-based strings on unit and container views 
STUD-2113
 2014-08-20 14:53:39 -04:00
Brian Talbot
73d90798ef Merge pull request #4894 from edx/talbs/studio-outline-fixups 
Studio: FIX - Outline Edit Actions Alignment
 2014-08-20 11:04:35 -04:00
Daniel Friedman
0829acb8dd Merge pull request #4872 from edx/dan-f/course-outline-start-date 
View course start date from course outline
 2014-08-20 10:44:36 -04:00
Muhammad Ammar
cfeb7102a6 Bok-Choy Video Transcript Tests 2014-08-20 12:11:21 +00:00
muhammad-ammar
ca3bd2f83f Merge pull request #4496 from edx/ammar/bok-choy-cms-video-editor-tests 
Bok-Choy CMS Video Editor Tests
 2014-08-20 13:19:10 +05:00
Brian Talbot
4056e6aab5 Studio: revising alignment of in-context edit buttons in outline view 2014-08-19 16:53:18 -04:00
Brian Talbot
71e5195170 Studio: adding rendering/styling of course start date on outline view 2014-08-19 13:18:11 -04:00
Mark Hoeber
e8ff315206 Updated outline template help text 2014-08-19 12:45:53 -04:00
Daniel Friedman
0d63d0c1c1 Provide course outline template with start date 2014-08-19 12:42:43 -04:00
David Baumgold
b9eaf32985 Merge pull request #4875 from edx/db/edx-wiki-to-openedx 
Update comments to point to openedx.atlassian.net
 2014-08-19 10:23:27 -04:00
Don Mitchell
3c3a316f08 Make it branch agnostic 
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
 2014-08-18 16:19:46 -04:00
David Baumgold
2e02cefc90 Update comments to point to openedx.atlassian.net 
And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
 2014-08-18 15:34:06 -04:00
louyihua
14cd7d7763 Translation & secure-aware changes to studio's settings page 
1. Change the link of course's about page secure aware, which displays 'https' or 'http' prefix according to the current protocol.
2. Make the email in this page translatable.
 2014-08-19 01:13:23 +08:00
Muhammad Ammar
f93e4f2775 Bok-Choy CMS Video Editor Tests 2014-08-18 15:44:30 +00:00
Ben McMorran
12a5781725 Add ability to set staff lock from course outline 2014-08-16 15:58:42 -04:00
Don Mitchell
23d78fe7fc Merge pull request #4803 from edx/dhm/import_split_test 
Dhm/import split test
 2014-08-15 17:23:33 -04:00
Alexander Kryklia
ccf85a9431 Merge pull request #4777 from edx/anton/sync-groups-and-verticals 
Anton/sync groups and verticals
 2014-08-15 20:15:12 +03:00
clytwynec
310778dfa7 Merge pull request #4838 from edx/clytwynec/remove_warnings_from_lettuce_test_logs 
set root logging level for acceptance tests to ERROR
 2014-08-15 13:08:56 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
Christine Lytwynec
bdc4fd4d86 set root logging level for acceptance tests to ERROR 2014-08-14 14:18:51 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Sarina Canelake
c285bda69f Merge pull request #4625 from fmyzjs/ipv6 
Support ipv6 in geoinfo and Embargo
 2014-08-14 09:26:57 -04:00
Sarina Canelake
244554f71f Merge pull request #4823 from lduarte1991/lduarte-harvardx-pr19 
Annotation Tools: Adding Annotator to CMS
 2014-08-14 09:13:14 -04:00
Tim Babych
c12ed3ae9a Merge pull request #4808 from edx/tim/open-STUD-1264 
Documentation: create_sinon.js - update referenced JIRA issue.
 2014-08-14 12:18:13 +03:00
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00
lduarte1991
8cfdb8f14c Annotation Tools: Adding comments and adding CSS groups 2014-08-13 21:35:37 -04:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Christina Roberts
c389a445ae Merge pull request #4814 from edx/christina/bug-2090 
Verify loading indicator has been hidden.
 2014-08-13 15:41:42 -04:00
cahrens
a35cbf1c63 Verify loading indicator has been hidden. 
STUD-2090
 2014-08-13 13:51:36 -04:00
cahrens
1272f049f6 jquery.immediateDescendents cannot be loaded until jQuery is loaded. 
STUD-1999
 2014-08-13 12:31:44 -04:00
Don Mitchell
aa1b9fece9 Properly (de)serialize references in old mongo 
LMS-11204
 2014-08-13 11:26:12 -04:00
Tim Babych
7234d39bcc Documentation: create_sinon.js - update referenced JIRA issue. 2014-08-13 17:57:51 +03:00