Skip to content
This repository
  • 1,089 commits
  • 388 files changed
  • 0 comments
  • 6 contributors
This comparison is big! We're only showing the most recent 250 commits
Feb 15, 2013
Chris Tweney CLC-1220 Move upgrade function from calcentral into its own script, a…
…nd use it from deploy.rb
41f6584
Chris Tweney CLC-1220 Warmup the app with wget instead of curl, so more assets get…
… fetched
5283712
Yu-Hung Lin Merge pull request #672 from ctweney/clc-1220-initd
CLC-1220 Move upgrade function from calcentral into its own script, and ...
607a577
Chris Tweney CLC-1220 Need to wait for all update-and-migrate jobs to finish befor…
…e starting trinidad
9a9c82a
Yu-Hung Lin Merge pull request #673 from ctweney/clc-1220-initd
CLC-1220 Capistrano fix
607996e
Scot Hacker CLC-1269 Bring back Notifications widget 7b48f13
Scot Hacker nojira: Describe usage of feature toggle in the readme 46f7cde
Chris Tweney CLC-1220 Bringing back serial-execution of Capistrano commands 1a02520
Yu-Hung Lin Merge pull request #675 from ctweney/clc-1220-initd
CLC-1220 Bringing back serial-execution of Capistrano commands
2d205ba
Yu-Hung Lin Merge pull request #674 from shacker/nojira
nojira: Describe usage of feature toggle in the readme
e115f2c
Chris Tweney CLC-1220 Reverting to YH's version of deploy, except that it calls in…
…it.d/calcentral to start/stop
1223491
Christian Vuerings Merge pull request #671 from shacker/CLC-1269
CLC-1269 Bring back Notifications widget
46ec16c
Yu-Hung Lin Merge pull request #676 from ctweney/clc-1220-initd
CLC-1220 Reverting to YH's version of deploy, except that it calls init....
f546bfb
Scot Hacker CLC-1240 Implement Status Badge Count Indicator for bApps
https://jira.media.berkeley.edu/jira/browse/CLC-1240

First pass.

