Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
Ben McMorran
f31475a2fd Add bokchoy tests for outline page 2014-08-07 12:27:11 -04:00
cahrens
49e4ffbeb0 Work around for JQuery sortable bug (placeholder smaller than component). 
STUD-1967
 2014-08-07 12:27:11 -04:00
Daniel Friedman
31993cf4b3 Escape xblock model field in string editor 
Also add standalone spec

STUD-1984
 2014-08-07 12:27:10 -04:00
cahrens
285beb388f Clean up from rebase with master. 2014-08-07 12:26:50 -04:00
cahrens
d447c07540 Support staff locking on the unit page 
STUD-1873
 2014-08-07 12:16:22 -04:00
Frances Botsford
cf70eb6e2a in-context editor for xblock string field 2014-08-07 12:16:21 -04:00
Andy Armstrong
d2b61f146f Support faster deletes of sections 2014-08-07 12:16:21 -04:00
Ben McMorran
d223e5ba7f Fixes view and preview buttons on unit page 2014-08-07 12:16:21 -04:00
Frances Botsford
bfb6db76fb fixed discussion preview back to the way it was 2014-08-07 12:16:21 -04:00
Andy Armstrong
538ce6d478 Fix merge problem 2014-08-07 12:16:20 -04:00
Ben McMorran
436d773987 Displays release date of unit in sidebar 2014-08-07 12:16:20 -04:00
Frances Botsford
9fe41e768b improved buttons styles in studio - updated unit sass to include new styles 2014-08-07 12:16:20 -04:00
Frances Botsford
0230ee40f1 unit publishing widget cleanup 2014-08-07 12:16:20 -04:00
Andy Armstrong
f061bbc08b Backbone version of the course outline page 
STUD-1726
 2014-08-07 12:16:20 -04:00
Andy Armstrong
49e0c642e2 Fix test that broke on rebase 2014-08-07 12:16:19 -04:00
cahrens
0f6de7f922 Discard changes rewrite. 
STUD-1860
 2014-08-07 12:16:19 -04:00
Ben McMorran
f8f0ef1ffa Removes unnecessary PUT after DELETE 2014-08-07 12:16:19 -04:00
Ben McMorran
572b4fc030 Displays the date, time, and username of the most recent save and publish 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
 2014-08-07 12:16:19 -04:00
cahrens
7cb5c4d7b8 Updates based on merge with master. 2014-08-07 12:16:18 -04:00
Ben McMorran
d40ef5e089 Adds warning when editing a container visible to students 
styling for editing a live unit
 2014-08-07 12:16:18 -04:00
Daniel Friedman
24e5837389 Fix whitespace problems in xblock string field editor. 
Whitespace is now trimmed from input. If after trimming input is empty
(pure whitespace or the empty string), the field is not updated.
 2014-08-07 12:16:18 -04:00
cahrens
d6475f4558 New publishing controls on unit page (continued) 
STUD-1707
 2014-08-07 12:16:18 -04:00
Frances Botsford
bbcc0030ea cleanup of unit, container, and xblock sass; added modules and layout sass; publishing states and actions on new unit 2014-08-07 12:16:18 -04:00
Andy Armstrong
d65e887d1a New Publishing controls on Unit page. 
STUD-1707
 2014-08-07 12:16:17 -04:00
Andy Armstrong
b1eccdf2d4 Replace unit page with the container page. 
STUD-1754
 2014-08-07 12:16:17 -04:00
Xavier Antoviaque
e8259b8234 secure-cookies: Allow to use secure HTTPS cookies (Django setting) 
Cf https://docs.djangoproject.com/en/1.4/ref/settings/#std:setting-SESSION_COOKIE_SECURE
 2014-08-07 09:30:51 +02:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware. 
LMS-6622
 2014-08-06 19:58:20 +05:00
clytwynec
22582f4931 Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references 
removing rake and  outdated references to it
 2014-08-06 10:20:30 -04:00
zubair-arbi
9caff20036 Merge pull request #4250 from edx/zub/story/listallexportfaildcourses 
update export_all_courses management command to count and list all faile...
 2014-08-06 16:19:10 +05:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
