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

318 Commits

Author SHA1 Message Date
David Ormsbee
52d33c0dee Merge branch 'master' into ormsbee/verifyuser_func 2013-08-22 17:33:20 -04:00
David Ormsbee
0dd5819683 basic flow from enroll mode selection to verify screen 2013-08-22 13:56:23 -04:00
JonahStanley
bb7cbf4d62 If sauce is not enabled, allow full range of ports 
Forgot an import
 2013-08-21 16:05:03 -04:00
JonahStanley
22b3f2b161 Factored out Sauce related things to one file 
LMS was arbitrarily chosen for now.

Fixed up pylint and pep8 errors

Fixed up pylint and pep8 errors

Changed naming to be better

Changed Sauce Info to obtaining a JSON string
 2013-08-21 16:05:03 -04:00
JonahStanley
35e5f4cab5 Moved global things in browser.py to functions 2013-08-21 16:05:02 -04:00
JonahStanley
0b6e62984e Using requests instead of a HTTPConnect 2013-08-21 16:05:02 -04:00
JonahStanley
58bb6e1ea3 Changed tags to be lowercase to prevent preprocessing 
Changed to have a default for device since it isn't always needed

Tags are more clear

Fixed stylistic issues
 2013-08-21 16:05:02 -04:00
JonahStanley
027cbfd09a Added logic to test_acceptance.sh so that the proper tests will be skipped for each browser 
This logic also covers if a lettuce_browser is specified

Removing browser matrix from readme
 2013-08-21 16:05:02 -04:00
JonahStanley
d422cb9206 Fixed desired_capabilities issues 
Also, now lettuce browser can be specified by jenkins
 2013-08-21 16:05:02 -04:00
JonahStanley
ee23b9d161 Changed method of obtaining feature flags to environment variables 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:02 -04:00
JonahStanley
9fb0529036 Sauce can only connect on certain ports 2013-08-21 16:05:02 -04:00
JonahStanley
2812b9cd5c Fixed how config was obtained 
Added comment about the feature
 2013-08-21 16:05:01 -04:00
JonahStanley
682d85c2f3 Changed feature to being one dictionary 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:01 -04:00
JonahStanley
3746c654d8 Added a tag for things that will not work on Firefox 
Added tags for tests that will not work on Sauce

Changed build name

Tightened up logic

Conflicts:
	common/djangoapps/terrain/browser.py

Added flag for session name
 2013-08-21 16:05:01 -04:00
JonahStanley
97df5aa997 Added feature flag for device type. Needed for android tablets 2013-08-21 16:05:01 -04:00
JonahStanley
1d7284b7cd Refactored out more for feature flags 
Refactored more for feature flags
 2013-08-21 16:05:01 -04:00
JonahStanley
f4c19919cd Beginnings of a feature flag 
Conflicts:
	common/djangoapps/terrain/browser.py

Changed way feature flag was checked

Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:00 -04:00
Peter Fogg
7fc8fcde7b Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod 
Allow grace periods of > 24 hours.
 2013-08-21 13:00:15 -07:00
Peter Fogg
eb5b6cc6ea Allow grace periods of > 24 hours. 2013-08-21 14:37:12 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00
Peter Fogg
ce1a13f32c Generalize file uploader. 
Previously the file upload dialog was PDF- and textbook-specific. The
changes are adding parameters to the FileUpload model for the file
type, and adding an onSuccess callback to the UploadDialog view. Also
moved upload-specific SASS into its own file.
 2013-08-21 09:42:00 -04:00
Carlos Andrés Rocha
4e0f3d0791 Merge pull request #706 from rocha/enable-django-nose-for-all 
Enable the django_nose app by default
 2013-08-16 11:29:43 -07:00
Carlos Andrés Rocha
bbfe3662e2 Enable the django_nose app by default 
The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
 2013-08-15 19:31:30 -04:00
JonahStanley
a067fb58d6 Workaround for issue 
Better wording of commit

Workaround for issue

Better wording of commit

Fixed spacing
 2013-08-15 16:59:30 -04:00
Adam Palay
4855fd5af4 turn off i18n 2013-08-14 17:03:21 -04:00
Adam Palay
55ad55b9ca add PLATFORM_NAME and BUGS_EMAIL to cms/envs/common 2013-08-13 10:35:06 -04:00
chrisndodge
bb644bb6ae Merge pull request #645 from edx/fix/cdodge/add-tech-support-email-config 
Add new setting to cms project
 2013-08-12 11:10:53 -07:00
Chris Dodge
7fd5a00c2c import default TECH_SUPPORT_EMAIL setting from LMS 2013-08-12 14:07:03 -04:00
Chris Dodge
0231e64f36 also define TECH_SUPPORT_EMAIL in cms.envs.common config file 2013-08-12 13:41:05 -04:00
Chris Dodge
0da2fb842f Add new setting to cms project 2013-08-12 13:29:15 -04:00
Anton Stupak
74f3595d54 Add acceptance tests for checking rendering. 2013-08-12 14:32:15 +03:00
Chris Dodge
e23ec4f221 on the new envs configuration file, we need to squelch pylint errors on the from dev import * 2013-08-10 00:29:17 -04:00
Chris Dodge
c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. 2013-08-09 20:46:14 -04:00
Jay Zoldak
006b90af9f Modify cms acceptance tests to use auto_auth workflow. 2013-08-08 12:08:25 -04:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
John Jarvis
3d87dd8c58 Merge pull request #551 from edx/jarv/remove-ADMINS 
changing default ADMINS to an empty tuple
 2013-08-01 14:02:26 -07:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants 
Add error messaging to course team page
 2013-08-01 11:58:52 -07:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model 
Initialize on every page that has a context_course set
 2013-08-01 13:39:47 -04:00
John Jarvis
b93e1985fb changing default ADMINS to an empty tuple 
https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-ADMINS
https://docs.djangoproject.com/en/dev/howto/error-reporting/
 2013-08-01 12:50:23 -04:00
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2 
Ensure auto-auth feature flag actually disables CSRF
 2013-08-01 08:20:32 -07:00
Will Daly
ab1461542d Moved CSRF override into its own settings file 2013-08-01 09:27:46 -04:00
e0d
ef75f9bb2c adding migrate env for cms 
cleanup
 2013-08-01 08:43:20 -04:00
Will Daly
39030c6683 Remove CSRF middleware/processor in aws and dev settings, 
not common.  This ensures that we load the MITX_FEATURES
token BEFORE deciding to disable CSRF.
 2013-07-31 23:59:25 -04:00
Diana Huang
0d10a872c8 Merge pull request #499 from edx/diana/login-redirect 
Only redirect when redirect url is an internal page.
 2013-07-30 05:29:39 -07:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
cahrens
23894d20f8 E-mail notifications to users when course creator status changes. 2013-07-29 09:49:37 -04:00
ihoover
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth 
Ihoover/feature flag auto auth
 2013-07-25 08:11:22 -07:00
ihoover
56883d65a1 csrf test fix 
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)

move definitions from setuo into test method
 2013-07-24 17:08:18 -04:00
Jason Bau
6c3de222cc Merge pull request #450 from edx/jbau/configure-session 
Allow session backend to be configurable
 2013-07-21 20:44:15 -07:00