Commit Graph

2000 Commits

Author SHA1 Message Date
Cody Cutrer 6e1b791d7a ignore a model from an old migration for attr_accessible check
Change-Id: I38f67b8be229b88d08c0c5f74836947705286cd1
Reviewed-on: https://gerrit.instructure.com/5846
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-27 09:39:07 -06:00
Ryan Shaw 61ac87144c add a rackup file to work with any rack-compatible server
Change-Id: I2e58e355986ded2565420b5038533e589f336963
Reviewed-on: https://gerrit.instructure.com/5525
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-27 08:52:47 -06:00
Ryan Shaw 28bf51104d Our jQueryUI patches
there is one for draggable to get our WYSIWYG editor working
and another for escaping dialog titles.

Change-Id: I2030e8bf81e75802c489f488a0bde1ea3c930b32
Reviewed-on: https://gerrit.instructure.com/5801
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-27 08:04:18 -06:00
Ryan Shaw 589fbe2fdf upgrade jquery to 1.6.4 and jquery-ui to 1.8.16
As of jQuery 1.6, the .attr() method returns undefined
for attributes that have not been set

Change-Id: Ibc2301735bb038ee2f897dfc12049012211d1620
Reviewed-on: https://gerrit.instructure.com/5452
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-09-27 08:04:02 -06:00
Brian Palmer 3dc8ecc4df don't drop sis rows if transaction timeout is reached
Change-Id: Ib6744eb6410727afbd8b86f55d379d1c126a96db
Reviewed-on: https://gerrit.instructure.com/5830
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-09-26 23:52:30 -06:00
Ryan Shaw 3266429c32 some css classes to make tables pretty
Change-Id: Idb791b38131170e9a9d67251d83beb0199c2a35d
Reviewed-on: https://gerrit.instructure.com/5789
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-26 17:27:53 -06:00
Brian Palmer fb7dec9c34 hide soon-to-be-dropped columns from activerecord, closes #5758
Whenever we create a migration that drops or renames a column, in that
same commit we need to add that column to the list in this initializer.

Then, when we deploy and restart, AR will already see the column as
removed, and we can safely run the drop migration after deploy without
any window where users will get page errors due to stale column
information.

Change-Id: I1c95fd146ac8046af579256cccf95b42f01442b7
Reviewed-on: https://gerrit.instructure.com/5823
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-26 17:08:44 -06:00
Ryan Florence 0f9d86d0d8 Added JavaScript Specs and Client-side Templates
- New rake task `rake jst:compile` to precompile
  JavaScript templates into functions.

  Add handlebars templates to app/views/jst and
  they'll get compiled to public/javascripts/jst

- New rake task `rake jasmine` and `jasmine:ci` to
  run JavaScript specs.

  Add specs to spec/coffeescripts and they'll get
  compiled into spec/javascripts

- Added Guard gem `$ guard` that watches
  coffeescript and handlebars files and compiles
  them when changes are made.

- Created Handlebars Ruby class that precompiles
  the templates into JavaScript functions

- Added JS Template constructor to abstract
  our tempting API



Change-Id: Ie993d0fc50d49b161ed94dbc066c4475cefdc427
Reviewed-on: https://gerrit.instructure.com/5813
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-09-26 16:49:18 -06:00
Ryan Florence e85e98cb25 Better "Courses" menu, updated sort, count, etc.
* Doesn't display enrollments with identical
  created_at and updated_at fields (SIS garbage)

* Always displays "See all Courses" link with a
  count of all current enrollments.

* No more duplicate links to /courses, i.e.
  "... and 12 more" "See all enrollments"

* Displays 12 instead of 8

* Sorts alphabetically after sorting by
  rank_sortable and state_sortable

* Moved the logic out of the view into the user
  model and some helpers

Change-Id: Ibcd274cae8e192585ad77f1bad6e0b54da041c8b
Reviewed-on: https://gerrit.instructure.com/5822
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-26 16:48:58 -06:00
Jacob Fugal 16f6757044 s/access/participate in/
enrollment restriction by end-date only prevents adding new submissions,
posts, etc. to the course; students can still access other read-only
aspects of the course.

fixes #5759

