Commit Graph

2000 Commits

Author SHA1 Message Date
JT Olds ba64a08d4a handle grade result passback when there is either no course or section
Change-Id: I7d20b373e93fc4a9703434a9eab3fc718735df66
Reviewed-on: https://gerrit.instructure.com/5865
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-30 10:35:56 -06:00
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
Jacob Fugal 5ecdfa444f https => http was an accident
Change-Id: I4dc02758171dac8a32e195a61aebb80be960a0e7
Reviewed-on: https://gerrit.instructure.com/5926
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jacob Fugal <jacob@instructure.com>
2011-09-29 16:41:12 -06:00
Jacob Fugal 7dd98cb064 fix google docs integration
use src from <content> element to download, instead of constructing our
own url (fragile!). also, use https instead of http.

Change-Id: I9e2ca48558b63522bc730309d64411208ad92f9c
Reviewed-on: https://gerrit.instructure.com/5922
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jacob Fugal <jacob@instructure.com>
2011-09-29 16:15:58 -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 Shaw 936eb1825c move js that is not ours to vendor
Change-Id: Idcf07b2976f2a09e4694f6a9107ac8a9f511a341
Reviewed-on: https://gerrit.instructure.com/5886
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-29 12:53:43 -06:00
Ryan Shaw f9acb060ed upgrade compass to latest version
Change-Id: Idc2281df9d35ca8ec9713050fafd6bd1c32d0da3
Reviewed-on: https://gerrit.instructure.com/5851
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-29 12:44:23 -06:00
Ryan Shaw dc162ba5d4 plugin to convert normal buttons to dialog buttons
Change-Id: Ife3610fccbcfff25acdf1e9b2843d1f101a2c8a5
Reviewed-on: https://gerrit.instructure.com/5845
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 15:55:18 -06:00
Ryan Shaw 206a877aed add disableWhileLoading option to formSubmit
Change-Id: Ibcd13f4c79c08d72145f543c7c8eb0e4c84d6be5
Reviewed-on: https://gerrit.instructure.com/5844
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 15:54:55 -06:00
Ryan Shaw ff0b075fdc allow passing textWhileLoading to disableWhileLoading
Change-Id: I1c60db7f2222355de51fd54622b9bf8bbb4486af
Reviewed-on: https://gerrit.instructure.com/5843
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 15:54:41 -06:00
Ryan Shaw 2682d0ebbb break instructure_helper.js into smaller, modular chunks
NOTE: a previous commit tried to do this, but it
broke specs, so it was reverted

this was to introduce sanity where we don't have
one file with ~3600 lines of javascript:

* if something looked like it was worthy of its own
  plugin file, or should have been one in the first
  place, it got it. (ex: jquery.keycodes.js)
* if there were a bunch of methods that obviously
  belong together, I put them all together in their
  own file (ex: jquery.instructure_forms.js)
* all of our monkeypatching of jQuery went into one
  file so it is easier to see where that is happening
  when we choose to upgrade.
* move the remaining jQuery helpers (things like $.blah)
  into jquery.instructure_misc_helpers.js
* move remaining jQuery plugins (things like $.fn.blah)
  into jquery.instructure_misc_plugins.js

Change-Id: I2978c79299ec8b73e5e14d941c20ffe35c4bba99
Reviewed-on: https://gerrit.instructure.com/5862
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2011-09-28 15:54:01 -06:00
Zach Pendleton 38e87d73db edit quizzes with fill in multiple blank questions. fixes #5783
was receiving an error, "can't dup nil class," because
view was expecting @stored_params, which only exists while
a user is taking the quiz.

Change-Id: Ifd4c06adf562b8fabe1536cb8a0eff655c4961d6
Reviewed-on: https://gerrit.instructure.com/5897
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-28 15:40:23 -06:00
Ryan Shaw dbe7197867 fix Gaurdfile to handle nested directories
now we can have things like
app/coffeescripts/lib/myWidget.cofffee

(also changed to regex watch pattern to get rid
of deprecation warning)

Change-Id: Ia6561dcb57215b2b1b405bcd64c43d7fd2ded85d
Reviewed-on: https://gerrit.instructure.com/5894
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 15:15:03 -06:00
Ryan Shaw 44089f8ea1 pin coffee-script-source so generated code is same from all devs
Change-Id: I6b7858300250c870a15aaad80a0ab686fc817509
Reviewed-on: https://gerrit.instructure.com/5893
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 15:14:52 -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
Brian Palmer 642e47746b add recently removed columns to the list, refs #5758
Change-Id: I3a922efecc90216ab3412bdcf86d0d679ae62dd5
Reviewed-on: https://gerrit.instructure.com/5824
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-28 14:54:50 -06:00
Brian Palmer 46ffd8f35f add index to discussion_topics.assignment_id
optimizing query: SELECT * FROM `discussion_topics` WHERE (`discussion_topics`.assignment_id = xxx AND (discussion_topics.root_topic_id IS NULL))  ORDER BY created_at LIMIT 1

Change-Id: Id2f461021ae33f1466f2eee8ec66673fefb49ba7
Reviewed-on: https://gerrit.instructure.com/5895
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-28 14:54:02 -06:00
Cody Cutrer e3178db435 simplify references to enrollment for home menu
Change-Id: I78120f78853c984922af79ca7245917a0674a815
Reviewed-on: https://gerrit.instructure.com/5879
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 14:43:20 -06:00
Jon Jensen 103d3bfe31 make dialogs modal by default again
Change-Id: If8d7fa01cb5f042af3e6abf62ff15ba23b6b3f06
Reviewed-on: https://gerrit.instructure.com/5889
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2011-09-28 13:38:02 -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
Bryan Madsen 7491111db3 exclude selenium specs from rcov task
Change-Id: I88607b916ba03f16deaeed11aff91023ef57892e
Reviewed-on: https://gerrit.instructure.com/5887
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-09-28 12:02:46 -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 Shaw a3ca09d65c fix jquery button styles for current theme
they were just white, that was a mistake.
the new theme has them looking exactly like the 
new styles we are working on but this will get
them looking right now.

