Ibrahim Awwal
f6ee08271d
Ensure that js files are returned in alphabetical order by django-pipeline.
...
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
2012-08-31 15:25:07 -07:00
David Ormsbee
50f4fae955
Merge pull request #532 from MITx/feature/bridger/new_wiki
...
Updated django-wiki to better handle relative wiki links.
2012-08-23 07:39:33 -07:00
Bridger Maxwell
07eead2349
Updated django-wiki to better handle relative wiki links.
2012-08-23 10:11:31 -04:00
Arjun Singh
d1a8cd3f65
Limiting depth of comments
2012-08-23 04:50:03 -07:00
David Ormsbee
8e560688ae
Merge pull request #516 from MITx/feature/fix_backbone_js
...
Feature/fix backbone js
2012-08-22 21:21:59 -07:00
David Ormsbee
af079a9362
Fix coffee includes for discussion forum.
2012-08-23 00:19:55 -04:00
David Ormsbee
cdc8e02aeb
Add discussion coffee scripts to courseware js so we don't add a dependency on Backbone to non-courseware JS
2012-08-22 23:34:03 -04:00
David Ormsbee
4e7ba6e651
Merge pull request #513 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-22 20:18:36 -07:00
Bridger Maxwell
9cd69e6ccd
Added ability for staff users to moderate an article.
2012-08-22 20:03:30 -04:00
David Ormsbee
3b24ae1068
Merge pull request #501 from MITx/kimth/autodisable-syllabus
...
Dynamically disable syllabus per-course
2012-08-22 13:15:24 -07:00
David Ormsbee
c86ee73bd8
Merge pull request #504 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-22 13:13:33 -07:00
Bridger Maxwell
a694d1034e
We use django-wiki's built-in wikilinks markdown extension. They were clashing.
2012-08-22 15:57:44 -04:00
kimth
f46607710f
Merge master
2012-08-22 15:25:07 -04:00
kimth
64788a73aa
Remove ENABLE_SYLLABUS flag from envs/common
2012-08-22 15:22:58 -04:00
Calen Pennington
82bab71ccf
First pass at branding the header logo on subdomains
2012-08-22 14:05:19 -04:00
Bridger Maxwell
9162bdb1b9
Changed wiki setting so article owners can't change permissions.
2012-08-21 23:06:45 -04:00
Bridger Maxwell
214fb9185d
Disabling anonymous wiki access until styling supports it.
2012-08-21 18:42:20 -04:00
Bridger Maxwell
1e068b6a4a
Disabled wiki attachments.
2012-08-21 18:01:51 -04:00
Victor Shnayder
2c19d01441
Merge pull request #479 from MITx/feature/arjun/syllabus
...
Adding a syllabus page (accessible via course navigation)
2012-08-21 14:33:07 -07:00
Arjun Singh
b86fbdbd10
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:23:00 -07:00
Calen Pennington
dca434ad34
Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate
...
add gitreload to lms-migration code
2012-08-21 12:52:52 -07:00
Arjun Singh
99703761b0
Merge master
2012-08-21 12:01:09 -07:00
David Ormsbee
b31722bcff
Merge branch 'master' into feature/bk_forum_int
2012-08-21 12:05:06 -04:00
Arjun Singh
1cfed46d06
Adding a syllabus page (accessible via course navigation)
2012-08-21 05:47:26 -07:00
ichuang
65ea54f7e2
typo in common.py ALLOWED_GITRELOAD_IPS fixed
2012-08-20 19:23:15 -04:00
David Ormsbee
eb96497cff
Merge branch 'master' into feature/bk_forum_int
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 18:57:46 -04:00
ichuang
e3ecd22fa0
github IPs in lms.envs.common; made create_user, create_groups,
...
manage_course_groups management commands (in lms_migration)
2012-08-20 18:38:05 -04:00
Bridger Maxwell
6d30a98f0f
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-20 13:08:35 -04:00
David Ormsbee
6a05a812c3
Merge pull request #460 from MITx/kimth/multiple-fileupload
...
Kimth/multiple fileupload
2012-08-19 18:08:40 -07:00
kimth
2f63a9b403
Limit number of files that can be uploaded at once
2012-08-19 20:12:01 -04:00
Bridger Maxwell
38a9631659
Updated to use django-wiki with significantly less sql queries.
2012-08-19 17:37:58 -04:00
Rocky Duan
991bb01af4
shouldn't commit env config
2012-08-19 10:42:45 -07:00
Rocky Duan
6164c87074
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-19 10:08:00 -07:00
Rocky Duan
e49226e9e1
some refactor
2012-08-19 00:16:04 -07:00
Rocky Duan
238adb1a03
Merge branch 'master' into profile
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/templates/course_navigation.html
2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c
Merge branch 'master' of github.com:MITx/mitx into profile
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00
Bridger Maxwell
1e08164db5
Added MathJax to wiki pages.
2012-08-18 13:12:04 -04:00
Bridger Maxwell
361e409d4e
Got the tests passing!
2012-08-18 00:02:09 -04:00
Bridger Maxwell
93d15d15d0
Added markdown extensions from 6.002x
2012-08-17 17:32:44 -04:00
Bridger Maxwell
6b716c2883
Put in CodeMirror editor with inline circuits.
2012-08-17 14:32:29 -04:00
Rocky Duan
c89e290cdd
use only one conf param
2012-08-16 13:43:48 -07:00
Calen Pennington
a3b144045c
Merge pull request #427 from MITx/feature/bridger/new_wiki
...
New wiki installed from pip
2012-08-16 08:01:39 -07:00
Bridger Maxwell
c4b362ca71
Removed old path include for django-wiki.
2012-08-16 10:56:33 -04:00
Calen Pennington
3efea9cbb0
Merge pull request #425 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
Bridger Maxwell
8fb83ee33c
Added django-wiki as a submodule.
2012-08-15 23:01:06 -04:00
David Ormsbee
346d5b91a1
implement subdomain-based course displays
2012-08-15 11:53:20 -04:00
Mike Chen
b4621d0562
added QueryCountDebugMiddleware
2012-08-15 11:21:11 -04:00
Bridger Maxwell
4bc4e87a4e
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-15 11:15:21 -04:00
Victor Shnayder
2df3a6ef11
Big access control refactor
...
* All access control logic is now in access.py
* It exports a single method for general use: has_access(user, object, action)
- possible actions depend on object type (e.g. 'see_exists', 'enroll', 'staff')
* Removed DARK_LAUNCH feature flag--it is now the default behavior
* Replaced check_course with three separate more focused functions that use has_access
Minor things:
* note on using pdb in testing
* moved time parsing helper into timeparse.py
* x_modules now have a .start attribute (None if not in metadata)
2012-08-14 23:30:37 -04:00
Rocky Duan
449d665b00
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-14 17:48:08 -07:00
