Don Mitchell
e993a00d21
Test import-export-import assets
2013-09-23 14:34:36 -04:00
cahrens
9b076464f4
Moving unregistration of change listener into asset_index.html.
...
Fixes broken integration test on master.
2013-09-23 10:25:06 -04:00
Don Mitchell
464e0c77f4
Merge pull request #1045 from edx/assets/persist_lock
...
save lock state in contentstore
2013-09-20 10:51:31 -07:00
Nick Parlante
43c73b2df9
Merge pull request #1049 from edx/nick/html-help
...
Mention in studio UI that %%USER_ID%% works
2013-09-20 09:48:21 -07:00
Don Mitchell
e69955b437
Pylint/pep8 fixes
2013-09-20 11:28:00 -04:00
cahrens
948615d66f
Log warning if thumbnail cannot be deleted.
2013-09-20 10:44:55 -04:00
cahrens
fe6ed08518
Code review feedback.
2013-09-20 10:44:55 -04:00
cahrens
d11c92d799
Set the URL on the collection instead of the model.
2013-09-20 10:44:55 -04:00
cahrens
9ceee3627f
Simplify how we determine if asset is already showing.
2013-09-20 10:44:54 -04:00
cahrens
01d7d48f8f
Create backbone models/views for assets.
...
cleanup
Updates.
Testing changes.
Testing changes.
asset-index progress state cleanjup.
cleanup
2013-09-20 10:44:54 -04:00
Nick Parlante
357156b58a
Mention in studio UI that %%USER_ID%% works
2013-09-19 14:28:10 -07:00
Jay Zoldak
da538b8770
Merge pull request #1044 from edx/zoldak/acceptance-grid
...
Add ability to run against generic selenium grid
2013-09-18 12:07:21 -07:00
Calen Pennington
1d2e0b6615
Merge pull request #930 from cpennington/rename-xblock-field-data
...
Rename xblock_field_data to xmodule_field_data
2013-09-18 11:33:25 -07:00
Brian Talbot
8815962356
Studio: Converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax
2013-09-18 14:14:11 -04:00
Jay Zoldak
35abac4770
Merge pull request #1036 from edx/zoldak/refactor-static-page-tests
...
Simplify static page acceptance tests
2013-09-18 11:14:01 -07:00
Jay Zoldak
4c411e2121
Add ability to run against generic selenium grid
2013-09-18 13:49:34 -04:00
Calen Pennington
9643fd463f
Rename xblock_field_data to xmodule_field_data
2013-09-18 10:49:41 -04:00
jkarni
0e2d833a2e
Merge pull request #830 from edx/jkarni/fix/unicode-import
...
Fix import errors with unicode filenames
2013-09-18 07:23:43 -07:00
Jay Zoldak
2a0e2fd39d
Simplify static page acceptance tests
2013-09-18 10:00:56 -04:00
Calen Pennington
d35a03a0d6
Merge pull request #908 from cpennington/reference-runtime
...
Replace references to .system
2013-09-18 05:43:20 -07:00
cahrens
e65e9b53a3
Minor cleanup.
2013-09-17 14:40:15 -04:00
Jay Zoldak
fe71ace529
Improve retry logic for Stale Element Exceptions
...
Better exception retry logic
Change methods to lambdas
2013-09-17 12:49:46 -04:00
Jay Zoldak
30b13d3cf1
Improve code clarity and error messages for css selection
2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c
Simplify retry logic for ui helper functions
2013-09-16 16:49:17 -04:00
Diana Huang
47ce9082e4
Merge branch 'release'
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/mongo/draft.py
lms/djangoapps/courseware/tests/modulestore_config.py
2013-09-13 17:15:44 -04:00
Calen Pennington
3f8a2f03ee
Use a setter to make editing location possible
2013-09-13 15:05:17 -04:00
Gabe Mulley
761a4dcc97
Make URL patterns to exclude from tracking configurable
...
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
2013-09-13 11:24:51 -04:00
chrisndodge
b6761498a3
Merge pull request #954 from edx/fix/cdodge/remove-forum-permissions-on-delete
...
define a unseeding forums permissions and call into it from delete_cours...
2013-09-13 07:23:14 -07:00
Chris Dodge
955e54c2e6
refactor some code out of the django-admin entry point into a help function in CMS. Update tests to use new method
2013-09-13 09:07:01 -04:00
Sarina Canelake
484bc91ab3
Don't assign variable to .update() call
2013-09-12 16:03:22 -04:00
Chris Dodge
2ac6d78a90
update comment
2013-09-12 16:01:51 -04:00
Chris Dodge
bf67c83340
update comment and verify seeding was done
2013-09-12 15:58:56 -04:00
Julian Arni
1813b22ab0
Fix import errors with unicode filenames
2013-09-12 15:47:59 -04:00
Chris Dodge
615341fb65
add one more test to verify that deleting one courses forum permissions does not accidentially delete another course's forum seeding
2013-09-12 15:03:00 -04:00
cahrens
2c9fc59d79
Unused import.
2013-09-12 14:30:00 -04:00
cahrens
ce4fb08bdf
Style cleanup.
2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4
Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.
2013-09-12 14:30:00 -04:00
Chris Dodge
bd69db4410
switch to using get() rather than get_or_create(). Also add a test case with a different casing on the courseId
2013-09-12 14:27:57 -04:00
Chris Dodge
41be20a000
define a unseeding forums permissions and call into it from delete_course
...
define a unseeding forums permissions and call into it from delete_course
define a unseeding forums permissions and call into it from delete_course
2013-09-12 14:27:57 -04:00
Christina Roberts
784115ac79
Merge pull request #901 from edx/christina/dont_import_checklists
...
Do not store expanded action URLs.
2013-09-12 07:54:25 -07:00
Julian Arni
ca2049abd3
Fixes extra 'file' that was leftover locally after import
2013-09-12 10:29:41 -04:00
Carlos Andrés Rocha
87fcf1ab9e
Merge pull request #905 from rocha/datadog-statsd
...
Remove dogstatsd-python in favor of dogapi
2013-09-12 06:53:02 -07:00
cahrens
ea26b19d0b
pylint/pep8 cleanup.
2013-09-12 09:47:30 -04:00
cahrens
1184a97b0b
Do not store expanded action URLs.
...
They are not portable. STUD-681.
Minor updates.
2013-09-12 09:47:30 -04:00
Calen Pennington
58a5cdd81f
Replace references to .system
2013-09-12 09:29:17 -04:00
Carlos Andrés Rocha
ee0004e2f8
Remove dogstatsd-python in favor of dogapi
...
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
2013-09-11 19:28:58 -04:00
cahrens
ff2d952d39
Change course id limit to 65.
...
STUD-726
2013-09-11 16:15:16 -04:00
jkarni
df72f02898
Merge pull request #931 from edx/jkarni/fix/itemsavelogging
...
Add logging to save item
2013-09-11 09:33:19 -07:00
Carlos Andrés Rocha
fbc243dbeb
Add event tracking with configurable backends
2013-09-11 10:02:15 -04:00
Julian Arni
c08a1b3e62
Fix element name conflict
2013-09-10 13:48:12 -04:00