Change-Id: I115b84351d8afe44bfdf17e1a3758ba9e4d129e5
Reviewed-on: https://gerrit.instructure.com/5850
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-28 10:53:03 -06:00
Cody Cutrer 23edefc404 allow <environment>-local.rb to overwrite cache configuration
so that memory_store can be used in development

Change-Id: Iaa3badc732b32c0f6970a969b172aa76190e08f7
Reviewed-on: https://gerrit.instructure.com/5882
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-28 10:07:38 -06:00
Jacob Fugal 593f36991b include groups in .../files?show_all_contexts=1
get_all_pertinent_contexts takes one parameter, include_groups, which
defaults to false. fixes #5777

Change-Id: I412249a180a4325b59ee69020f675f015059c191
Reviewed-on: https://gerrit.instructure.com/5880
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-09-28 09:35:58 -06:00
Zach Pendleton 0cd325bb80 tab order working on conversations page. fixes #5372
Conversation actions links are now selected properly in the tab
order. Because moving #conversation_actions inline caused problems
re: overflow and stacking, the tab order is manipulated by JS
instead of DOM order.

Change-Id: I76050763be9e915998dbe23dcbbfa935e1ca3d08
Reviewed-on: https://gerrit.instructure.com/5644
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-28 09:32:36 -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 e749446e90 Group#student_organized?
Change-Id: Iccccefa00d7460327e9c96537ca3f187f345d773
Reviewed-on: https://gerrit.instructure.com/5764
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-27 12:59:49 -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 9bcf8d9f95 remove Account#account_groups
Change-Id: I30e98569c8c859e16ff7f158e7dff22083969762
Reviewed-on: https://gerrit.instructure.com/5762
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-27 12:59:14 -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 Shaw 0b70580e22 Revert "break instructure_helper.js into smaller, modular chunks"
also,
Revert "fix $.h regression in js refactor"

Change-Id: I8484f3871addbe15b4dfa28f8b19476f034ab33b
Reviewed-on: https://gerrit.instructure.com/5859
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-27 12:43:31 -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 471943632e AR select and order options do not take an array
This problem was hidden in 1.8 because Array#to_s is an alias for
Array#join , but manifests itself in 1.9 where it aliases Array#inspect

Change-Id: I118696cdc129f71f31997ad852d8d7c6d3ad0fc9
Reviewed-on: https://gerrit.instructure.com/5842
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 12:05:51 -06:00
Brian Palmer ead2a3344a add rails root to load path
in ruby 1.9, the load path doesn't include the current working directory

Change-Id: Ib61070da970af462dd58885477f97e83fe77b36f
Reviewed-on: https://gerrit.instructure.com/5841
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 12:04:07 -06:00
Jon Jensen 766ac9b80f fix $.h regression in js refactor
Change-Id: I2cd31798aca5464b09392c53498208d9a205f742
Reviewed-on: https://gerrit.instructure.com/5852
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-27 12:00:47 -06:00
Brian Palmer bda484aef6 use instance_exec for plugin t calls in 1.9
this matches the expected behavior of all the plugin lambda blocks,
which is that no args will be passed in

Change-Id: I60cfc3dd411d6e7b0655c8ba7307f524c9601930
Reviewed-on: https://gerrit.instructure.com/5839
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 11:03:01 -06:00
Brian Palmer 21b4db002d change some lambdas to procs
starting in 1.9.x, the number of args passed to a lambda is enforced --
procs still allow variable number of args

Change-Id: Id1a4338d10b87b870cd53989ea17ea422d848278
Reviewed-on: https://gerrit.instructure.com/5834
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 11:02:32 -06:00
Brian Palmer 0279c645d4 fix crummy return value
it was returning an array, which was being implicitly joined with #to_s.
but in 1.9, Array#to_s is an alias for Array#inspect, rather than
Array#join

Change-Id: I63f4f64b56b2edab9e5225f118716b9f6ee29d1b
Reviewed-on: https://gerrit.instructure.com/5836
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-09-27 10:29:04 -06:00
Brian Palmer 0432c66a24 remove deprecated ruby syntax
these are syntax errors in 1.9.x

Change-Id: I7cbd66643cb371e4be9f8da0365bf1e988ee5de8
Reviewed-on: https://gerrit.instructure.com/5833
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 10:28:22 -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
Ryan Shaw 5184a7f0eb break instructure_helper.js into smaller, modular chunks
this was to introduce sanity where we don't have
one file with ~3600 lines of javascript:

* if something looked like it was worthy of its own
  plugin file, or should have been one in the first
  place, it got it. (ex: jquery.keycodes.js)
* if there were a bunch of methods that obviously
  belong together, I put them all together in their
  own file (ex: jquery.instructure_forms.js)
* all of our monkeypatching of jQuery went into one
  file so it is easier to see where that is happening
  when we choose to upgrade.
* move the remaining jQuery helpers (things like $.blah)
  into jquery.instructure_misc_helpers.js
* move remaining jQuery plugins (things like $.fn.blah)
  into jquery.instructure_misc_plugins.js

Change-Id: I7ef9b39de424bb187665cacb6a96a8f869dc9994
Reviewed-on: https://gerrit.instructure.com/5524
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 09:45:48 -06:00