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

21069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
bc0ca63f7e Avoid requesting unnecessary thread responses 
The front-end code for rendering a thread always makes an AJAX request
for the resopnses, regardless of how the thread was accessed (directly
by URL or by selecting it from the thread list). Previously, when
a user accessed a thread directly by URL, the LMS would initially
request the thread from the comments service with responses, but that
response data was never actually used. Now, the responses are not
fetched with that initial query.
 2014-02-07 10:50:59 -05:00
Greg Price
b1e5bbb8ff Merge pull request #2504 from edx/gprice/forum-pagination-acceptance 
Add acceptance tests for forum response pagination
 2014-02-07 10:47:07 -05:00
David Baumgold
ff910028fd Merge pull request #2465 from glowe/fix-sequence-position 
Fix goto_position in sequence coffeescript.
 2014-02-07 10:46:33 -05:00
Ned Batchelder
c7de2b7f25 Merge pull request #2485 from edx/ned/make-i18n-generate-forgiving 
Make i18n:generate more flexible
 2014-02-07 10:41:42 -05:00
Mark Hoeber
8b924404df Merge pull request #2513 from edx/sylvia/documentation/BLD-801 
Sylvia/documentation/bld 801
 2014-02-07 10:34:09 -05:00
Sylvia Pearce
7632c229e2 Reorganize content in Appendix E 
Change order of tags (now alphabetical); add link list at beginning of document
 2014-02-07 10:28:38 -05:00
Dave St.Germain
98a5ce3261 Merge pull request #2499 from edx/dcs/a11y-slight-rearrange 
Added an alt tag to the footer logo; added charset meta tag; moved
 2014-02-07 10:05:52 -05:00
Brian Talbot
08f448389a Merge pull request #2410 from ionis-education-group/courseware-none-bodyclass 
Add '' default to bodyclass in courseware templates
 2014-02-07 10:00:59 -05:00
David Baumgold
a93ef64a68 Merge pull request #2454 from ionis-education-group/theme-template-paths 
Prepend theme template paths
 2014-02-07 09:25:34 -05:00
John Jarvis
6c5ad2b74a Merge pull request #2448 from edx/jarv/db-env-override 
Jarv/db env override
 2014-02-06 17:53:26 -05:00
Greg Price
8e3a77fa1e Add acceptance tests for forum response pagination 2014-02-06 17:52:14 -05:00
Mark Hoeber
1cef2fe59f Merge pull request #2506 from edx/sylvia/documentation/add_PT_and_ME 
Add periodic table and molecule editor to Additional Tools
 2014-02-06 16:35:57 -05:00
David Baumgold
3f1612acea Merge pull request #2497 from edx/db/brew-bundle-install-script 
Teach install-system-req.sh about `brew bundle`
 2014-02-06 16:12:37 -05:00
Jason Bau
c3e1184211 Merge pull request #2269 from edx/jbau/lms-localize-datetime 
make LMS accordion and progress datetime display respect settings.TIME_ZONE
 2014-02-06 12:48:10 -08:00
Sarina Canelake
9a10c322e6 Merge pull request #2495 from edx/sarina/update-i18n-guide 
Update i18n coding guidelines
 2014-02-06 14:59:06 -05:00
Sylvia Pearce
9506e44906 Add periodic table and molecule editor to Additional Tools 2014-02-06 14:18:54 -05:00
Sarina Canelake
5f841f286b Update i18n coding guidelines 2014-02-06 14:18:15 -05:00
David Baumgold
b9edc195bf Merge pull request #2505 from edx/db/resolve-dev-env-script 
fixup create-dev-env.sh
 2014-02-06 14:12:40 -05:00
David Baumgold
decda74899 Teach install-system-req.sh about brew bundle 2014-02-06 14:11:11 -05:00
David Baumgold
c273648395 fixup create-dev-env.sh 2014-02-06 14:09:05 -05:00
Greg Price
e1c36aa557 Merge pull request #2456 from edx/gprice/i18n-extract-dependency 
Make assets:coffee a dependency of i18n:extract
 2014-02-06 13:35:25 -05:00
David Baumgold
44d7d9523e Merge pull request #2501 from edx/db/clarify-test 
Minor test cleanup
 2014-02-06 13:05:11 -05:00
Sylvia Pearce
f7859c432c Continue updating Appendix E 2014-02-06 12:24:36 -05:00
Greg Price
02a233b7e2 Rename URL_PATH to url_path in acceptance code 
It's not a constant, and some subclasses will want to make it a
function with @property.
 2014-02-06 12:02:48 -05:00