- Set up a new controller on the launcher bar
- Use a new dummy badges.json to separate functionality from user profile (performance)
- It wasn't possible to have the data-bubble attribute disappear when count=0, so instead used ng-class combined with the always present data-bubble count.
- Some spacing work still needed when bubbles disappear, and need to test with 4 chars (e.g. 1.2k)
d680e6e
Christian Vuerings Merge pull request #667 from shacker/CLC-1240
CLC-1240 Implement Status Badge Count Indicator for bApps
4e5a51c
Christian Vuerings CLC-1066 - DESIGN: Add a link to Canvas LMS on the splash page cdb209e
Yu-Hung Lin [NOJIRA] Test fixes 0f64657
Scot Hacker Merge pull request #679 from christianv/CLC-1066
CLC-1066 - DESIGN: Add a link to Canvas LMS on the splash page
2e82e54
Yu-Hung Lin [NOJIRA] More test fixes ff1e2fa
Scot Hacker NOJIRA: Toggle notifications widget via erg instead (and update readme) c553da3
Christian Vuerings Merge pull request #681 from shacker/nojira
NOJIRA: Toggle notifications widget via erb instead (and update readme)
5caf893
Chris Tweney Merge pull request #680 from yuhunglin/NOJIRA7
[NOJIRA] Test fixes
9cebd9e
Chris Tweney Merge pull request #666 from christianv/CLC-1296
CLC-1296 - Remove the F I Y registration status codes from our code
fee98fb
Christian Vuerings CLC-1306 - Status badges should "grow" left rather than right fa4fee9
Yu-Hung Lin Merge pull request #682 from christianv/CLC-1306
CLC-1306 - Status badges should "grow" left rather than right
dd0c711
Chris Tweney NOJIRA Make timeshift a little quieter 0004df8
Yu-Hung Lin Merge pull request #683 from ctweney/timeshiftQuieter
NOJIRA Make timeshift a little quieter
9872b78
Scot Hacker CLC-1298 Restore/refactor Notifications API ab9e360
Feb 18, 2013
Yu-Hung Lin [CLC-1244] Act as feature bd08b94
Yu-Hung Lin [NOJIRA] Cleaner test output 714a684
Feb 19, 2013
Yu-Hung Lin [NOJIRA] Gem updates 8dab47d
Chris Tweney Merge pull request #686 from yuhunglin/GEMUPDATE1
[NOJIRA] Gem updates
fbd2580
Ray Davis CLC-1307 Do not lose merged feeds when Sakai or Canvas return 503 fd5cfbf
Chris Tweney Merge pull request #687 from yuhunglin/NOJIRA9
[NOJIRA] Cleaner test output
1312a65
Yu-Hung Lin Merge pull request #684 from shacker/CLC-1298
CLC-1298 Restore/refactor Notifications API
c0f9cae
Chris Tweney Merge pull request #688 from raydavis/raywip
CLC-1307 Do not lose merged feeds when Sakai or Canvas return 503
7811165
Scot Hacker CLC-1285 Add the collegiatelink icon 27d399b
Chris Tweney Merge pull request #689 from shacker/CLC-1285
CLC-1285 Add the collegiatelink icon
a50847c
Yu-Hung Lin [CLC-1244] Act-as feature fixes 4084850
Yu-Hung Lin [CLC-1244] Pushing seed users into migration code 124434e
Scot Hacker CLC-963 Disabled button state 8946f72
Yu-Hung Lin [CLC-1244] Merged test user flag into UserAuth table, fixed the flagg…
…ing on logging from INFO -> WARN, additional logging statements for the success state
1ecdae1
Feb 20, 2013
Chris Tweney Merge pull request #685 from yuhunglin/CLC-1244
[CLC-1244] Act as feature
bec79eb
Chris Tweney CLC-1210 Rudimentary proxy for CalLink 7b3254a
Chris Tweney CLC-1210 Add recording of fake CalLink data f58a83f
Chris Tweney CLC-1210 Add caching at CalLinkProxy level 95d0420
Chris Tweney CLC-1210 Introduce CalLink to MyGroups merged model 22e3f48
Chris Tweney CLC-1210 Proxies should not allow anon access; fix unit tests to enfo…
…rce this; fix unit tests for CalLink Groups
1126edf
Chris Tweney CLC-1210 Add testext test for CalLink proxy 9619824
Chris Tweney CLC-1210 Filter out duplicate orgs; tweak logs 44ff19e
Chris Tweney CLC-1210 Refactoring per Ray's suggestion to make CalLink and Sakai p…
…roxies more like the others; collapse SakaiCategorized into SakaiProxy
f7d9792
Yu-Hung Lin Merge pull request #690 from shacker/CLC-963
CLC-963 Disabled button state
f09417c
Feb 21, 2013
Ray Davis Merge pull request #691 from ctweney/clc-1210
CLC-1210 Proxy for CalLink groups
c3169eb
Ray Davis CLC-434 API support to check whether the user has a Canvas acccount 5f7ff53
Ray Davis CLC-434 Stub out Canvas account check for faked access e4835f0
Chris Tweney Merge pull request #692 from raydavis/raywip
CLC-434 API support to check whether the user has a Canvas acccount
958e698
Chris Tweney CLC-1301 Return nil if user exists but doesn't have a reg_status 9ec5585
Chris Tweney CLC-1301 Add test to make sure RegStatusEventProcessor won't crash on…
… a user that exists but has a nil reg_status
3ff6494
Ray Davis Merge pull request #694 from ctweney/clc-1301
CLC-1301 Fix crash in RegStatusEventProcessor
463c6ca
Chris Tweney CLC-1301 Followup - fix test that fails when real Oracle data is used 1e4f706
Ray Davis Merge pull request #695 from ctweney/clc-1301
CLC-1301 Followup - fix test that fails when real Oracle data is used
cd9a6ea
Yu-Hung Lin [CLC-1235] Exposing the bDrive badge 52adfa8
Scot Hacker CLC-1263: Add release notes from blog to splash page
https://jira.media.berkeley.edu/jira/browse/CLC-1263

