search

rcos / Observatory-retired

A Python based dashboard for the Rensselaer Center for Open Source Software
rcos.rpi.edu
ISC License
12 stars 11 forks source link

Merge Master in rcos-production #26

Closed c00w closed 11 years ago

c00w commented 11 years ago

So, I'm wondering why there are commits on master, other than mine which aren't on rcos-production. I'm going to pick tim horton.

c00w commented 11 years ago

Actually these two branches have diverged enough that its not a good idea to merge master in. There are lots of duplicate commits etc...

natestedman commented 11 years ago

This stuff happened after I left so I'm not really sure what's going on there.

On Feb 20, 2013, at 8:58 PM, Colin Rice notifications@github.com wrote:

So, I'm wondering why there are commits on master, other than mine which aren't on rcos-production. I'm going to pick tim horton.

You can merge this Pull Request by running

git pull https://github.com/rcos/Observatory master Or view, comment on, or merge it at:

https://github.com/rcos/Observatory/pull/26

Commit Summary

Added licensing comment to the readme. Added a simple no posts yet dialogue to the commits page Readme updated with Linux workaround, page details, external access command Readme formatting fixed for site display Added support for forgot password feature Added past projects page with a toggle selection for active or inactive projects in the modify project page. Fixed bug with active scoreless projects showing as inactive, also removed unused code Fixed bug where inactive projects would show up Fixed bug where inactive projects would display twice Added success page for a successful forgot password request Added success page for a successful forgot password request Removed incorrect filepath Fixed bug where active projects would show twice after being fetched Increased timeout of repo fetching Edited observatory/settings.py via GitHub Merge pull request #1 from benshippee/master Port of people/past people toggle Added error message for inactive users. Edited observatory/templates/users/people.html via GitHub Edited observatory/templates/users/past_people.html via GitHub Addition of toggle to activate/deactivate a user's account. Activate/Deactivate account functions, may add alert header at later date. Added URLs for user toggle Merge pull request #4 from thoughtsifter/master Added Task List support Edited observatory/settings.py via GitHub Small whitespace change to test fetching scripts. Fixed project titles being used in URLs instead of url_path. Fixed Mentor button spacing and spacing before/after links on main page Added pending projects page Added pending projects page Make changes so github matches what is deployed to the server Merge pull request #25 from rcos/server_hack_fixes File Changes

M README.mdown (48) M observatory/dashboard/demo.py (4) M observatory/dashboard/fetch/fetch_repositories.py (2) M observatory/dashboard/forms.py (2) M observatory/dashboard/models/Project.py (5) M observatory/dashboard/views/projects.py (94) M observatory/dashboard/views/users.py (95) M observatory/media/css/author-requests.css (2) M observatory/media/css/base.css (5) M observatory/media/css/profiles.css (8) M observatory/settings.py (11) M observatory/templates/base.html (12) M observatory/templates/commits/partials/page.html (2) M observatory/templates/commits/show_repository.html (4) A observatory/templates/projects/archive_list.html (46) M observatory/templates/projects/list.html (18) M observatory/templates/projects/modify.html (3) A observatory/templates/projects/partials/archived_project_bubble.html (30) A observatory/templates/projects/partials/pending_project_bubble.html (22) A observatory/templates/projects/pending_list.html (37) M observatory/templates/projects/show.html (21) A observatory/templates/users/forgot_password_success.html (11) A observatory/templates/users/past_people.html (38) M observatory/templates/users/people.html (28) M observatory/templates/users/profile.html (14) A observatory/todo/init.py (0) A observatory/todo/admin.py (13) A observatory/todo/forms.py (82) A observatory/todo/media/todo/css/styles.css (106) A observatory/todo/media/todo/css/ui.datepicker.css (213) A observatory/todo/media/todo/js/jquery.tablednd_0_5.js (382) A observatory/todo/models.py (93) A observatory/todo/templates/todo/add_external_task.html (83) A observatory/todo/templates/todo/add_list.html (24) A observatory/todo/templates/todo/base.html (12) A observatory/todo/templates/todo/del_list.html (56) A observatory/todo/templates/todo/email/assigned_body.txt (20) A observatory/todo/templates/todo/email/assigned_subject.txt (1) A observatory/todo/templates/todo/email/newcomment_body.txt (16) A observatory/todo/templates/todo/list_lists.html (40) A observatory/todo/templates/todo/search_results.html (37) A observatory/todo/templates/todo/view_list.html (164) A observatory/todo/templates/todo/view_task.html (120) A observatory/todo/urls.py (22) A observatory/todo/views.py (423) M observatory/urls.py (21) Patch Links:

https://github.com/rcos/Observatory/pull/26.patch https://github.com/rcos/Observatory/pull/26.diff

c00w commented 11 years ago

Shoot. Well I sent an email to the rcos mailing list hoping they know what is going on.