Change-Id: I41d0ac8d375471744e49082deb72476b1e2d9803
Reviewed-on: https://gerrit.instructure.com/5827
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-26 15:48:49 -06:00
Bryan Madsen d259963460 enable parallelization of selenium tests
Change-Id: I2cbe3f19df3df1442a45479337607bb829b54188
Reviewed-on: https://gerrit.instructure.com/5739
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-09-26 15:45:35 -06:00
Cody Cutrer 801d9b2778 remove unused sis_data columns
Change-Id: I43ebd24cb76181b1dfb885d1ace5f89cb9b9978b
Reviewed-on: https://gerrit.instructure.com/5807
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-09-26 13:44:05 -06:00
Ryan Shaw 7cf4cd7c2d throttle js error reports to 1 per 5 secs.
and ignore more scribd errors

fixes #39274

Change-Id: Ie1ebcd4dd9e004f65d8fee68d97b2ffb377a5d22
Reviewed-on: https://gerrit.instructure.com/5820
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-26 13:09:36 -06:00
Jacob Fugal c7f11399a2 eportofolio verifier behavior needs :session_affects_permissions
fixes #5756

Change-Id: I06e7e408c697853f538eca44a1dd0ee7eca7e03f
Reviewed-on: https://gerrit.instructure.com/5816
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-26 13:04:25 -06:00
Zach Wily 45da003382 be sure to always look up media objects correctly to support migrated content
Change-Id: I69d18407e08b38c6f3d320908485eb65c209cac6
Reviewed-on: https://gerrit.instructure.com/5811
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-26 12:26:13 -06:00
JT Olds 006cde7157 new generic-format importer classes
notable changes:
 * nothing is processed as a sis-import blocking error now. bad imports now
   result in warnings, while just skipping bad data
 * we no longer check for duplicates before going to the database

Change-Id: Iedc96b29d92caccdc6a71ae1de8100a1c82dd137
Reviewed-on: https://gerrit.instructure.com/5724
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-26 11:24:58 -06:00
Zach Pendleton ba7e01e60e display "no messages" message on empty filter. fixes #5493
Message that displays when a filter matches no messages only
displays when there are no <li> elements in the $conversation_list
element. The ajax spinner is stored in an <li> though, so
this condition is never met.

Fix is to add a :not filter on the spinner <li>'s ID to the
test.

Change-Id: I97cd0d9a7e707117489be837d8e3c449e76db153
Reviewed-on: https://gerrit.instructure.com/5656
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-23 17:50:02 -06:00
Zach Pendleton 8076a96d01 hide "show attendance column" option in current gradebook.
Change-Id: Iaa0a3f7c958d937a3e7a3f76148105520ca51913
Reviewed-on: https://gerrit.instructure.com/5787
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-09-23 17:04:33 -06:00
Ryan Shaw ab40ccd58a add noButton option to kyleMenu
Change-Id: Iea2c778a2eb8628ac2b6a52021e6fa8559c51855
Reviewed-on: https://gerrit.instructure.com/5753
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-23 15:56:27 -06:00
Jon Jensen ebe110a90d fix dashboard conversation render bug
Change-Id: I42d94a5a58993c92265bf22f31a29589d698206a
Reviewed-on: https://gerrit.instructure.com/5795
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-09-23 14:45:48 -06:00
Ryan Shaw 63bc6b1699 css3 transitions only if support transitionEnd event
Change-Id: Ibd7402637d2f59cd335d856f3e82393be6e7aaa6
Reviewed-on: https://gerrit.instructure.com/5756
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-23 14:23:09 -06:00
Ryan Shaw b5de5975e1 use async version of google analytics
Change-Id: I397b7c0644ffca1ad41518eb6f7e411972982ae3
Reviewed-on: https://gerrit.instructure.com/5754
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-23 14:10:03 -06:00
Ryan Shaw 4b511be6e5 track ajax response times in google analytics
Change-Id: I989846fcd2b7f6feabf1a2a78be9c84469df201c
Reviewed-on: https://gerrit.instructure.com/5755
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-23 14:06:07 -06:00
Bracken Mosbacker 1b05087175 some common cartridge tweaks to accomodate another vendor
* replace backslashes in file paths with forward slashes
 * remove empty namespace declarations in weblink documents
 * create a misc top-level module for top-level items

