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

21489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giulio Gratta
51632a9f0a Merge pull request #2579 from edx/giulio/studio-file-urls 
Internal/External Studio file URLs
 2014-02-26 09:32:59 -08:00
Martyn James
b2039a7839 Merge pull request #2649 from edx-solutions/AddAuthor 
Adding Marty as an author
 2014-02-26 12:29:43 -05:00
Martyn James
9f4cb51d08 Adding Marty as an author 2014-02-26 12:28:05 -05:00
Greg Price
0f38892028 Merge pull request #2701 from edx/gprice/edit-forum-comment 
Add UI for editing forum third-level content
 2014-02-26 11:45:14 -05:00
zubair-arbi
2cb3cc3621 Merge pull request #2238 from zubair-arbi/zub/bugfix/std154-courseinfohtml 
update course info module to save content without modifying
 2014-02-26 21:34:10 +05:00
Jim Abramson
9c791a952c Merge pull request #2706 from edx/jsa/forum-delete-comments-acceptance 
Add acceptance tests for forums comment deletion.
 2014-02-26 11:19:20 -05:00
jsa
bea463d950 Add acceptance tests for forums comment deletion. 
JIRA: FOR-472
 2014-02-26 10:31:02 -05:00
jsa
7be356b390 auto_auth: add ability to configure forum roles and scrape user id. 2014-02-26 10:30:55 -05:00
Alexander Kryklia
9ffcbb88b5 Merge pull request #2728 from edx/alex/allow_static_in_transcript_names 
Allow /static in transcript names.
 2014-02-26 17:01:39 +02:00
Greg Price
c3dc40d729 Add UI for editing forum third-level content 2014-02-26 10:00:50 -05:00
Waheed Ahmed
cb4d3dd327 Merge pull request #2671 from edx/waheed/lms1479-front-end-validation-for-username-email 
Added validation for username and email max length.
 2014-02-26 19:42:04 +05:00
cahrens
8db7b0ce21 Add test for external_url being passed to assets page. 2014-02-26 09:26:50 -05:00
Alexander Kryklia
2e78fce760 Allow /static in transcript names. 2014-02-26 15:48:28 +02:00
zubair-arbi
7ee08eae52 Merge pull request #2688 from edx/zub/bugfix/std1294-importexportcruft 
Empty course temp folder after exporting course (export_handler)
 2014-02-26 17:53:44 +05:00
zubair-arbi
458943c881 Merge pull request #2364 from edx/zub/bugfix/std1140-seedforumpermissions 
assign default role 'Student' to user on recreating course
 2014-02-26 17:50:28 +05:00
Waheed Ahmed
874d7360c1 Added validation for username and email max length. 
LMS-1479
 2014-02-26 16:25:37 +05:00
zubiar-arbi
619c144c11 Empty course temp folder after exporting course (export_handler) 
STUD-1294
 2014-02-26 15:52:48 +05:00
Alexander Kryklia
1e74e00944 Merge pull request #2726 from edx/alex/fix_typo 
Fix typo in video_module.
 2014-02-26 12:41:48 +02:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140 
STUD-1140
 2014-02-26 15:40:44 +05:00
Alexander Kryklia
d6602f4f74 Fix typo in video_module. 2014-02-26 12:39:44 +02:00
zubiar-arbi
cfa6b14575 update course info module to save content in new 'items' field + update import/export to handle content field other than 'data' or 'metadata' 
STUD-154
 2014-02-26 13:11:59 +05:00
chrisndodge
663671ec4c Merge pull request #2534 from edx/jbau/fix-non-microsite-subdomain-branding-default 
fix non-microsite SUBDOMAIN_BRANDING defaults
 2014-02-25 19:30:45 -05:00
chrisndodge
57c3bce102 Merge pull request #2574 from edx-solutions/splash-url-exclusion 
splash-url-exclusion: Exclude '/heartbeat' from redirect
 2014-02-25 18:51:27 -05:00
