Chris Dodge
|
d80c834095
|
catch when users empty out a section name. don't allow them to do that.
|
2012-10-18 21:27:45 -04:00 |
|
chrisndodge
|
a00275acb8
|
Merge pull request #938 from MITx/fix/cdodge/pre-push-tweeks
Fix/cdodge/pre push tweeks
|
2012-10-18 18:17:07 -07:00 |
|
Chris Dodge
|
8ad26fc27e
|
replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not.
|
2012-10-18 21:11:46 -04:00 |
|
Victor Shnayder
|
cda5e1a40e
|
Merge pull request #937 from MITx/victor/hotfix/unicode-in-code
Catch unicode errors in contextualize_text and deal with them.
|
2012-10-18 18:11:29 -07:00 |
|
Chris Dodge
|
50e545185f
|
do a back-end check on remove_user to make sure caller does not remove him/herself
|
2012-10-18 21:00:33 -04:00 |
|
Victor Shnayder
|
1806699f26
|
typos
|
2012-10-18 20:25:52 -04:00 |
|
Victor Shnayder
|
5177e8c656
|
Catch unicode errors in contextualize_text and deal with them.
|
2012-10-18 20:23:49 -04:00 |
|
David Ormsbee
|
2e03a4846c
|
Merge pull request #935 from MITx/feature/rocha/cengage-press-release
Add Cengage book press release
|
2012-10-18 11:55:02 -07:00 |
|
David Ormsbee
|
bb3046bdc7
|
Merge pull request #897 from MITx/feature/dave/email_bugfixes
Login/Profile changes
|
2012-10-18 11:54:35 -07:00 |
|
Carlos Andrés Rocha
|
2f7733ede0
|
Add Cengage book press release
|
2012-10-18 14:45:42 -04:00 |
|
David Ormsbee
|
9fbdeeb6c6
|
Send email change notice email to both old and new email addresses.
|
2012-10-18 14:36:52 -04:00 |
|
David Ormsbee
|
ea8b9577ce
|
Email wording changes based on Sarina's review
|
2012-10-18 14:28:15 -04:00 |
|
David Ormsbee
|
0dee2e9233
|
resend the same activation link instead of a new one when someone who is not active tries to log in
|
2012-10-18 13:33:14 -04:00 |
|
David Ormsbee
|
491f10d1bf
|
Merge branch 'master' into feature/dave/email_bugfixes
|
2012-10-18 12:23:09 -04:00 |
|
David Ormsbee
|
3385e06304
|
As per code review, added note that accept_name_change is no longer being used.
|
2012-10-18 12:22:44 -04:00 |
|
David Ormsbee
|
dbfa7bf03a
|
Change email change success notice to say email instead of name
|
2012-10-18 12:20:52 -04:00 |
|
chrisndodge
|
556bb61c7e
|
Merge pull request #934 from MITx/fix/cdodge/remove-add-user-permission
remove the add users button if logged in user is just staff member
|
2012-10-18 07:42:35 -07:00 |
|
Chris Dodge
|
9c1b599505
|
remove the add users button if logged in user is just staff member
|
2012-10-18 10:41:26 -04:00 |
|
Chris Dodge
|
1905f5aeaf
|
fix variable names in date/time input parsing utility
|
2012-10-18 10:16:40 -04:00 |
|
Chris Dodge
|
236d37b276
|
EDITOR_ROLE_NAME -> STAFF_ROLE_NAME
|
2012-10-18 10:00:08 -04:00 |
|
chrisndodge
|
c112e5077e
|
Merge pull request #930 from MITx/bug/lyla/templates
Bug/lyla/templates
|
2012-10-17 18:14:48 -07:00 |
|
chrisndodge
|
2adf614267
|
Merge pull request #933 from MITx/fix/cdodge/disable-view-live-no-public-units
hide 'View Live' button if no units have been published
|
2012-10-17 13:18:37 -07:00 |
|
Chris Dodge
|
1a6845b07f
|
optimize slightly, allow caller to pass in the list of units in a subsection, so we don't have to refetch
|
2012-10-17 16:17:52 -04:00 |
|
Chris Dodge
|
a88bb7caf3
|
hide 'View Live' button if no units have been published
|
2012-10-17 16:08:16 -04:00 |
|
chrisndodge
|
5013ee3441
|
Merge pull request #931 from MITx/feature/cas/tomg/embed-links
Feature/cas/tomg/embed links
|
2012-10-17 12:34:03 -07:00 |
|
chrisndodge
|
24faac4f9d
|
Merge pull request #929 from MITx/feature/cas/tomg/bigger-sign-up
Polished sign up
|
2012-10-17 12:33:17 -07:00 |
|
chrisndodge
|
64caf51423
|
Merge pull request #932 from MITx/feature/cdodge/edit-section-info
Feature/cdodge/edit section info
|
2012-10-17 12:32:20 -07:00 |
|
Chris Dodge
|
6047aae9fb
|
get basics of set section date time. Need to pass to Tom for some styling considerations
|
2012-10-17 15:28:34 -04:00 |
|
Tom Giannattasio
|
005cf66e2e
|
removed box shadow on embed xmls
|
2012-10-17 15:20:03 -04:00 |
|
Tom Giannattasio
|
a91a19e7a8
|
adjustments for newly inserted assets
|
2012-10-17 15:12:50 -04:00 |
|
Tom Giannattasio
|
e9b42d7a15
|
added embeddable xml input text to modal
|
2012-10-17 15:10:06 -04:00 |
|
Tom Giannattasio
|
edacd22c16
|
added xml embed text field to table
|
2012-10-17 15:07:44 -04:00 |
|
Lyla Fischer
|
374413a012
|
Merge branch 'cas' into bug/lyla/templates
|
2012-10-17 14:32:37 -04:00 |
|
Lyla Fischer
|
094382d588
|
added solutions and basic metadata to templates
|
2012-10-17 14:30:31 -04:00 |
|
Lyla Fischer
|
b0e62b08fa
|
added solutions and basic metadata to templates
|
2012-10-17 14:28:47 -04:00 |
|
Chris Dodge
|
2fd86bd783
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/edit-section-info
|
2012-10-17 13:49:16 -04:00 |
|
chrisndodge
|
6011d6d333
|
Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks
improvements on asset upload refresh. Now we don't need to refresh the w...
|
2012-10-17 10:47:47 -07:00 |
|
Chris Dodge
|
82e77a26c6
|
add mustache.js to common static repo
|
2012-10-17 13:47:07 -04:00 |
|
Chris Dodge
|
60cf22e4b2
|
work in progress: set start date
|
2012-10-17 13:46:40 -04:00 |
|
Tom Giannattasio
|
4772bf68d6
|
transition added to log in button
|
2012-10-17 12:55:53 -04:00 |
|
Tom Giannattasio
|
a961ac9331
|
more prominent log in link on sign up form
|
2012-10-17 12:51:48 -04:00 |
|
Tom Giannattasio
|
fed5a12b92
|
reworked log in page to emphasize sign up
|
2012-10-17 12:45:45 -04:00 |
|
Chris Dodge
|
90861c22d0
|
improvements on asset upload refresh. Now we don't need to refresh the whole page, just insert the table tow
|
2012-10-17 12:26:56 -04:00 |
|
chrisndodge
|
b76556b932
|
Merge pull request #926 from MITx/fix/cdodge/asset-upload-tweeks
fix/cdodge/asset-upload-tweeks
|
2012-10-17 07:35:23 -07:00 |
|
Chris Dodge
|
5964ecc70c
|
remove work in progress regarding convert datetime to localtime
|
2012-10-17 10:34:23 -04:00 |
|
Chris Dodge
|
170694e580
|
fix/cdodge/asset-upload-tweeks
|
2012-10-17 10:31:18 -04:00 |
|
chrisndodge
|
b91f1886b1
|
Merge pull request #924 from MITx/fix/cdodge/manage-users
fix 403 error when editors visit page (make read only). Don't allow user...
|
2012-10-16 13:20:16 -07:00 |
|
chrisndodge
|
908a25d243
|
Merge pull request #925 from MITx/feature/cdodge/forgot-password
tie in 'forgot password' workflow in CAS LMS
|
2012-10-16 13:19:47 -07:00 |
|
Chris Dodge
|
554f179957
|
tie in 'forgot password' workflow in CAS LMS
|
2012-10-16 16:18:21 -04:00 |
|
Chris Dodge
|
ed2febe44e
|
fix 403 error when editors visit page (make read only). Don't allow user to remove him/herself. Rewire up the remove user callback.
|
2012-10-16 13:17:41 -04:00 |
|