Per discussion, let's merge this for now, with agreement to replace it with nokogiri or feedzirra back-end approach early next sprint.
ad1efb2
Chris Tweney Merge pull request #697 from shacker/CLC-1263d
CLC-1263: Add release notes from blog to splash page
b772fec
Chris Tweney CLC-1352 Use CollegiateLink icon in My Groups; use SakaiProxy constan…
…t instead of hardcoding 'bSpace'
b06cd07
Chris Tweney Merge pull request #696 from yuhunglin/CLC-1235
[CLC-1235] Exposing the bDrive badge
bd4e7cf
Yu-Hung Lin [CLC-1350] New google token permissions + migration script to stash a…
…way old google tokens
9e4355d
Yu-Hung Lin Merge pull request #698 from ctweney/clc-1352
CLC-1352 Use CollegiateLink icon in My Groups
d848afe
Ray Davis Merge pull request #699 from yuhunglin/CLC-1350
[CLC-1350] New google token permissions + migration script to stash away old google tokens
ef1d05e
Feb 22, 2013
Yu-Hung Lin [CLC-1356] GoogleProxy refactoring, include log statement to log prox…
…y errors to make it possible for debugging/tracking issues with proxy requests
54d8551
Ray Davis CLC-1005 Add script to install missing ungemified JARs 4c26b5e
Ray Davis CLC-1005 Run JAR-install script after Git updates a319727
Chris Tweney Merge pull request #700 from raydavis/raywip
CLC-1005 Add script to install missing ungemified JARs
8f24e4d
Chris Tweney Merge pull request #701 from yuhunglin/CLC-1356
[CLC-1356] GoogleProxy refactoring, include log statement to log proxy errors to make it possible for debugging/tracking issues with proxy requests
4d09e93
Chris Tweney CLC-1352 Add color for callink-group square b93a760
Scot Hacker CLC-1348 Implement CalCentral Settings Page Revisions 5f95024
Yu-Hung Lin [CLC-1240] Make badges feed live 229ee68
Scot Hacker nojira: Decrease height of add task / cancel buttons c909bd4
Chris Tweney Merge pull request #705 from shacker/nojira
nojira: Decrease height of add task / cancel buttons
19d11a8
Chris Tweney Merge pull request #704 from yuhunglin/CLC-1240
[CLC-1240] Make badges feed live
4b7b2ba
Scot Hacker Merge pull request #702 from ctweney/clc-1352-color
CLC-1352 Add color for callink-group square
f23dc7f
Chris Tweney Merge pull request #703 from shacker/CLC-1348
CLC-1348 Implement CalCentral Settings Page Revisions
ce50509
Scot Hacker CLC-1298 Move Notifications about Activity c596154
Chris Tweney CLC-1351 Link to as much of the CalLink URL as we can generate ourselves 18051ba
Chris Tweney Merge pull request #706 from shacker/CLC-1298
CLC-1298 Move Notifications about Activity
2bf2b58
Ray Davis Merge pull request #707 from ctweney/clc-1351
CLC-1351 Link to as much of the CalLink URL as we can generate ourselves
0bd33f0
Chris Tweney NOJIRA Bump app version for release v4 811fba1
Scot Hacker Merge pull request #708 from ctweney/v4_versionBump
NOJIRA Bump app version for release v4
927b6c8
Yu-Hung Lin [NOJIRA] Suppress noisy test logging 7f5e655
Feb 25, 2013
Yu-Hung Lin [NOJIRA] Moving spec_helper_module inside spec/support 2370b17
Chris Tweney CLC-1374 Add enough data to the BSPACE_STUDENT_TERM_VW fake table to …
…test the next iteration of academic status UI
616adc1
Ray Davis Merge pull request #709 from yuhunglin/NOJIRA
[NOJIRA] Suppress noisy test logging
26e138f
Ray Davis Merge pull request #712 from ctweney/clc-1374
CLC-1374 Add enough data to the BSPACE_STUDENT_TERM_VW fake table to tes...
ebae368
Yu-Hung Lin [CLC-1361] Stashing away email in Oauth2:app_data 3907d5f
Scot Hacker CLC-1353 Convert Release Notes RSS parser to back-end process 94c1c7a
Feb 26, 2013
Chris Tweney Merge pull request #714 from shacker/CLC-1353
CLC-1353 Convert Release Notes RSS parser to back-end process
8293ba6
Chris Tweney CLC-1327 Fail more obviously if postgres or Oracle go down 04822e0
Scot Hacker CLC-1353 Add require 'open-uri' to blog_feed 8713994
Chris Tweney Merge pull request #718 from shacker/CLC-1353b
CLC-1353 Add require 'open-uri' to blog_feed
8461f00
Ray Davis Merge pull request #717 from ctweney/clc-1327
CLC-1327 Fail more obviously if postgres or Oracle go down
41af036
Chris Tweney CLC-1365 Get more log info into cache log 919e962
Scot Hacker CLC-1168 Show time as well as date on Canvas tasks e99f6da
Chris Tweney CLC-1380 Add user's staff/faculty/student role to status feed 281b43a
Scot Hacker nojira: Streamline bucketizing of connected services in angular setti…
…ngs controller
5fcf677
Feb 27, 2013
Christian Vuerings Merge pull request #724 from shacker/nojira
nojira: Streamline bucketizing of connected services in angular settings...
61e7e98
Christian Vuerings Merge pull request #722 from shacker/CLC-1168
CLC-1168 Show time as well as date on Canvas tasks
d1aee03
Yu-Hung Lin [CLC-1361] Back out changes on .gitignore a31cd78
Yu-Hung Lin Merge pull request #720 from ctweney/clc-1365
CLC-1365 Get more log info into cache log
d1515d4
Christian Vuerings NOJIRA - top align blog header with date b9685bf
Yu-Hung Lin Merge pull request #723 from ctweney/clc-1380
CLC-1380 Add user's staff/faculty/student role to status feed
96d2734
Yu-Hung Lin Merge pull request #725 from christianv/lineheightblog
NOJIRA - top align blog header with date
1eb7f1d
Christian Vuerings CLC-1355 - Light grey is darker than medium grey 6f884b9
Scot Hacker Merge pull request #726 from christianv/CLC-1355
CLC-1355 - Light grey is darker than medium grey
a921b79
Ray Davis Merge pull request #713 from yuhunglin/CLC-1361
[CLC-1361] Stashing away email in Oauth2:app_data
5a73001
Scot Hacker CLC-1353 Expose blog feed as API endpoint
https://jira.media.berkeley.edu/jira/browse/CLC-1353
Conflicts:

	app/assets/stylesheets/_splash.scss
