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

768 Commits

Author SHA1 Message Date
JonahStanley
eec095a195 Changed naming of attempts to max_attempts and changed css_selector 2013-06-20 15:38:56 -04:00
JonahStanley
e1d4c69365 Merge branch 'master' into jonahstanley/fix-flakey-tests 
Conflicts:
	common/djangoapps/terrain/ui_helpers.py
 2013-06-20 11:17:15 -04:00
JonahStanley
a8789dced9 Fixed flakey check box by making a css_check function that behaves like css_click 
As a result, changed inputfield to return the css, and all of the element.fill() to css_fill
 2013-06-20 11:14:17 -04:00
cahrens
9e69586bb3 pep8 fixes. 2013-06-20 10:31:44 -04:00
Christina Roberts
6fe56ac9f7 Merge pull request #205 from edx/christina/advanced-settings-test 
Sometimes the first click doesn't actually work, so call click up to 5 t...
 2013-06-20 05:48:13 -07:00
cahrens
6643994348 Add an optional success lambda to css_click. 2013-06-19 13:51:40 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
95c1c4b8a8 Refactor tracking and xqueue initialization to no longer require a request. Get tracking logs to work. Add transaction annotations. 
Make sure to read only once from result objects when getting result status,
so that values are consistent.
 2013-06-18 11:04:05 -04:00
cahrens
298417c732 Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah). 2013-06-17 13:55:15 -04:00
cahrens
2cf71b7ff3 Add helper method for typing in CodeMirror, make it robust to Mac and Unix. 2013-06-14 15:12:25 -04:00
Don Mitchell
6af4402abd Squash 3 more naive datetime warnings. I think the only ones left are in 
migrations.
 2013-06-13 10:56:48 -04:00
Calen Pennington
5b8163dc9c Merge pull request #92 from edx/fix/cale/url-tests 
Fix tests that vary urls.py
 2013-06-12 10:47:13 -07:00
Don Mitchell
64b909c5f0 Merge pull request #12 from edx/feature/dhm/timeconv 
Feature/dhm/timeconv
 2013-06-11 11:11:05 -07:00
Greg Price
2e38130cb7 Add feedback submission test case for invalid email address 2013-06-10 18:01:44 -04:00
Greg Price
42b7a0717b Tag all Zendesk issues with "LMS" per request from Mary 2013-06-10 18:01:44 -04:00
Greg Price
7be6880fd2 Add course id tagging to feedback submissions 2013-06-10 18:01:44 -04:00
Greg Price
73d3b14500 Add more information to Zendesk tickets and make the information more readable 2013-06-10 18:01:44 -04:00
Greg Price
17647abd5c Add datadog reporting to the feedback submission mechanism 2013-06-10 18:01:43 -04:00
Don Mitchell
e4757452f0 Partial implementation of means to get xmodule from descriptor and 
attempt to test xmodule_modified (see fixme)
Removed obsolete else clause from before conversion
Ensure factories use datetime not struct_time for start date
Added more unit tests for settings encoder
 2013-06-10 17:16:35 -04:00
Don Mitchell
168cb306d3 Move tz_aware into connection config rather than settings. 
Make django use_tz
 2013-06-10 17:16:35 -04:00
Don Mitchell
855433341d Minor code review fixes (removing commented code). 2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
dcadams
0b4e03e8bc Merge pull request #66 from edx/feature-dcadams-usermanagement 
Feature user-management autoenroll
 2013-06-10 10:10:57 -07:00
Calen Pennington
6c24694a7c Fix tests that vary urls.py 
Create a mixin class that can be used for tests that customize urls.py
to force django to reload it, so that they don't break other tests.
 2013-06-10 10:56:50 -04:00
Jonah Stanley
a3a7d1d548 Merge pull request #77 from edx/jonahstanley/fix-alert-tests 
Jonahstanley/fix alert tests
 2013-06-06 12:59:07 -07:00
JonahStanley
477f29d5ee Added docstring specifying when this method must be called 2013-06-06 14:52:35 -04:00
dcadams
de1c68796b Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-06 08:48:10 -07:00
Jay Zoldak
51b70e42a4 Revert "Merge branch 'master' of https://github.com/edx/edx-platform into slater/search" 
This reverts commit e9c5d765ec, reversing
changes made to 5ff9f3be88.
 2013-06-06 10:06:37 -04:00
