Commit Graph

631 Commits

Author SHA1 Message Date
Jacob Fugal f86aacc138 don't list groups from inactive enrollments in menu
just like we hide inactive enrollments from the "Courses" menu, also
hide groups from courses that don't have an active enrollments in the
groups portion of the "Courses & Groups" variation of the menu

fixes #5797

Change-Id: I91a9fd742b04faab5d97793b6baa17409a4f043a
Reviewed-on: https://gerrit.instructure.com/5901
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-30 10:18:18 -06:00
Zach Pendleton ec1a042a5e show course name with group in conversations search. fixes #5795
Change-Id: I091fea931eba141aabe5c044ad06c8cdd3368415
Reviewed-on: https://gerrit.instructure.com/5907
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-30 08:17:18 -06:00
Cody Cutrer 72211da90b clear out tables from plugins when running specs
Change-Id: I87484e3feaa841a648449988b6226f39815e98a6
Reviewed-on: https://gerrit.instructure.com/5905
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-29 15:36:42 -06:00
Ryan Florence 57106feb37 Adjusted spec to get all courses in the menu
Change-Id: I9b227b0dfd515fec5ffb505cee2990d47f3f2cf0
Reviewed-on: https://gerrit.instructure.com/5888
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-09-28 15:10:04 -06:00
Jon Jensen bed2875b72 fix help dialog in speedgrader, closes #5695
Change-Id: I2f84e8bc2296beb5aa1c33359de538690fdb8487
Reviewed-on: https://gerrit.instructure.com/5890
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-28 15:08:23 -06:00
Bryan Madsen 4f86bc3bb6 finish selenium tests for sales demonstrations
Change-Id: Ieaa32fbb6dfa448d6051643336d4696e367d0c9a
Reviewed-on: https://gerrit.instructure.com/5435
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2011-09-28 12:34:28 -06:00
Brian Palmer 33faf34207 include the port in BLTI Oauth request if it's non-standard
Thanks to Gabe O'Brien for the initial patch

Change-Id: I0b589e9cceb531607b8609d71f6da3687829a116
Reviewed-on: https://gerrit.instructure.com/5883
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-28 11:41:27 -06:00
Ryan Shaw 6db73cb3ca revert spec back to how it was, it was good as is.
Change-Id: I391c1220997e16d414cd7799f4c9425006995a18
Reviewed-on: https://gerrit.instructure.com/5881
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
2011-09-28 11:37:06 -06:00
Ryan Florence f5cdcc8fde Updated spec for issue #5112, codecogs images
Change-Id: Id50049594bf626077b63b10ea8c8ddfe104fd894
Reviewed-on: https://gerrit.instructure.com/5868
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-27 16:45:28 -06:00
JT Olds 02e4132107 refactor sticky sis fields
Change-Id: I1cddc633b11b8937f8a3b36c2fa0a00d4d75b513
Reviewed-on: https://gerrit.instructure.com/5745
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-27 16:34:37 -06:00
Jon Jensen b3cd35662e assignment-level turnitin settings, closes #4938
Change-Id: I036391d450eed4ebe81e98ee8d0f106a26c164c3
Reviewed-on: https://gerrit.instructure.com/5802
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-27 16:02:01 -06:00
Jon Jensen d48772c40b fix attr() regression in jquery 1.6.4
this should be in the next jquery release. applied the fix from
2931fa875f

Change-Id: Ie3aa32fc829c5486bae3507ddeae02a6bfc461be
Reviewed-on: https://gerrit.instructure.com/5871
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-27 15:44:23 -06:00
Ryan Shaw 5125efc4f6 fix speedGrader spec, ensure right student is visible
Change-Id: I83a165982062f5e4ac8a2309e3cda1d0c95ab89b
Reviewed-on: https://gerrit.instructure.com/5872
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2011-09-27 15:29:04 -06:00
Cody Cutrer 51d48f874b avoid comparing ids directly for Authlogic internal stuff
some plugins might change how authlogic works, but we'll still be
able to find the Pseudonym itself

Change-Id: Ib88d583a124d47249555cae12610684c3abecc69
Reviewed-on: https://gerrit.instructure.com/5863
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-27 14:53:45 -06:00
Jacob Fugal 3563529ddd remove special group name from manage_groups.js
Change-Id: I3a8e554a4148831550450109bafcc1df674aad70
Reviewed-on: https://gerrit.instructure.com/5763
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-27 12:59:33 -06:00
Jacob Fugal 530c5e1bdc group_category_name
wrap Assignment#group_category and Group#category accessors as
Assignment#group_category_name and Group#group_category_name accessors,
respectively, in order to make naming consistent and free up the field
"group_category" for a new association.

Change-Id: Ieb926088d96ebb8b46f70768a77b82fa1dcc8817
Reviewed-on: https://gerrit.instructure.com/5761
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-27 12:58:50 -06:00
Ryan Florence 07a27a2243 Fixes #5112 - Proxy codecogs image urls
Change-Id: I7e2a10a8f18bbbab3244eb3eabfa2fe75b27d1ea
Reviewed-on: https://gerrit.instructure.com/5825
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-09-27 12:32:34 -06:00
Brian Palmer 60aa7baf5e add encoding magic comments to files with utf-8 chars
Change-Id: Ieba9245724da8aeeb816d7f178bb704b3dcda80f
Reviewed-on: https://gerrit.instructure.com/5832
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 10:27:35 -06:00
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 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
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
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
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
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
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
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
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
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
JT Olds 9016452480 handle nil sis_communication_channels appropriately
refs sis batch id 8860, error report 2538380

Change-Id: I6576ee0a38fc163e88746d753ddd3400b54f21c9
Reviewed-on: https://gerrit.instructure.com/5712
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-17 15:06:43 -06:00
Brian Palmer 9853a019b4 fix identity partial when no current user
Change-Id: I8202a6fca5fc8ed135da2e322d037b2b27b2280d
Reviewed-on: https://gerrit.instructure.com/5709
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-17 09:15:05 -06:00
Brian Palmer 829f7f79a7 api attachment_json improvements, fixes #5642
* correctly return attachments with Assigment contexts
 * filter out nil responses from attachment_json

Change-Id: I8c6df46d47ab817bc9d7771257aef9212471e392
Reviewed-on: https://gerrit.instructure.com/5681
Reviewed-by: BJ Homer <bj@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-16 14:15:59 -06:00