77292e5
Scot Hacker CLC-1353 Restore extraction of single blog entry in back-end RSS parser fc015d7
Scot Hacker CLC-1353 Refactor blog feed parser to not use instance variable syntax d5928d0
Chris Tweney Merge pull request #721 from shacker/CLC-1353c
CLC-1353 Expose blog feed as API endpoint
5051778
Chris Tweney CLC-1365 Centralize setting of race_condition_ttl and make it a bit l…
…onger
f63af6a
Chris Tweney CLC-1365 Make proxies all have independently configurable cache expir…
…ation times
791b8dc
Chris Tweney CLC-1365 Set expiration for BlogFeed 105b38f
Scot Hacker CLC-1386 Eli's UID is misconfigured for the Act As feature 6a15bd1
Chris Tweney Merge pull request #728 from shacker/CLC-1386
CLC-1386 Eli's UID is misconfigured for the Act As feature
61e931b
Chris Tweney CLC-1386 Master branch fix incorrect migration ID 5a68261
Scot Hacker Merge pull request #730 from ctweney/clc-1386-master
CLC-1386 Master branch fix incorrect migration ID
584e114
Chris Tweney CLC-1386 Master branch addendum - allow Eli fix to run more than once…
… without exploding
9e0f3ae
Yu-Hung Lin Merge pull request #732 from ctweney/clc-1386-master
CLC-1386 Master branch addendum
bf10245
Scot Hacker nojira: Document "Act As" in readme 6d0ec59
Yu-Hung Lin Merge pull request #733 from shacker/nojira
nojira: Document "Act As" in readme
5bb683b
Scot Hacker nojira: Add stop_act_as to readme 429e30a
Yu-Hung Lin Merge pull request #734 from shacker/nojira2
nojira: Add stop_act_as to readme
466420f
Feb 28, 2013
Christian Vuerings CLC-1388 [Front-end] Implement "The Campus" designs 5bb3cd8
Scot Hacker Merge pull request #735 from christianv/CLC-1388
CLC-1388 [Front-end] Implement "The Campus" designs
c7c91b2
Yu-Hung Lin Merge pull request #727 from ctweney/clc-1365
CLC-1365 Independent cache expiration times for proxies
4ed68e4
Scot Hacker CLC-1384 Distinguish between timed/untimed Canvas tasks 933f424
Christian Vuerings Merge pull request #736 from shacker/CLC-1384
CLC-1384 Distinguish between timed/untimed Canvas tasks
0ac31b4
Yu-Hung Lin [CLC-1231] Clear Completed Google Tasks endpoint: Adding proxy level …
…endpoint