David Baumgold
698aedc329 better pylint formatting 2014-02-06 11:56:46 -05:00
David Baumgold
2d59d44bb5 Clarify DATA_DIR path 2014-02-06 11:55:41 -05:00
hkim823
37fea91d37 Merge branch 'master' of https://github.com/edx/edx-platform 2014-02-06 11:48:12 -05:00
Graham Lowe
c659b1c5f4 Fix goto_position in sequence coffeescript. 
Replace single-quotes with double-quotes so that #{@ajaxUrl} is
interpolated.
 2014-02-06 11:36:11 -05:00
Brian Talbot
a41bdb46db Merge pull request #2476 from ionis-education-group/bodyclass-without-js 
Stop using JavaScript to set the body's CSS class
 2014-02-06 11:28:09 -05:00
Feanil Patel
4636b2706c Merge pull request #2494 from edx/feanil/fix_cms_gather_assets 
Pull THEME_NAME from envs tokens if it's there.
 2014-02-06 11:25:37 -05:00
Dave St.Germain
2d72184620 Added an alt tag to the footer logo; added charset meta tag; moved 
DOCTYPE to the top of the file.
 2014-02-06 11:25:16 -05:00
hkim823
70ca3a4729 fixing create-dev-env.sh to use Brewfile 2014-02-06 11:10:05 -05:00
Ned Batchelder
e64ab5e454 Merge pull request #2417 from edx/ned/add-missing-people-to-authors 
add missing people to AUTHORS
 2014-02-06 11:06:07 -05:00
Jason Bau
b525f40377 Start datetime localization in LMS 
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
 2014-02-06 07:57:56 -08:00
Will Daly
c82e4ede34 Merge pull request #2492 from edx/will/really-fix-tab-nav-test 
Skip page check in promise for Tab Nav in bok-choy suite
 2014-02-06 10:22:50 -05:00
Will Daly
3336cc76b5 Merge pull request #2490 from edx/will/disable-js-transcripts-test 
Disabled flaky JS transcript test
 2014-02-06 10:10:57 -05:00
Will Daly
28c33a4f84 Skip page check in promise for Tab Nav in bok-choy suite 2014-02-06 09:31:21 -05:00
Will Daly
ac4d3e10d0 Disabled flaky JS transcript test 2014-02-06 08:00:25 -05:00
Ned Batchelder
b34ca864fc Make i18n:generate more flexible 
Now normal i18n:generate doesn't care about missing files, and
i18n:generate_strict does.  The robot task calls the strict version.

There may well be a better way to make the two tasks, but my Ruby+Rake
skillz are weak, and it's all going away soon.
 2014-02-05 22:30:35 -05:00
Feanil Patel
2aab8f89f2 Pull THEME_NAME from envs tokens if it's there. 
If the FEATURES['USE_CUSTOM_THEME'] flag is set but the
'THEME_NAME' is not set.  We get a compilation error during
cms gather assets.
 2014-02-05 18:40:03 -05:00
Ned Batchelder
f900e8bb1d add missing people to AUTHORS 2014-02-05 17:52:18 -05:00
marcotuts
70f064e532 Merge pull request #2468 from edx/marco/studio/fix/component-header-styling 
Added back in component header visual separation from component renderin...
 2014-02-05 17:47:35 -05:00
Feanil Patel
716b789e06 Merge remote-tracking branch 'origin/release' 2014-02-05 17:26:39 -05:00
Feanil Patel
84efae5d22 Merge pull request #2487 from edx/hotfix/feb-10-2014 
Make receipt-ids actually generate UUIDs
 2014-02-05 17:24:47 -05:00
marco
799095fd7b updated csscomb ordering for css properties, moving border above padding. 2014-02-05 17:04:00 -05:00
Will Daly
4c2b76951d Merge pull request #2431 from edx/will/ora-acceptance-tests-rebase 
Peer-grading acceptance tests
 2014-02-05 16:43:47 -05:00
David Baumgold
ea6543ccf4 Merge pull request #2416 from Bachmann1234/fix_typo_in_data_readme 
Fix typo in data readme
 2014-02-05 16:33:53 -05:00
Jay Zoldak
0acb18fe1f Merge pull request #2480 from edx/zoldak/increase_lettuce_script_timeout 
Increase async script timeout in lettuce acceptance tests
 2014-02-05 15:45:31 -05:00
Julia Hansbrough
a0efe6e0de Make receipt-ids actually generate UUIDs 
LMS-2192
 2014-02-05 20:41:30 +00:00
Feanil Patel
544b496185 Merge pull request #2484 from edx/feanil/fix_transfer_logic 
Only move students if they aren't in the new course.
 2014-02-05 15:18:32 -05:00