Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marco
d2fae78824 icon color changes and profile link style to match profile page 2013-07-22 10:15:49 -04:00
marco
ff9f5714dd sass build cleanup for baseline fixes 2013-07-22 10:15:49 -04:00
marco
a0f54aaf26 cleaned up margin and padding to use baseline variable 2013-07-22 10:15:49 -04:00
marco
b55b34ff0c removed border to the right of discussion list 2013-07-22 10:15:06 -04:00
marco
f674e61f7a basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss 2013-07-22 10:15:06 -04:00
marco
6657ac189a cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning 2013-07-22 10:13:22 -04:00
marco
1fe54ba005 cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references 2013-07-22 10:13:22 -04:00
marco
0812867ab7 added in vendor font references to lms for font-awesome 2013-07-22 10:10:23 -04:00
marco
8216bb611d addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown. 2013-07-22 10:10:23 -04:00
marco
8886b59684 basic shell for discussion home page with both profile information and email notification settings 2013-07-22 10:10:23 -04:00
marco
17f4579f7d blankslate edited, header bar now with home button 2013-07-22 10:10:22 -04:00
Brian Talbot
4a7e793ab2 Studio: revises spacing fix for welcome to edX studio title 2013-07-22 09:47:59 -04:00
Brian Talbot
dc2631cb5a Studio: adds a space back to the phrase 'Welcome to edX Studio' that went missing 2013-07-22 09:47:59 -04:00
Peter Fogg
9a61038c87 Merge pull request #432 from edx/peter-fogg/update-asset-deletion-prompt 
Change delete asset prompt to Warning type for consistency.
 2013-07-22 06:10:15 -07:00
Calen Pennington
1b6f81b0c2 Merge pull request #408 from edx/cale/make-release-email-script-wiki-friendly 
Make release email script wiki-friendly
 2013-07-22 05:59:02 -07: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
Yarko Tymciurak
3991711edb Fixes for vagrant up 
vagrant:
  - check actual IP;
  - only init machine first time, just as native installations;
  - add .bash_profile to permissions fixup;
  - cleanup excessive newlines in making .bash_profile;

README:
  - include admin & debugging use;
  - info about re-initializing VM & manually running create-dev-env.sh;
  - add django admin & debug_toolbar setting info

Conflicts:
	AUTHORS
	scripts/vagrant-provisioning.sh
 2013-07-21 19:16:01 -04:00
ihoover
18352e9f20 comment tweaks 2013-07-20 16:20:32 -04:00
ihoover
a4ed24bd4b Merge branch 'master' into ihoover/feature_flag_auto_auth 2013-07-20 16:15:26 -04:00
ihoover
d7de09442e tweaks 2013-07-20 16:14:41 -04:00
ihoover
967ef6ff94 tests added 2013-07-20 13:01:37 -04:00
Chris Dodge
9056b096c6 add back removed space 2013-07-20 11:10:01 -04:00
Calen Pennington
679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore 
Next gen modulestore
 2013-07-20 04:51:11 -07:00
Calen Pennington
6dab09f5f2 PEP8 and Pylint fixes 2013-07-20 06:26:38 -04:00
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME 
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
 2013-07-19 17:43:37 -07:00
Will Daly
efc6a3081d Merge pull request #444 from edx/will/fix-acceptance-tests 
Will/fix acceptance tests
 2013-07-19 14:16:50 -07:00
Will Daly
76a63a6ef0 Disabled test failing due to bug in Studio 2013-07-19 17:13:51 -04:00
Renzo Lucioni
011ceb8e63 Merge pull request #418 from edx/renzo/in-context-progress 
Renzo/in context progress
 2013-07-19 14:01:40 -07:00
Don Mitchell
654686293b Set to old xml defaults IFF no specified policy for problem nor course. 2013-07-19 16:51:48 -04:00
Will Daly
17daa2a023 Fixed two other tests 2013-07-19 16:49:16 -04:00
Will Daly
27d51b3453 Attempt to fix video test 2013-07-19 16:49:15 -04:00
Vik Paruchuri
2dd5338378 Add in progress text 2013-07-19 16:43:01 -04:00
Vik Paruchuri
ca0cefd260 Move legend, make status elements smaller 2013-07-19 16:26:23 -04:00
Renzo Lucioni
9af87e41ba Resolve issues with persistence and sequential bar 2013-07-19 16:14:24 -04:00
Renzo Lucioni
1fc4ac864e Add feature showing current score next to problem title 2013-07-19 16:14:24 -04:00
ihoover
3d669eabe0 fix merge conflicts with master 2013-07-19 16:03:13 -04:00
Vik Paruchuri
a47fe07058 Hide legend, move display name 2013-07-19 15:50:28 -04:00
Vik Paruchuri
e232680210 Move child attributes 2013-07-19 15:15:10 -04:00
Adam
73e6e6f443 Merge pull request #394 from edx/fix/foldit-leaderboard 
Fix/foldit leaderboard
 2013-07-19 12:09:37 -07:00
Don Mitchell
913c601ac1 Move default set_many impl to xblock 2013-07-19 15:08:24 -04:00
Adam
032b02df24 Merge pull request #445 from edx/adam/fix/wiki 
set django-wiki to its most recent version
 2013-07-19 12:02:39 -07:00
Don Mitchell
549ef5d494 Ensure kvs up-to-date if code accessing it. 2013-07-19 14:55:49 -04:00
Adam Palay
7165acc499 set django-wiki to its most recent version 2013-07-19 14:40:41 -04:00
Vik Paruchuri
3509aea2b1 Redo js 2013-07-19 14:21:01 -04:00
Chris Dodge
22802a4d29 change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes 2013-07-19 13:54:22 -04:00
Vik Paruchuri
77eb35a75f Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-07-19 13:35:37 -04:00
Joe Blaylock
044a69d63d Merge pull request #52 from edx/nate/simple-chat 
Simple port of Class2Go's chat feature
 2013-07-19 10:10:32 -07:00
Don Mitchell
62afa23a0d Make tests not msec time sensitive 2013-07-19 13:10:14 -04:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -04:00
Don Mitchell
4a127e51c9 Merge pull request #441 from edx/dhm/course_update_bugs 
POST requests were claiming request.method == 'PUT'
 2013-07-19 08:56:01 -07:00