[CLC-1231] VCR namespace fix, pushing recording-centric test for tasks into /recordings, updating tests

[CLC-1231] Merged model integration + tests

[CLC-1231] Route, controller, tests wiring
aab177c
Yu-Hung Lin [NOJIRA] Gem updates 1050d67
Yu-Hung Lin [NOJIRA] Suppress foo ed8bb46
Chris Tweney CLC-1360 CLC-1396 Update notification UI text and protect against sev…
…eral kinds of lunatic JMS data
6eab88d
Chris Tweney Merge pull request #740 from yuhunglin/NOJIRA
[NOJIRA] Suppress foo
582dff8
Chris Tweney Merge pull request #739 from yuhunglin/GEMUPDATE2
[NOJIRA] Gem updates
ea86cad
Chris Tweney Merge pull request #737 from yuhunglin/CLC-1231
[CLC-1231] Clear Completed Google Tasks endpoint
9307c38
Scot Hacker CLC-1383 API for deleting Google tasks
https://jira.media.berkeley.edu/jira/browse/CLC-1383

Massive assist from Yu-Hung on this one.
ff3ff7c
Christian Vuerings CLC-1388 - [Front-end] Implement "The Campus" designs
https://jira.media.berkeley.edu/jira/browse/CLC-1388

* CSS - Adding color
* CSS - Bigger click areas
* CSS - Menu on the bottom on mobile
* Don't show the top category when there are no items in it
* Setting the title
* Tests for checking properties & URLs
b071c07
Mar 01, 2013
Ray Davis Merge pull request #741 from ctweney/clc-1360
CLC-1360 CLC-1396 Improve JMS notifications (Master branch)
2ae97ce
Yu-Hung Lin Merge pull request #744 from christianv/CLC-1388c
CLC-1388 - [Front-end] Implement "The Campus" designs
d7cb87c
Yu-Hung Lin [CLC-944] Enable caching on dev/qa laysers b0011bc
Chris Tweney CLC-1387 Make notification controller cacheable; DRY up cache writes dcf4a68
Chris Tweney Merge pull request #738 from yuhunglin/CLC-944
[CLC-944] Enable cache clearing on dev/qa layers
eb89d0b
Yu-Hung Lin [CLC-1402] Adding mail into the OAuth scope 654621d
Chris Tweney Merge pull request #743 from shacker/CLC-1383c
CLC-1383 API for deleting Google tasks
a5721c2
Chris Tweney Merge pull request #746 from yuhunglin/CLC-1402
[CLC-1402] Adding mail into the OAuth scope
1e755c3
Scot Hacker CLC-1045 Delete tasks UI ebc943e
Yu-Hung Lin [CLC-1230] Front-end hookup for clear completed tasks, bug fix on the…
… status code
9ec0dfd
Christian Vuerings CLC-1290 - Drop title and degree from preferred_name 59e71f6
Scot Hacker Merge pull request #751 from christianv/CLC-1290
CLC-1290 - Drop title and degree from preferred_name
4313802
Mar 02, 2013
Christian Vuerings CLC-1388 - [Front-end] Implement "The Campus" designs
https://jira.media.berkeley.edu/jira/browse/CLC-1388