refs #4153

Change-Id: I7c4c8763f58c86519a17280e2d38895c3219d258
Reviewed-on: https://gerrit.instructure.com/5770
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-23 13:28:10 -06:00
Bracken Mosbacker 349eacb763 add assessment importing to common cartridge importer
refs #4153

Change-Id: I60a4e8d88f8d121f8b928564f257819b3bca1d26
Reviewed-on: https://gerrit.instructure.com/5726
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:28:03 -06:00
Bracken Mosbacker 169e54d87b added blti links to cc importer
Also had to change the export/importing of blti links
from canvas

refs #4153

Change-Id: Iae2d6e9c677d310d7e824fa78885c8aca2c1af83
Reviewed-on: https://gerrit.instructure.com/5703
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:27:54 -06:00
Bracken Mosbacker 58dcf16c92 add links and discussions to cc importer
This also fixed some problems with the web content
part of the importer and made the spec run the full
migration from a cc package

refs #4153

Change-Id: I1700043b578fe79586104cf13b260c78c3166194
Reviewed-on: https://gerrit.instructure.com/5702
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:27:47 -06:00
Bracken Mosbacker d6a02307cb added an import package identifier
This will allow a UI where the user doesn't need to identify
the type of package they're uploading. For now it's only used
for common cartridge/canvas cartridge packages.

refs #4153

Change-Id: I2488777316660c9af60f544884429de7355f358f
Reviewed-on: https://gerrit.instructure.com/5701
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:27:28 -06:00
Bracken Mosbacker 81a10db574 moved migration classes into a proper namespace
refs #4153

Change-Id: I08035c5e6439d46c8ca61fb9409b1c2972567933
Reviewed-on: https://gerrit.instructure.com/5700
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-23 13:27:16 -06:00
Bracken Mosbacker bfb4378490 move canvas-specific import code into its own namespace
refs #4153

Change-Id: Id09baee420203ba6a6d723e9096168d9968af7c2
Reviewed-on: https://gerrit.instructure.com/5699
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:10:34 -06:00
Bracken Mosbacker 0db446b9f4 start standard common cartridge importing
refs #4153

Change-Id: I2e1048b94261a3005c239fe19cafb1b3714d0161
Reviewed-on: https://gerrit.instructure.com/5698
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:10:28 -06:00
Ryan Shaw 502fece07f allow uploading gradebook csv with just sis_id
you only need one of the following:
Student Name, ID, SIS User ID, SIS Login ID
per row in the gradebook csv uploads

fixes: #5725

Change-Id: Ic5785d14b146d68603654beba122ca1f73cd9c1e
Reviewed-on: https://gerrit.instructure.com/5771
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-23 10:22:53 -06:00
Brian Palmer bd50cd6f82 tomorrow_at_midnight: return midnight in the set TZ
Change-Id: I9d11a84cc03ababb0c83dc7c43d553da17e7c63c
Reviewed-on: https://gerrit.instructure.com/5791
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-23 08:57:36 -06:00
Jon Jensen 0a32371e13 fix conversation paging regression
Change-Id: I08a2758c4dd6a575327aa18c2d0342a23d687454
Reviewed-on: https://gerrit.instructure.com/5786
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-09-22 16:35:32 -06:00
Zach Pendleton 488da4fd2e only display undeleted messages in dashboard. fixes #5460
Stop storing recent messages in conversation stream, as streams
don't exist on user level and so can't reflect user differences
in deleted messages.

Change-Id: I4750f7c58bf80e9f06060eb089fe83cfc5668d2b
Reviewed-on: https://gerrit.instructure.com/5646
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-22 15:35:32 -06:00
Cody Cutrer c330df960a when adding new admin users, create them in the target account
(note that this is the only place that assert_by_email is used)

