Skip to content
This repository has been archived by the owner on Nov 1, 2018. It is now read-only.

Issue2 #33

Open
wants to merge 1,307 commits into
base: master
Choose a base branch
from
Open

Issue2 #33

wants to merge 1,307 commits into from

Conversation

michael-conway
Copy link

Merge in changes for #2

johnworth and others added 30 commits April 12, 2016 14:44
@johnworth
user-sessions can now be build out of the golang dir
841c0ba
@johnworth
Removed the old user-sessions service
1470acf
@johnworth
Fixed the path to the default config file for user-sessions
6139e17
@johnworth
Initial commit of the new user-preferences
3f937e0
@johnworth
Uncommented lines from user-preferences' docker build script
4046b21
@johnworth
Changed references to sessions to preferences
9ab0e8e
@slr71
CORE-7597: fixed the format of user notifications posted to AMQP by t…
2e348bf 
…he notification agent
@johnworth
The delivery field of the aggregationMessage struct is not a pointer.
56d5791 
Bad things happen when it is. Also playing it safe with the closure
over the aggregationMessage in the Listen() function.
@ianmcorvidae
Add an nginx+consul-template dockerfile/etc. intended for use with se…
003d8c0 
…rvice nginx containers.
@ianmcorvidae
Add standard git-ref to nginx-consul-template Dockerfile
d50492e
@ianmcorvidae
Add nginx-consul-template to the list of images to retag/etc. during …
0751821 
…drops
@ianmcorvidae
Use key_or_default to default the color to green when it's not in the…
7d9a985 
… consul k/v store
@ianmcorvidae
Force 502s better.
9f35d71
@ianmcorvidae
Add basic simple status check endpoints to anon-files and kifshare fo…
c156306 
…r consul to use.
@johnworth
Removed old user-preferences service
35e982c
@ianmcorvidae
Remove obsolete jex-events config from apps service.
15d0347
@ianmcorvidae
Remove obsolete jex-events config from apps service in ansible, too
391b034
@ianmcorvidae
Remove old templeton source directory
77e2f50
@johnworth
Removed user_prefs_queries.clj and user_session_queries.clj from kame…
b81904a 
…leon
@johnworth
Removed JEX, user-sesions, and user-preferences from project-defs.edn
11c9c26
@ianmcorvidae
Switch to using forester from biojava's thirdparty repository, which …
df01dff 
…sucks but isn't down like the old biojava maven apparently now is
@slr71
CORE-7603: added the unseen message count to notification listings in…
1ae8e11 
… the notification agent
@slr71
CORE-7603: added the unseen message count to the notification agent's…
4b768ab 
… endpoint
@johnworth
Bumped the docker version to 1.10.3
e1f6f26
CORE-7602 refactor code. add support for secured web socket.
21cc236
CORE-7602 add support for auto reconnect. Fix tests and refactor code.
76d2fff
Merge pull request cyverse-archive#155 from cyverse/srv-push
b581cd9 
CORE-7602 Remove notifications and sys message polling. Add Websocket…
@slr71
CORE-7607: modified the argument preview service so that converts all…
973a762 
… values to strings
@slr71
CORE-7607: removed an unnecessary string conversion
1942117
@slr71
the meager beginnings of the database schema for the permission refactor
6835c6f
donsizemore and others added 30 commits April 28, 2016 15:34
@donsizemore
#11 adding DB creation blurbs to deploy-all
901e69f
@ianmcorvidae
Add value types into the test database
ccea693
@ianmcorvidae
It helps when you quote strings correctly
f8737c5
@ianmcorvidae
Remove containers after building unittest-dedb
7b927fc
@donsizemore
#30 local-config, condor fixes
41deb0d
@donsizemore
#31 adding templeton containers to compose.yaml template
f71b202
@donsizemore
#31 our config script expects properties instead of yaml
569d665
@donsizemore
#4 tell docker not to mess with iptables, tell iptables to allow dock…
82802b7 
…er traffic
@donsizemore
#4 retracting pending more testing
4492c92
@donsizemore
#3 add docker-compose tag
30cea9b
@donsizemore
#31 fix templeton_periodic container name
5a4b46a
@slr71
fixed the folder names in the test database
35c6373
@ianmcorvidae
Add/amend some various headers passed to the service in nginx-consul-…
38ae006 
…template
@donsizemore
#30 webapp requires de.properties in /etc/iplant/de
d0f8454
@johnworth
Removed a log message for do-read-chunk
33cca79
@slr71 @psarando
updated the docker version
04e9199 
(cherry picked from commit 21b4930)
@ash3rz
CORE-7688 add logic to detect Unauthorized users and redirect users t…
3c081d1 
…o logged out page. fix merge conflicts

(cherry picked from commit 28c9e08)
@ash3rz
CORE-7688 On session time out, close websockets. Refactor code.
1aeb0f1 
(cherry picked from commit 186dd35)
@ash3rz
CORE-7688 add session time-out redirection logic to belphegor
61cae23 
(cherry picked from commit e1b61c9)
@ash3rz
CORE-7653 Set 401 on GWT Code split download failure in DeCasAuth
a3fe3d6 
(cherry picked from commit eea0659)
@ash3rz
CORE-7653 Fix Script Tag Failure via standardized code split failure …
684b3a1 
…handling

(cherry picked from commit 7a9a9f1)
@ash3rz
CORE-7653 Remove unused code from AsyncCallbackWrapper
ab3ef64
@ash3rz
Merge pull request cyverse-archive#215 from cyverse/CORE-7653
fe5bf21 
CORE-7653 Script Tag Failure error
@donsizemore
adding AnnotatedGroupVars to link in README
c48121f
@donsizemore
initial README
844695b
@donsizemore
wget groupvars as raw
d5d79ca
@donsizemore
copying current/relevant docs from DICE-UNC
a5ec4f5
#1 merge cyverse master with DE howlermonkey branch to start at a 'de…
2d2f503 
…ployable' first prod
Merge branch 'master' into unc-master
261fdda
#2 apply dennis' grouper patches
2257917
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@michael-conway @johnworth @slr71 @ianmcorvidae @psarando @donsizemore @strootman @ash3rz