nasthagiri
b058e91ef8 Merge pull request #2725 from edx/nimisha/studio-edit-tabs 
Added nimisha to AUTHORS file.
 2014-02-25 18:17:52 -05:00
Xavier Antoviaque
73ef78f8ae splash-url-exclusion: Exclude '/heartbeat' from redirect 
Update the dependency to load this commit:
6e8bd68521

Which allows to prevent `/heartbeat` from being redirected, which is
necessary on production servers
 2014-02-25 18:06:54 -05:00
Nimisha Asthagiri
2ea92e1c6c Added nimisha to AUTHORS file. 2014-02-25 17:50:13 -05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
srpearce
89b0c30fa9 Merge pull request #2722 from edx/sylvia/documentation/BLD-847 
Update Zooming Image doc to reference file on files.edx.org
 2014-02-25 16:01:05 -05:00
Sylvia Pearce
6c9972fa5d Typo corrections 2014-02-25 16:00:20 -05:00
Sarina Canelake
65db6ad66a Merge pull request #2720 from edx/sarina/ignore-probs 
Ignore all my probs
 2014-02-25 15:05:24 -05:00
Sarina Canelake
66b6d23a64 Ignore all my probs 2014-02-25 14:53:32 -05:00
Sylvia Pearce
bfc6dd7469 Update Zooming Image doc to reference file on files.edx.org 2014-02-25 14:51:36 -05:00
Mark Hoeber
3553fa7c50 removed dup'd paragraph 2014-02-25 14:42:21 -05:00
Ned Batchelder
a33cb2cd3d Merge pull request #2707 from edx/ned/clean-up-i18n-tools 
Ned/clean up i18n tools
 2014-02-25 14:39:29 -05:00
Mark Hoeber
46bda852d6 Assets Page Template Update 
For embed vs. external URLs

STUD-1338
 2014-02-25 14:26:50 -05:00
Ned Batchelder
d3c75654d6 Updated po/mo files without format flags. 2014-02-25 14:03:18 -05:00
Calen Pennington
c72d410083 Remove doc-ready tests, which were flaky 2014-02-25 14:01:37 -05:00
Calen Pennington
ae34c3fe9f Mark xblock initialization status using css class (in part to make testing easier) 2014-02-25 14:01:37 -05:00
Calen Pennington
35fbc15edb Add tests of more scopes in student_view 2014-02-25 14:01:37 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Ned Batchelder
830bbb15f3 Generate now removes format flags. 2014-02-25 14:00:52 -05:00
Ned Batchelder
eb4d5f1cbd Also clean up the 3rd-party po files. 2014-02-25 13:58:47 -05:00
Giulio Gratta
a8c60259fb Merge pull request #2551 from edx/giulio/custom_cert_names 
Variable-ize "Certificate of Achievement" text
 2014-02-25 10:20:08 -08:00
Giulio Gratta
35112e9e78 Variable-ize "Certificate of Achievement" text 2014-02-25 10:19:03 -08:00
Gabe Mulley
8ff3b4e58d Merge pull request #2696 from mulby/gabe/add-problem-name-to-events 
Add module display name to module related server events
 2014-02-25 13:05:18 -05:00
Gabe Mulley
fe21f47573 Add module display name to module related server events 
This information will likely be used frequently for analytics purposes, so we would like to denormalize here to avoid having to join with the modulestore later.

Fixes: AN-594
 2014-02-25 11:53:36 -05:00
Sarina Canelake
b0ae3a536d Merge pull request #2714 from edx/sarina/tfex-022514 
Update translations (autogenerated message)
 2014-02-25 10:26:39 -05:00
Sarina Canelake
c46028bf25 Update translations (autogenerated message) 2014-02-25 10:18:30 -05:00
Mark Hoeber
a3e80504d1 Merge pull request #2705 from edx/markhoeber/documentation/stud-1214 
Updated course introduction video section
 2014-02-24 17:17:54 -05:00
Adam
5ab22ca412 Merge pull request #2700 from edx/adam/i18n-instructor-tab 
add i18n scraping to tabs.py (LMS-2166)
 2014-02-24 17:05:45 -05:00