* New designs
* Top landing page (title + text)
ba43e38
Scot Hacker Merge pull request #752 from christianv/CLC-1388c
CLC-1388 - [Front-end] Implement "The Campus" designs
32bf122
Mar 03, 2013
Christian Vuerings CLC-1404 - [Front-end] Campus pages - add status indicator to current…
…ly selected page


https://jira.media.berkeley.edu/jira/browse/CLC-1404

Also

* Adding extra tests
* Generate the menu dynamically
da12e6e
Christian Vuerings Merge pull request #750 from shacker/CLC-1045b
CLC-1045 Delete tasks UI
297f64c
Mar 04, 2013
Christian Vuerings NOJIRA - some JS reformatting 058968d
Ray Davis Merge pull request #745 from ctweney/clc-1387
CLC-1387 Make notification controller cacheable; DRY up cache writes
03a0d65
Yu-Hung Lin [CLC-1398] Readme update for clarification on Google access exception…
… for test users
81da438
Ray Davis Merge pull request #755 from christianv/CLC-1398
[CLC-1398] Readme update for clarification on Google access exception for test users
b9e67b3
Scot Hacker Merge pull request #753 from christianv/CLC-1404
CLC-1404 - [Front-end] Campus pages - add status indicator to currently selected page
1bba850
Scot Hacker Merge pull request #754 from christianv/reformattaskdelete
NOJIRA - some JS reformatting
a1727bd
Yu-Hung Lin [CLC-1230] Fixes 440008d
Ray Davis CLC-1405 Make My Tasks smarter about time zone transitions 6277aaf
Yu-Hung Lin Merge pull request #756 from raydavis/raywip
CLC-1405 Make My Tasks smarter about time zone transitions
6f7a9e6
Scot Hacker Merge pull request #749 from yuhunglin/CLC-1230
[CLC-1230] Front-end hookup for clear completed tasks, bug fix on the status code
ccff980
Scot Hacker CLC-1240 Add shadow to status badges b90101a
Christian Vuerings Merge pull request #757 from shacker/CLC-1240
CLC-1240 Add shadow to status badges
6f91028
Chris Tweney CLC-1351 Add new proxy for CalLink organizations feed bb21e52
Chris Tweney CLC-1351 Look up CalLink organization's profileUrl from groups feed f655f21
Yu-Hung Lin [CLC-1191] Fix for source on canvas activity, canvasUserActivityProce…
…ssor refactoring
c7aca36
Yu-Hung Lin Merge pull request #758 from ctweney/clc-1351
CLC-1351 Adding profileUrl to CalLink org display
89eda7b
Mar 05, 2013
Christian Vuerings CLC-1351 - Fix the CalLink site_url 78ca247
Scot Hacker Merge pull request #760 from christianv/CLC-1351
CLC-1351 - Fix the CalLink site_url
137f987
Yu-Hung Lin [CLC-1191] Fixes 021c584
Ray Davis Merge pull request #759 from yuhunglin/CLC-1191
[CLC-1191] Fix for source on canvas activity, canvasUserActivityProcessor refactoring
766f3e9
Christian Vuerings CLC-1372 - Implement next iteration of the Academic Status popover a1d253d
Scot Hacker Merge pull request #761 from christianv/CLC-1372
CLC-1372 - Implement next iteration of the Academic Status popover
eb50927
Christian Vuerings CLC-1407 - [Front-end] Implement v9 campus designs
https://jira.media.berkeley.edu/jira/browse/CLC-1407

