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

14601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
4ddca36bbe Studio - adds minor UI/content changes to settings notices 2013-06-19 18:13:54 -04:00
Brian Talbot
7904464975 studio - revises notice headings to use icons 2013-06-19 18:09:09 -04:00
Brian Talbot
d2f0d85085 studio - adds in basic rules for notices UI 2013-06-19 18:09:09 -04:00
Brian Talbot
2c72fa9e8b studio - revises markup/content for course about mgmt notices 2013-06-19 18:09:09 -04:00
cahrens
29d93aff89 pep8 fixes. 2013-06-19 16:34:23 -04:00
cahrens
51fc6280b6 Don't concatenate together multiple strings. 2013-06-19 16:23:00 -04:00
cahrens
6e96b88518 On marketing site, disable course settings options that do not work. 
When on the marketing site (edx.org) disable portions of the course settings page in Studio that do not actually work in that environment.
 2013-06-19 11:28:16 -04:00
Don Mitchell
cf2675d701 Update fields.py 
When changing variable names for code review critique, accidental cut/paste prevented intended behavior.
 2013-06-18 12:32:26 -04:00
Don Mitchell
b151d6c155 Merge pull request #183 from edx/dhm/timeconv/bug0 
Fix a few remaining tz naive dates
 2013-06-18 09:09:24 -07:00
Don Mitchell
a1f181e7bb Make the variable and method names clearer 2013-06-18 11:45:16 -04:00
chrisndodge
a3c7ece85b Merge pull request #195 from pdehaye/patch-1 
need to import os
 2013-06-18 08:16:55 -07:00
Jonah Stanley
94238238e7 Merge pull request #58 from edx/jonahstanley/add-navigation-tests 
Jonahstanley/add navigation tests
 2013-06-18 07:29:17 -07:00
polesye
9cd9129d9f Merge pull request #101 from edx/anton/videoalpha_tests 
Anton/videoalpha tests
 2013-06-18 07:26:27 -07:00
Valera Rozuvan
fe694a1548 Fixed up CHANGELOG. 2013-06-18 16:57:06 +03:00
Valera Rozuvan
bb3cf56f7d Fixed up CHANGELOG. 2013-06-18 16:55:28 +03:00
Valera Rozuvan
3086f16d77 Added comment about enabling some Video Alpha tests when testing locally. Updated CHANGELOG. 2013-06-18 16:30:15 +03:00
Valera Rozuvan
b75876e3ac As per PR comments from reviewer, fixing coding style. 2013-06-18 16:30:15 +03:00
Anton Stupak
cfb9a54e21 Add tests for additional events 2013-06-18 16:30:15 +03:00
Anton Stupak
78e22a910e Disable tests because of problems with phantomjs 2013-06-18 16:30:15 +03:00
Anton Stupak
70889c3625 Add tests for Event Logger 2013-06-18 16:30:15 +03:00
Anto Stupak
499c682d95 Add tests for HTML5 part of Videoalpha 2013-06-18 16:30:14 +03:00
Anto Stupak
70cc9a168b Add tests for Youtube part of Videoalpha 2013-06-18 16:30:14 +03:00
Vasyl Nakvasiuk
80f38b8f3c python tests for videoalpha 2013-06-18 16:30:14 +03:00
Jason Bau
048be222a6 Update CHANGELOG.rst 2013-06-17 18:02:03 -06:00
Jason Bau
33027e7e59 Merge pull request #175 from edx/fix/jbau/handle-None-discussion-start_time 
Fix for broken forums due to forum entry with no start_date
 2013-06-17 16:55:56 -07:00
Jason Bau
28ae2b6346 change form of making datetime.max aware (in UTC) 2013-06-17 16:11:35 -07:00
pdehaye
c1dc2628a0 need to import os 2013-06-18 00:52:23 +02:00
John Jarvis
a3f45bd94a moving segment io setting below auth.json 2013-06-17 17:45:22 -04:00
Renzo Lucioni
c05a06a885 Merge pull request #182 from edx/renzo/segment-io-auth-backport 
Switch to using environment variables to get key for Segment.io
 2013-06-17 13:40:24 -07:00
Christina Roberts
080c5e4bc1 Merge pull request #186 from edx/christina/latex_and_click 
Bug fix for LaTeX source not saving
 2013-06-17 13:36:49 -07:00
Ned Batchelder
267241a0c2 Merge pull request #192 from edx/ned/backdated-changelog-entries 
CHANGELOG entry for the whitelistable sandboxing change.
 2013-06-17 13:30:39 -07:00
chrisndodge
c3105df9fc Merge pull request #190 from edx/feature/cdodge/soft-delete-assets 
need to comment out another thumbnail check due to build test environmen...
 2013-06-17 13:23:56 -07:00
Ned Batchelder
d7e03890d7 CHANGELOG entry for the whitelistable sandboxing change. 2013-06-17 16:11:03 -04:00
Chris Dodge
53f18f27b9 need to comment out another thumbnail check due to build test environment not having libjpeg installed 2013-06-17 15:59:14 -04:00
Ned Batchelder
e78eb9aa66 Merge pull request #187 from edx/ned/remove-obsolete-changelogs 
These CHANGELOGS were never used, and are now obsolete.
 2013-06-17 12:46:32 -07:00
cahrens
73ba1e547e Change code to use css_click in hopes that will make the test pass on Don's mac. 
css_click will try clicking multiple times.
 2013-06-17 15:46:10 -04:00
Renzo Lucioni
97f4291b2a Add comment clarifying which Segment.io key is in use 2013-06-17 15:35:04 -04:00
chrisndodge
71a6da6485 Merge pull request #188 from edx/feature/cdodge/soft-delete-assets 
disable assertions on thumbnail generation as it puts a system requireme...
 2013-06-17 12:20:00 -07:00
Chris Dodge
a52f62a923 disable assertions on thumbnail generation as it puts a system requirement on libjpeg which may not be installed on the test machines 2013-06-17 14:59:48 -04:00
Don Mitchell
085a590bdd timezone conversion: more unit tests 
and code reorganization
 2013-06-17 14:48:18 -04:00
cahrens
92fc452b34 Change the wording of problem steps to follow Given, When, Then... convention. 2013-06-17 14:30:37 -04:00
Ned Batchelder
77a9073655 These CHANGELOGS were never used, and are now obsolete. 2013-06-17 14:11:42 -04:00
Don Mitchell
9d464701f9 timezone conversion tests 2013-06-17 14:04:12 -04:00
Calen Pennington
3fdc02dbc4 Merge pull request #148 from edx/feature/cale/xblock-init 
Feature/cale/xblock init
 2013-06-17 11:03:44 -07: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
Calen Pennington
82606a062c Make XModuleDescriptor use __init__ from XBlock 
Fixes JIRA LMS-203
 2013-06-17 13:38:57 -04:00
Calen Pennington
438ac3b1a4 Move video xmodule tests to xmodule directory 2013-06-17 13:38:29 -04:00
Don Mitchell
4c8a92e968 Merge branch 'dhm/timeconv/bug0' of github.com:edx/edx-platform into dhm/timeconv/bug0 
Conflicts:
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/timeinfo.py
 2013-06-17 13:30:35 -04:00
Don Mitchell
cb40e9ff88 Fix a few remaining tz naive dates 
And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
 2013-06-17 13:26:45 -04:00
chrisndodge
319eb0bad7 Merge pull request #170 from edx/feature/cdodge/soft-delete-assets 
Feature/cdodge/soft delete assets
 2013-06-17 09:56:17 -07:00