Change-Id: I5ed8985a5a84940e50b403b3753f9102bad23164
Reviewed-on: https://gerrit.instructure.com/5772
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-22 10:06:39 -06:00
Cody Cutrer 2a1ede6f71 locking of discussion topics closes #5417
Change-Id: I6ff2f4c1347c115ed96048de59f695c8b2ff80f2
Reviewed-on: https://gerrit.instructure.com/5328
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-09-22 09:10:27 -06:00
Brian Palmer 3115001a13 user_json when the user has no pseudonym, fixes #5489
Change-Id: I24a44f0a717aa7efeb906c4381ca7a9ea5989a0d
Reviewed-on: https://gerrit.instructure.com/5760
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-09-21 15:47:44 -06:00
Brian Palmer 09d8f54763 handle the new sis id columns in gradebook csv uploads
fixes #5597

Change-Id: I9b817c2789db256c740ef9cab7538d0ac6d36a33
Reviewed-on: https://gerrit.instructure.com/5757
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-21 13:09:07 -06:00
Jon Jensen c96f4d5ce7 fix initial conversation attachment sending, closes #5606
Change-Id: I045c17f307f91a9e4efc11d01499ad6b6bb10b70
Reviewed-on: https://gerrit.instructure.com/5749
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-09-21 11:44:12 -06:00
Cody Cutrer 29bf7b2e5a allow specifying the account for the pseudonym in a spec
Change-Id: Ia59c34f5d609ad899d12e06f3011b52e1468c1f1
Reviewed-on: https://gerrit.instructure.com/5750
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-09-21 11:28:39 -06:00
Jon Jensen 26d1fc43b8 show all courses/groups in browse mode, fixes #5674
Change-Id: Ie417757d4a5ed5f2d03d16984bcea1b14db8c279
Reviewed-on: https://gerrit.instructure.com/5747
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-09-21 11:06:01 -06:00
Jon Jensen 9f2afe054c fix conversation attachments in IE, closes #5700
Change-Id: Ie6bedbe266ef6e49b825adab0b0bb635e1ccd919
Reviewed-on: https://gerrit.instructure.com/5746
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-09-21 11:05:47 -06:00
Jon Jensen 39d3f80201 fix cache key for discussion group assignments, fixes #5609
Change-Id: I4e406e356e03d553b1707a73d0993c41693e33f8
Reviewed-on: https://gerrit.instructure.com/5740
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-21 08:46:03 -06:00
Mark Suman 48d14d7dc0 Update services api doc to match the code.
A slight change was made during code review and the doc was not
updated to reflect the change.

Change-Id: Iebb71b672296487677063aa28c81e865e69d1ade
Reviewed-on: https://gerrit.instructure.com/5744
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-21 08:39:17 -06:00
Ryan Florence 3836692417 Fixes #5200 - FireFox Keyboard Shortcuts Popup
Firefox sends 191 for / like it should until the
shift key is pressed, then it sends 0.  Mapped
0 to 191 (will cause < and > and perhaps some
other keys to also pull up the dialog.  Same
behavior can be found on github).

Change-Id: I1759132f2b628dc40f15f5d1b778b7769d6446e4
Reviewed-on: https://gerrit.instructure.com/5722
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-20 16:05:43 -06:00
Cody Cutrer 483786ba7e fix the -and-a-half of precalculated account associations importing enrollments
Change-Id: Ia783d496c34ff3000402108c64eca55b811b94de
Reviewed-on: https://gerrit.instructure.com/5721
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-09-20 11:21:30 -06:00
BJ 77acc305f1 Remove a literal "<br/>" in fill in the blank quiz description. Fixes #5681.
Change-Id: I25088579e309d12c2713556684b53f96d9b74949
Reviewed-on: https://gerrit.instructure.com/5729
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-20 11:17:23 -06:00
Zach Pendleton 2dd233c520 save user answers for _fill_in_the_blank questions. fixes #5376
now properly fills in saved user answers for multiple fill
in the blank questions when the user closes and re-opens
the browser.

Change-Id: I48d41f4cd2564feef9e99449132c45f72c425d06
Reviewed-on: https://gerrit.instructure.com/5654
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-09-20 10:17:45 -06:00
Zach Pendleton 8734aa75c4 fixed typo in file/folder delete popup. fixes #5416
Change-Id: Icabd1f3e6bbda1ae1087e01bc9ee69bd946daefa
Reviewed-on: https://gerrit.instructure.com/5623
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-20 10:16:59 -06:00