We're leaving the categories for now after a discussion with bernie
7bba9b1
Scot Hacker Merge pull request #762 from christianv/CLC-1407
CLC-1407 - [Front-end] Implement v9 campus designs
8c8e2ca
Christian Vuerings CLC-1412 - IE9: Sign-In button missing gradient 91c891d
Scot Hacker Merge pull request #763 from christianv/CLC-1412
CLC-1412 - IE9: Sign-In button missing gradient
61a6b17
Christian Vuerings NOJIRA - Fix JS error on splash page.
The profile.student_info doesn't exist yet and we were trying to get access to one of its properties
2b0097b
Scot Hacker Merge pull request #764 from christianv/fixErrorOnSplashPage
NOJIRA - Fix JS error on splash page.
54012ca
Christian Vuerings CLC-1416 - On list items on My Campus pages, the text should be align… a13cdf7
Mar 06, 2013
Christian Vuerings CLC-1418 - [Front-end] Change 'The Campus' to 'My Campus' ebd1b40
Christian Vuerings CLC-1415 - Completed tasks show up as *overdue* when their date is old 5057160
Scot Hacker Merge pull request #765 from christianv/CLC-1416
CLC-1416 - On list items on My Campus pages, the text should be aligned on the left margin
1b97158
Scot Hacker Merge pull request #766 from christianv/CLC-1418
CLC-1418 - [Front-end] Change 'The Campus' to 'My Campus'
296c197
Scot Hacker Merge pull request #767 from christianv/CLC-1415
CLC-1415 - Completed tasks show up as *overdue* when their date is old
4a253b4
Yu-Hung Lin [NOJIRA] Readme updates for installation instructions, running jasmin…
…e:ci
be81681
Mar 07, 2013
Christian Vuerings Merge pull request #769 from yuhunglin/NOJIRA2
[NOJIRA] Readme updates for installation instructions, running jasmine:ci
53a1b80
Chris Tweney NOJIRA Fix site url 5a80938
Scot Hacker CLC-1044 Allow editing of tasks ed771bf
Scot Hacker CLC-1044 Move task adder Jasmine tests to separate spec 844b39a
Scot Hacker CLC-1240 Use box shadow values for badges exactly as specified in Jira 7e275b8
Scot Hacker CLC-1259 Raise font size/weight on splash page blog entry
Per conversation with Jon.
022db08
Yu-Hung Lin Merge pull request #772 from shacker/CLC-1044c
CLC-1044 Allow editing of tasks
85ca656
Scot Hacker CLC-1226 Time marches forward when completing/uncompleting tasks 159ba74
Yu-Hung Lin Merge pull request #775 from shacker/CLC-1226
CLC-1226 Time marches forward when completing/uncompleting tasks
434eee1
Chris Tweney CLC-1387 Undo incorrect caching logic 32832d4
Ray Davis Merge pull request #777 from ctweney/clc-1387-undo
CLC-1387 Undo incorrect caching logic
0acee2a
Ray Davis Merge pull request #771 from ctweney/siteUrlFix
NOJIRA Fix site url for CalLink
dc90055
Christian Vuerings Merge pull request #773 from shacker/CLC-1240
CLC-1240 Use box shadow values for badges exactly as specified in Jira
04b0efe
Christian Vuerings Merge pull request #774 from shacker/CLC-1259
CLC-1259 Raise font size/weight on splash page blog entry
7504df2
Chris Tweney CLC-1387 Cache notifications again, the right way this time 78b58bb
Scot Hacker CLC-1427 Update UI real-time when deleting date from scheduled tasks cfdf4db
Ray Davis Merge pull request #779 from ctweney/clc-1387-again
CLC-1387 Cache notifications again, the right way this time
fa0f05a
Christian Vuerings CLC-1400 [Front-end] Explore foundation 4 e278c04
Scot Hacker Merge pull request #778 from christianv/CLC-1400
CLC-1400 [Front-end] Explore foundation 4
bd5ed1d
Scot Hacker CLC-1431 Relabel "Clear completed" to "Deleted completed" tasks 2c54090
Scot Hacker CLC-1432 Remove View in Google button 6b6acb4
Scot Hacker CLC-1428 Completing a task while in "Show" mode shows wrong flash mes…
…sage
e565dcb
Christian Vuerings Merge pull request #783 from shacker/CLC-1432
CLC-1432 Remove View in Google button
4c8f228
Christian Vuerings Merge pull request #782 from shacker/CLC-1431
CLC-1431 Relabel "Clear completed" to "Deleted completed" tasks
7291ac7
Christian Vuerings Merge pull request #780 from shacker/CLC-1427
CLC-1427 Update UI real-time when deleting date from scheduled tasks
571f432
Christian Vuerings Merge pull request #776 from shacker/CLC-1428
CLC-1428 Completing a task in "Show" mode shows wrong flash message
e63da01
Mar 08, 2013
Christian Vuerings CLC-1433 [Front-end] Optimize images 9a714f9
Christian Vuerings CLC-1436 [Front-end] Specify the image dimensions 3801dc5
Christian Vuerings CLC-1182 [Front-end] Use data-URI's for images bb698cc
Scot Hacker Merge pull request #784 from christianv/CLC-1433
CLC-1433 [Front-end] Optimize images
e8a7f33
Scot Hacker Merge pull request #785 from christianv/CLC-1436
CLC-1436 [Front-end] Specify the image dimensions
02e00bc
Ray Davis CLC-1252 Do not show user-hidden bSpace sites
Switch Sakai sites feed implementation from Hybrid service to DB queries
3b27160
Scot Hacker CLC-1429 Tasks are uneditable after edit/cancel f04d571
Scot Hacker Merge pull request #786 from christianv/CLC-1182
CLC-1182 [Front-end] Use data-URI's for images
36b88ab
Christian Vuerings Merge pull request #787 from shacker/CLC-1429b
CLC-1429 Tasks are uneditable after edit/cancel
c371a34
Ray Davis CLC-1252 Use Nokogiri for XML; add SQL tirekicking SakaiData tests 1034169
Chris Tweney Merge pull request #781 from raydavis/raywip
CLC-1252 Do not show user-hidden bSpace sites
77d5270
Scot Hacker CLC-1443 Can't delete task notes 0901430
Chris Tweney Merge pull request #788 from shacker/CLC-1443b
CLC-1443 Can't delete task notes
94d7ca5
Christian Vuerings CLC-1426 - Implement JSON for My Campus > Staff
https://jira.media.berkeley.edu/jira/browse/CLC-1426