Christine Lytwynec
eb3c1ab9a8 removing rake and outdated references to it 2014-08-05 09:54:29 -04:00
zubair-arbi
70e5044f47 update export_all_courses management command to count and list all failed export courses 2014-08-05 14:09:02 +05:00
David Adams
9e45e8f982 Refactor ADVANCED_COMPONENT_TYPES 
Modified to a setting in CMS common.py and aws.py
    Also factored out are: ADVANCED_PROBLEM_TYPES

    This enables third parties to add XBlocks to their system
    without having to make a code change.

    Code also added to ensure that a component should exist in both
    ADVANCED_COMPONENT_TYPES and the course advanced module list
    in order for it to be enabled in the course.
 2014-08-04 12:17:45 -07:00
cahrens
70e6ee1b70 Remove tooltip manager to get tests working in CMS again. 2014-08-02 07:15:18 -04:00
Sarina Canelake
bad803e451 Merge pull request #4653 from Stanford-Online/stv/i18n/empty 
Translate string iff non-empty
 2014-08-01 18:03:43 -04:00
Julia Hansbrough
7b1fce9e3f Merge pull request #4641 from edx/reruns/server-side-handlers 
Basic notifications handling.
 2014-08-01 17:30:54 -04:00
Diana Huang
69f900dd90 Basic notifications handling. 
LMS-11163
 2014-08-01 19:50:37 +00:00
stv
3fdfdbcd2b Translate string iff non-empty 
This resolves an issue where a checklist's long_description being empty
caused gettext to dump PO file headers.

I had originally made this change to the Stanford-Online/edx-platform
repository a few weeks ago [0] to address a failing test on our fork.
I didn't take the time to diagnose the root issue; I just fixed it for
the single case.

After stumbling across the issue elsewhere, @kluo <kevkluo@gmail.com>
followed through and tracked down the cause of the behavior. It turns
out that `gettext`, by default, translates the empty string into PO file
headers; this is apparently a feature, not a bug [1].

This behavior seems counterintuitive; for our use, it seems that
translating an empty string should simply return an empty string. We
already program defensively around this in platform code [2], but it'd be
convenient to resolve this with a centralized solution, instead of a
patchwork of fixes.

[0] 4b88f54aa658db952e899222ff5ede4a1c1beb18
[1] http://stackoverflow.com/questions/18459387/translation-of-empty-string-shows-po-header
[2] https://github.com/edx/edx-platform/blob/master/cms/djangoapps/contentstore/views/checklist.py#L140
 2014-08-01 11:03:47 -07:00
polesye
27013e74f4 BLD-1049: Remove Group Configurations. 2014-08-01 20:45:23 +03:00
Ben McMorran
640ea444f8 Merge pull request #4608 from edx/benmcmorran/fix-blank-xblock-names 
Show category when an xblock does not have a default display name
 2014-07-31 11:49:59 -04:00
Ben Patterson
9b22ceb9f8 Fix false positive test in cms acceptance 
This test was passing in Jenkins, but failing in our Solano runs (and locally on firefox).
This is because it was attaching a file that was not there. This change fixes the test
and makes the attachment method smarter so it will fail if it tries attaching a non-existent
file.
 2014-07-30 12:19:18 -04:00
Ben Patterson
2848f7ab58 Merge pull request #4597 from edx/benp/fix-bok-choy-solano 
Simplify bok choy environments to inherit pipeline settings from common.
 2014-07-30 12:16:45 -04:00
Ben McMorran
2cc72ca015 Show category when an xblock does not have a default display name 2014-07-30 10:30:18 -04:00
Nimisha Asthagiri
86986e63ff Fixup: Studio server-side - review comments. 2014-07-29 15:27:10 -04:00
Nimisha Asthagiri
88ad29d166 LMS-11016 Studio server-side for course_listing and course_rerun. 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
 2014-07-29 15:04:17 -04:00
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 2014-07-29 15:03:36 -04:00
Ben Patterson
90a2417d97 Simplify bok choy environments to inherit pipeline settings from common.py 2014-07-29 11:40:21 -04:00
jmclaus
69ee9d92d6 BLD-1104: List units that use group configuration. 2014-07-29 16:16:31 +02:00
Anton Stupak
54d60fc1b1 Merge pull request #4555 from edx/anton/remove-experiments-from-advanced-settings 
Remove user_partitions from advanced settings
 2014-07-29 09:03:45 +03:00
Mathew Peterson
df14d8e49d Merge pull request #4513 from edx/split/auto_publish 
Split/auto publish
 2014-07-28 17:31:49 -04:00