Slater-Victoroff
e9c5d765ec Merge branch 'master' of https://github.com/edx/edx-platform into slater/search 2013-06-06 08:56:37 -04:00
Slater-Victoroff
3b165da170 Replaced troublesome pyes integration with direct calls made to elasticsearch rest api 2013-06-06 08:56:16 -04:00
Jay Zoldak
1f284c56c1 Skip a test that is causing intermittent failures due to the way it is overriding urls 2013-06-05 18:15:16 -04:00
dcadams
bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 15:14:48 -07:00
JonahStanley
d226a21eb0 Changed wording to I will 2013-06-05 16:01:45 -04:00
JonahStanley
f652a5d8c4 Small wording fix 2013-06-05 15:57:42 -04:00
JonahStanley
260659cfc6 Fixed wording in the step 2013-06-05 15:56:45 -04:00
JonahStanley
acc743eea8 Added functionality to bypass alerts 
This is done with the following steps:
'I confirm all alerts' means that all alert and confirm windows are returned and returned true respectively
'I dismiss all alerts' means that all confirm windows are returned false
'I answer all prompts with "([^"]*)"' means that all prompts are returned with the given string

Please note that these settings are on a PER PAGE basis.  This means that for best results, the step must be given right before the alert is generated.
 2013-06-05 15:08:58 -04:00
Nate Hardison
4031c193a1 Adjust available routes based on theme presence 
Themes do not necessarily want all of the available LMS routes, such
as `/jobs` and `/university_profiles`. This change splits up the
`lms/urls.py` file and selectively enables/disables routes based on
whether or not a theme is enabled. This is a naive solution for now;
a better solution gives themes a way to selectively overrides such
routes.

Additionally, with the `MKTG_URL_LINK_MAP` setting that hits certain
routes immediately on each page render (whenever the `marketing_link`
helper function is called), themes may crash if they don't leave
all marketing link routes present in `lms/urls.py`. This change also
provides the ability to override the `MKTG_URL_LINK_MAP` in the
settings.

Finally, modify the mitxmako marketing URL middleware to not try to
reverse disabled URLs, which are those keys in the map whose values
are `None`.
 2013-06-05 10:55:12 -07:00
Nate Hardison
34c49e73f7 Don't return any news if a theme is enabled 
When a non-edX theme is enabled, then don't return anything for "top
news," which is edX-specific.
 2013-06-05 10:27:23 -07:00
Slater-Victoroff
d1be90bbc4 Merge branch 'master' of https://github.com/edx/edx-platform into slater/search 2013-06-05 12:48:40 -04:00
dcadams
0fb1136559 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 09:25:49 -07:00
Slater-Victoroff
1ac6e12304 Pyes working, considering switch to raw requests, phonetic and fuzzy search both working 2013-06-05 10:22:18 -04:00
dcadams
a8ec1ca9d5 Modified code such that non-logged in student activates correctly. 2013-06-04 17:08:34 -07:00
dcadams
1ea6545556 Worked on reducing pep8 violations. 2013-06-04 14:17:13 -07:00
Nate Hardison
b606d7ce56 Merge pull request #53 from edx/nate/fix-mako-templ-encoding 
Specify UTF-8 encoding when loading Mako template
 2013-06-04 13:02:05 -07:00
Jay Zoldak
59b26a791b Turn off automatic snapshot to tmp dir on lettuce failure 2013-06-04 15:09:44 -04:00
Nate Hardison
7bccce4e9c Add comment to dynamically-generated asset files 
To avoid confusion about where these files come from, add a header
comment upon preprocessing that warns people to not modify the
generated files directly, and points them to the appropriate
template file.
 2013-06-04 11:14:02 -07:00
dcadams
56f81fb104 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-04 10:29:04 -07:00
Nate Hardison
64a85e19e7 Specify UTF-8 encoding when loading Mako template 
When loading a Mako template from a Django template, the file
encoding of the Mako template was left unspecified. In some cases,
this would cause the Mako template to be interpreted as an ASCII
template, resulting in blowups if the template was encoded in
UTF-8 (e.g., lms/templates/footer.html).

Now, both the input and output encodings are specified as UTF-8.
 2013-06-03 17:19:33 -07:00
Jonah Stanley
cdadcba9da Merge pull request #10 from edx/jonahstanley/add-more-tests 
Jonahstanley/add more tests
 2013-06-03 10:25:53 -07:00