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

21514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marco
01971c6c2f adjusted color of russian social network image to be a lighter gray 2014-02-28 15:48:18 -05:00
marco
1906946db9 adding in gray versions of social icons for use in new email template. Using new name to ensure old links and existing emails using older templates still stay active 2014-02-27 17:33:45 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save 
Native XBlock Studio Save UI
 2014-02-27 10:50:51 -05:00
Mark Hoeber
8f7497cfe7 Merge pull request #2747 from edx/markhoeber/documentation/release-notes-update 
Added discussions issue
 2014-02-27 09:40:57 -05:00
Mark Hoeber
11fd9acd4f Added discussions issue 
to delete response comments
 2014-02-27 09:40:25 -05:00
Sarina Canelake
4440a85969 Merge pull request #2741 from edx/sarina/update-translations 
Fix password reset i18n
 2014-02-27 08:48:59 -05:00
Valera Rozuvan
074e947ef7 Merge pull request #2690 from edx/valera/add_start_time_end_time_functionality 
Fix start-time functionality in the video player.
 2014-02-27 00:16:10 +02:00
Sarina Canelake
0f0f185f90 Fix password reset i18n 2014-02-26 16:17:42 -05:00
Will Daly
5f09953125 Hide save/cancel buttons for native XBlocks in Studio 
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
 2014-02-26 16:17:02 -05:00
Mark Hoeber
348ce15f10 Merge pull request #2718 from edx/markhoeber/documentation/release-notes-2-25-14 
Release Notes for 2-26-14
 2014-02-26 16:07:51 -05:00
Mark Hoeber
dea5b55541 Release Notes for 2-26-14 
DOC-36
 2014-02-26 16:07:07 -05:00
chrisndodge
38e55a4eb9 Merge pull request #2668 from edx/cdodge/no-pii-in-logs 
add new feature to make sure we aren't writing PII into the application ...
 2014-02-26 16:04:12 -05:00
Greg Price
4516f9e99b Merge pull request #2733 from edx/gprice/forum-pinning-ux 
Improve UX of pinning feature
 2014-02-26 15:28:21 -05:00
Adam
256e13a0af Merge pull request #2739 from edx/release 
Release
 2014-02-26 15:14:28 -05:00
Dave St.Germain
ce596919b4 Merge pull request #2734 from edx/dcs/a11y-course-update-delist 
Tweaks course update html to avoid using list tags inappropriately.
LMS-1724
 2014-02-26 14:01:07 -05:00
Greg Price
29e77ed25f Improve UX of pinning feature 
Students no longer see a tooltip nor any button affordance (i.e. cursor
and color change on hover/focus) on the pinning feature. For moderators,
the tooltip is now correct when a thread is pinned, the button is
accessible for keyboard-only users and screen readers, and an error
dialog now appears if an error occurs in attempting to pin/unpin.

JIRA: FOR-192
 2014-02-26 13:59:54 -05:00
Dave St.Germain
da275eae11 Tweaks course update html to avoid using list tags inappropriately. 
LMS-1724
 2014-02-26 13:28:00 -05:00
Ned Batchelder
1fb5c3cc82 Merge pull request #2708 from pdehaye/patch-1 
The correct LTI keyword is "roles", not "role"
 2014-02-26 12:57:34 -05:00
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
331a94c124 Allow /static in transcript names. 2014-02-26 10:05:34 -05:00
Alexander Kryklia
4d7ef488e7 Fix typo in video_module. 2014-02-26 10:05:04 -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
Valera Rozuvan
f8e8a9a34a Addressing review comments from jmclaus. 2014-02-26 13:14:10 +02: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
Valera Rozuvan
91ec617cf7 Addressing review comments from jmclaus. 2014-02-26 11:29:51 +02:00
Valera Rozuvan
c667c013e7 Fix start-time functionality in the video player. 
When there is a start-time:

Initially, the video starts playing from the start-time.
Whenever the player resets for any reason (such as reaching
the end of the video), it will reset to start-time instead of 00:00:00.
It should not be the case that any time the user presses play, it
start playing from start-time.

BLD-659.
 2014-02-26 11:24:14 +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