Changes from Eli commit:

* `Collaboration & Communication` to `Communication & Collaboration` in the menu since it was defined like that in the links
* `Campus Departments` to `Academic Departments` under the Academic heading since we had `Campus Departments` twice
bacea68
Mar 09, 2013
Eli Cochran Merge pull request #792 from christianv/CLC-1426-qa
CLC-1426 - Implement JSON for My Campus > Staff
1c818ab
Mar 10, 2013
Yu-Hung Lin [CLC-1441] QA: Updating Angular to 1.1.3 8ceccfa
Mar 11, 2013
Scot Hacker Merge pull request #799 from christianv/CLC-1441-qa
[CLC-1441] QA: Updating Angular to 1.1.3
a59666f
Mar 12, 2013
Yu-Hung Lin [CLC-1442] QA: Tons of code to support basic auth b0f6f0c
Chris Tweney Merge pull request #809 from yuhunglin/CLC-1442-qa
[CLC-1442] QA: Tons of code to support basic auth
6637654
Christian Vuerings CLC-1475 - Travis.ci error: unable to obtain stable firefox connectio…
…n in 60 seconds


https://jira.media.berkeley.edu/jira/browse/CLC-1475

:warning: **Warning** - Only merge this if the Travis.ci build(s) were successful.
f16544e
Yu-Hung Lin Merge pull request #811 from christianv/CLC-1475-qa
CLC-1475 - Travis.ci error: unable to obtain stable firefox connection in 60 seconds
ed32934
Mar 13, 2013
Chris Tweney NOJIRA Force usage of activerecord-jdbc-adapter 1.2.8 because 1.2.7 g…
…ot yanked
a168911
Yu-Hung Lin Merge pull request #816 from ctweney/active-record-bump-qa
QA - NOJIRA Force usage of activerecord-jdbc-adapter 1.2.8 because 1.2.7 got yanked
77e6759
Mar 18, 2013
Chris Tweney NOJIRA Upgrade to Rails 3.2.13 0572362
Chris Tweney CLC-1508 Bump qa branch version to v5 21cf665
Ray Davis Merge pull request #833 from ctweney/rails-3.2.13-qa
CLC-1508 Upgrade to Rails 3.2.13
788288c
Yu-Hung Lin [CLC-1508] Forcing foundation to use 4.0.4 instead of 4.0.x due to so…
…me display bug
e828a7b
Ray Davis Merge pull request #835 from yuhunglin/CLC-1508
[CLC-1508] Forcing foundation to use 4.0.4 instead of 4.0.x due to some display size formatting bug
afe1d0b