Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

12 madeupname #14

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

12 madeupname #14

wants to merge 6 commits into from

Conversation

madeupname
Copy link
Owner

Please review.

@madeupname
Added configuration for Postgresql. Requires an external configuration
a1bb001 
file (not checked in), documented in the issue.
Issue #11
http://github.com/madeupname/juggernaut/issues/issue/11
@madeupname
Added lesscss-resources plugin and Twitter Bootstrap files. Configured
46210e4 
them and updated templates to use them.
Issue #10
@madeupname
Generated views for Meeting, styled list and show pages.
2bca69b 
Issue #10
@madeupname
Added home, meetings link to top nav. Wrapped all body content in
2275632 
container div.
Generated, styled location views.
Cleaned up meeting views.
Styled edit/delete links, wrapped in security tag so they're displayed
only to admin users.
Issue #10
@madeupname
Merge branch '10-madeupname'
42bece2 
Conflicts:
	grails-app/views/meeting/list.gsp
	grails-app/views/meeting/show.gsp
@madeupname
Added iCalendar Grails plugin.
018bcea 
Generated MeetingController, added icalendar action.
Modified Meeting edit/update form to add time picker.
Modified Meeting list/show views to display "Add to Calendar" link.
Added default locale to Location, set in bootstrap.

Issue #12
http://github.com/madeupname/juggernaut/issues/issue/12
@vinhsu
Copy link

vinhsu commented Jun 20, 2012

Hi Philip,

I try to git clone this repo but my pc is set to master branch. How
can I change to git clone to shoot on "12-madeupname branch"?
Thank you,

On Tue, Jun 12, 2012 at 5:34 PM, Philip Yurchuk
[email protected]
wrote:

Please review.

You can merge this Pull Request by running:

 git pull https://github.com/madeupname/juggernaut 12-madeupname

Or you can view, comment on it, or merge it online at:

 #14

-- Commit Summary --

  • Added configuration for Postgresql. Requires an external configuration
  • Added lesscss-resources plugin and Twitter Bootstrap files. Configured
  • Generated views for Meeting, styled list and show pages.
  • Added home, meetings link to top nav. Wrapped all body content in
  • Merge branch '10-madeupname'
  • Added iCalendar Grails plugin.

-- File Changes --

M README (5)
M grails-app/conf/ApplicationResources.groovy (29)
M grails-app/conf/BootStrap.groovy (3)
M grails-app/conf/BuildConfig.groovy (5)
M grails-app/conf/Config.groovy (6)
M grails-app/conf/UrlMappings.groovy (2)
A grails-app/controllers/ocjug/juggernaut/IndexController.groovy (11)
M grails-app/controllers/ocjug/juggernaut/MeetingController.groovy (123)
M grails-app/domain/ocjug/juggernaut/Location.groovy (11)
M grails-app/domain/ocjug/juggernaut/Meeting.groovy (26)
M grails-app/domain/ocjug/juggernaut/User.groovy (2)
M grails-app/views/index.gsp (127)
M grails-app/views/layouts/main.gsp (55)
A grails-app/views/location/_form.gsp (60)
A grails-app/views/location/create.gsp (39)
A grails-app/views/location/edit.gsp (43)
A grails-app/views/location/list.gsp (61)
A grails-app/views/location/show.gsp (35)
A grails-app/views/meeting/_form.gsp (61)
A grails-app/views/meeting/create.gsp (40)
A grails-app/views/meeting/edit.gsp (85)
A grails-app/views/meeting/list.gsp (65)
A grails-app/views/meeting/show.gsp (29)
A test/unit/ocjug/juggernaut/IndexControllerTests.groovy (17)
A test/unit/ocjug/juggernaut/MeetingControllerTests.groovy (159)
A test/unit/ocjug/juggernaut/MeetingTests.groovy (14)
A web-app/css/custom-main.css (82)
A web-app/images/ocjug-logo-sm.png (0)
A web-app/perifer-timepicker/jquery.timePicker.js (277)
A web-app/perifer-timepicker/timePicker.css (29)
A web-app/twitter-bootstrap/img/glyphicons-halflings-white.png (0)
A web-app/twitter-bootstrap/img/glyphicons-halflings.png (0)
A web-app/twitter-bootstrap/js/.jshintrc (10)
A web-app/twitter-bootstrap/js/README.md (112)
A web-app/twitter-bootstrap/js/bootstrap-alert.js (90)
A web-app/twitter-bootstrap/js/bootstrap-button.js (96)
A web-app/twitter-bootstrap/js/bootstrap-carousel.js (169)
A web-app/twitter-bootstrap/js/bootstrap-collapse.js (157)
A web-app/twitter-bootstrap/js/bootstrap-dropdown.js (100)
A web-app/twitter-bootstrap/js/bootstrap-modal.js (218)
A web-app/twitter-bootstrap/js/bootstrap-popover.js (98)
A web-app/twitter-bootstrap/js/bootstrap-scrollspy.js (151)
A web-app/twitter-bootstrap/js/bootstrap-tab.js (135)
A web-app/twitter-bootstrap/js/bootstrap-tooltip.js (275)
A web-app/twitter-bootstrap/js/bootstrap-transition.js (61)
A web-app/twitter-bootstrap/js/bootstrap-typeahead.js (285)
A web-app/twitter-bootstrap/less/accordion.less (33)
A web-app/twitter-bootstrap/less/alerts.less (58)
A web-app/twitter-bootstrap/less/bootstrap.less (62)
A web-app/twitter-bootstrap/less/breadcrumbs.less (24)
A web-app/twitter-bootstrap/less/button-groups.less (191)
A web-app/twitter-bootstrap/less/buttons.less (191)
A web-app/twitter-bootstrap/less/carousel.less (121)
A web-app/twitter-bootstrap/less/close.less (29)
A web-app/twitter-bootstrap/less/code.less (57)
A web-app/twitter-bootstrap/less/component-animations.less (20)
A web-app/twitter-bootstrap/less/custom-bootstrap.less (68)
A web-app/twitter-bootstrap/less/custombootstrap.less (1)
A web-app/twitter-bootstrap/less/dropdowns.less (143)
A web-app/twitter-bootstrap/less/forms.less (584)
A web-app/twitter-bootstrap/less/grid.less (5)
A web-app/twitter-bootstrap/less/hero-unit.less (22)
A web-app/twitter-bootstrap/less/labels-badges.less (55)
A web-app/twitter-bootstrap/less/layouts.less (17)
A web-app/twitter-bootstrap/less/mixins.less (631)
A web-app/twitter-bootstrap/less/modals.less (90)
A web-app/twitter-bootstrap/less/navbar.less (364)
A web-app/twitter-bootstrap/less/navs.less (363)
A web-app/twitter-bootstrap/less/pager.less (36)
A web-app/twitter-bootstrap/less/pagination.less (56)
A web-app/twitter-bootstrap/less/popovers.less (49)
A web-app/twitter-bootstrap/less/progress-bars.less (117)
A web-app/twitter-bootstrap/less/reset.less (126)
A web-app/twitter-bootstrap/less/responsive-1200px-min.less (26)
A web-app/twitter-bootstrap/less/responsive-767px-max.less (149)
A web-app/twitter-bootstrap/less/responsive-768px-979px.less (17)
A web-app/twitter-bootstrap/less/responsive-navbar.less (146)
A web-app/twitter-bootstrap/less/responsive-utilities.less (41)
A web-app/twitter-bootstrap/less/responsive.less (48)
A web-app/twitter-bootstrap/less/scaffolding.less (29)
A web-app/twitter-bootstrap/less/sprites.less (191)
A web-app/twitter-bootstrap/less/tables.less (176)
A web-app/twitter-bootstrap/less/tests/css-tests.css (51)
A web-app/twitter-bootstrap/less/tests/css-tests.html (827)
A web-app/twitter-bootstrap/less/thumbnails.less (47)
A web-app/twitter-bootstrap/less/tooltip.less (35)
A web-app/twitter-bootstrap/less/type.less (235)
A web-app/twitter-bootstrap/less/utilities.less (23)
A web-app/twitter-bootstrap/less/variables.less (205)
A web-app/twitter-bootstrap/less/wells.less (27)

-- Patch Links --

 https://github.com/madeupname/juggernaut/pull/14.patch
 https://github.com/madeupname/juggernaut/pull/14.diff

Reply to this email directly or view it on GitHub:
#14

@madeupname
Copy link
Owner Author

Vincent,

Try the Git repositories view. You should see branches there. You're not really cloning those branches, but pulling them so you can update your own repository. To test, you may wish to first create a branch from main, then merge in the branches you've pulled.

Thanks,
Philip

From: Vincent Hsu [email protected]
To: Philip Yurchuk [email protected]
Sent: Wednesday, June 20, 2012 12:04 PM
Subject: Re: [juggernaut] 12 madeupname (#14)

Hi Philip,

I try to git clone this repo but my pc is set to master branch. How
can I change to git clone to shoot on  "12-madeupname branch"?
Thank you,

On Tue, Jun 12, 2012 at 5:34 PM, Philip Yurchuk
[email protected]
wrote:

Please review.

You can merge this Pull Request by running:

 git pull https://github.com/madeupname/juggernaut 12-madeupname

Or you can view, comment on it, or merge it online at:

 #14

-- Commit Summary --

  • Added configuration for Postgresql. Requires an external configuration
  • Added lesscss-resources plugin and Twitter Bootstrap files. Configured
  • Generated views for Meeting, styled list and show pages.
  • Added home, meetings link to top nav. Wrapped all body content in
  • Merge branch '10-madeupname'
  • Added iCalendar Grails plugin.

-- File Changes --

M README (5)
M grails-app/conf/ApplicationResources.groovy (29)
M grails-app/conf/BootStrap.groovy (3)
M grails-app/conf/BuildConfig.groovy (5)
M grails-app/conf/Config.groovy (6)
M grails-app/conf/UrlMappings.groovy (2)
A grails-app/controllers/ocjug/juggernaut/IndexController.groovy (11)
M grails-app/controllers/ocjug/juggernaut/MeetingController.groovy (123)
M grails-app/domain/ocjug/juggernaut/Location.groovy (11)
M grails-app/domain/ocjug/juggernaut/Meeting.groovy (26)
M grails-app/domain/ocjug/juggernaut/User.groovy (2)
M grails-app/views/index.gsp (127)
M grails-app/views/layouts/main.gsp (55)
A grails-app/views/location/_form.gsp (60)
A grails-app/views/location/create.gsp (39)
A grails-app/views/location/edit.gsp (43)
A grails-app/views/location/list.gsp (61)
A grails-app/views/location/show.gsp (35)
A grails-app/views/meeting/_form.gsp (61)
A grails-app/views/meeting/create.gsp (40)
A grails-app/views/meeting/edit.gsp (85)
A grails-app/views/meeting/list.gsp (65)
A grails-app/views/meeting/show.gsp (29)
A test/unit/ocjug/juggernaut/IndexControllerTests.groovy (17)
A test/unit/ocjug/juggernaut/MeetingControllerTests.groovy (159)
A test/unit/ocjug/juggernaut/MeetingTests.groovy (14)
A web-app/css/custom-main.css (82)
A web-app/images/ocjug-logo-sm.png (0)
A web-app/perifer-timepicker/jquery.timePicker.js (277)
A web-app/perifer-timepicker/timePicker.css (29)
A web-app/twitter-bootstrap/img/glyphicons-halflings-white.png (0)
A web-app/twitter-bootstrap/img/glyphicons-halflings.png (0)
A web-app/twitter-bootstrap/js/.jshintrc (10)
A web-app/twitter-bootstrap/js/README.md (112)
A web-app/twitter-bootstrap/js/bootstrap-alert.js (90)
A web-app/twitter-bootstrap/js/bootstrap-button.js (96)
A web-app/twitter-bootstrap/js/bootstrap-carousel.js (169)
A web-app/twitter-bootstrap/js/bootstrap-collapse.js (157)
A web-app/twitter-bootstrap/js/bootstrap-dropdown.js (100)
A web-app/twitter-bootstrap/js/bootstrap-modal.js (218)
A web-app/twitter-bootstrap/js/bootstrap-popover.js (98)
A web-app/twitter-bootstrap/js/bootstrap-scrollspy.js (151)
A web-app/twitter-bootstrap/js/bootstrap-tab.js (135)
A web-app/twitter-bootstrap/js/bootstrap-tooltip.js (275)
A web-app/twitter-bootstrap/js/bootstrap-transition.js (61)
A web-app/twitter-bootstrap/js/bootstrap-typeahead.js (285)
A web-app/twitter-bootstrap/less/accordion.less (33)
A web-app/twitter-bootstrap/less/alerts.less (58)
A web-app/twitter-bootstrap/less/bootstrap.less (62)
A web-app/twitter-bootstrap/less/breadcrumbs.less (24)
A web-app/twitter-bootstrap/less/button-groups.less (191)
A web-app/twitter-bootstrap/less/buttons.less (191)
A web-app/twitter-bootstrap/less/carousel.less (121)
A web-app/twitter-bootstrap/less/close.less (29)
A web-app/twitter-bootstrap/less/code.less (57)
A web-app/twitter-bootstrap/less/component-animations.less (20)
A web-app/twitter-bootstrap/less/custom-bootstrap.less (68)
A web-app/twitter-bootstrap/less/custombootstrap.less (1)
A web-app/twitter-bootstrap/less/dropdowns.less (143)
A web-app/twitter-bootstrap/less/forms.less (584)
A web-app/twitter-bootstrap/less/grid.less (5)
A web-app/twitter-bootstrap/less/hero-unit.less (22)
A web-app/twitter-bootstrap/less/labels-badges.less (55)
A web-app/twitter-bootstrap/less/layouts.less (17)
A web-app/twitter-bootstrap/less/mixins.less (631)
A web-app/twitter-bootstrap/less/modals.less (90)
A web-app/twitter-bootstrap/less/navbar.less (364)
A web-app/twitter-bootstrap/less/navs.less (363)
A web-app/twitter-bootstrap/less/pager.less (36)
A web-app/twitter-bootstrap/less/pagination.less (56)
A web-app/twitter-bootstrap/less/popovers.less (49)
A web-app/twitter-bootstrap/less/progress-bars.less (117)
A web-app/twitter-bootstrap/less/reset.less (126)
A web-app/twitter-bootstrap/less/responsive-1200px-min.less (26)
A web-app/twitter-bootstrap/less/responsive-767px-max.less (149)
A web-app/twitter-bootstrap/less/responsive-768px-979px.less (17)
A web-app/twitter-bootstrap/less/responsive-navbar.less (146)
A web-app/twitter-bootstrap/less/responsive-utilities.less (41)
A web-app/twitter-bootstrap/less/responsive.less (48)
A web-app/twitter-bootstrap/less/scaffolding.less (29)
A web-app/twitter-bootstrap/less/sprites.less (191)
A web-app/twitter-bootstrap/less/tables.less (176)
A web-app/twitter-bootstrap/less/tests/css-tests.css (51)
A web-app/twitter-bootstrap/less/tests/css-tests.html (827)
A web-app/twitter-bootstrap/less/thumbnails.less (47)
A web-app/twitter-bootstrap/less/tooltip.less (35)
A web-app/twitter-bootstrap/less/type.less (235)
A web-app/twitter-bootstrap/less/utilities.less (23)
A web-app/twitter-bootstrap/less/variables.less (205)
A web-app/twitter-bootstrap/less/wells.less (27)

-- Patch Links --

 https://github.com/madeupname/juggernaut/pull/14.patch
 https://github.com/madeupname/juggernaut/pull/14.diff

Reply to this email directly or view it on GitHub:
#14

Reply to this email directly or view it on GitHub:
#14 (comment)

@vinhsu
Copy link

vinhsu commented Jun 21, 2012

Philip,
Thank you. I try to use "git checkout" to sync branch code.

On Wed, Jun 20, 2012 at 8:00 PM, Philip Yurchuk
[email protected]
wrote:

Vincent,

Try the Git repositories view. You should see branches there. You're not really cloning those branches, but pulling them so you can update your own repository. To test, you may wish to first create a branch from main, then merge in the branches you've pulled.

Thanks,
Philip

 From: Vincent Hsu [email protected]
To: Philip Yurchuk [email protected]
Sent: Wednesday, June 20, 2012 12:04 PM
Subject: Re: [juggernaut] 12 madeupname (#14)

Hi Philip,

I try to git clone this repo but my pc is set to master branch. How
can I change to git clone to shoot on  "12-madeupname branch"?
Thank you,

On Tue, Jun 12, 2012 at 5:34 PM, Philip Yurchuk
[email protected]
wrote:

Please review.

You can merge this Pull Request by running:

 git pull https://github.com/madeupname/juggernaut 12-madeupname

Or you can view, comment on it, or merge it online at:

 #14

-- Commit Summary --

  • Added configuration for Postgresql. Requires an external configuration
  • Added lesscss-resources plugin and Twitter Bootstrap files. Configured
  • Generated views for Meeting, styled list and show pages.
  • Added home, meetings link to top nav. Wrapped all body content in
  • Merge branch '10-madeupname'
  • Added iCalendar Grails plugin.

-- File Changes --

M README (5)
M grails-app/conf/ApplicationResources.groovy (29)
M grails-app/conf/BootStrap.groovy (3)
M grails-app/conf/BuildConfig.groovy (5)
M grails-app/conf/Config.groovy (6)
M grails-app/conf/UrlMappings.groovy (2)
A grails-app/controllers/ocjug/juggernaut/IndexController.groovy (11)
M grails-app/controllers/ocjug/juggernaut/MeetingController.groovy (123)
M grails-app/domain/ocjug/juggernaut/Location.groovy (11)
M grails-app/domain/ocjug/juggernaut/Meeting.groovy (26)
M grails-app/domain/ocjug/juggernaut/User.groovy (2)
M grails-app/views/index.gsp (127)
M grails-app/views/layouts/main.gsp (55)
A grails-app/views/location/_form.gsp (60)
A grails-app/views/location/create.gsp (39)
A grails-app/views/location/edit.gsp (43)
A grails-app/views/location/list.gsp (61)
A grails-app/views/location/show.gsp (35)
A grails-app/views/meeting/_form.gsp (61)
A grails-app/views/meeting/create.gsp (40)
A grails-app/views/meeting/edit.gsp (85)
A grails-app/views/meeting/list.gsp (65)
A grails-app/views/meeting/show.gsp (29)
A test/unit/ocjug/juggernaut/IndexControllerTests.groovy (17)
A test/unit/ocjug/juggernaut/MeetingControllerTests.groovy (159)
A test/unit/ocjug/juggernaut/MeetingTests.groovy (14)
A web-app/css/custom-main.css (82)
A web-app/images/ocjug-logo-sm.png (0)
A web-app/perifer-timepicker/jquery.timePicker.js (277)
A web-app/perifer-timepicker/timePicker.css (29)
A web-app/twitter-bootstrap/img/glyphicons-halflings-white.png (0)
A web-app/twitter-bootstrap/img/glyphicons-halflings.png (0)
A web-app/twitter-bootstrap/js/.jshintrc (10)
A web-app/twitter-bootstrap/js/README.md (112)
A web-app/twitter-bootstrap/js/bootstrap-alert.js (90)
A web-app/twitter-bootstrap/js/bootstrap-button.js (96)
A web-app/twitter-bootstrap/js/bootstrap-carousel.js (169)
A web-app/twitter-bootstrap/js/bootstrap-collapse.js (157)
A web-app/twitter-bootstrap/js/bootstrap-dropdown.js (100)
A web-app/twitter-bootstrap/js/bootstrap-modal.js (218)
A web-app/twitter-bootstrap/js/bootstrap-popover.js (98)
A web-app/twitter-bootstrap/js/bootstrap-scrollspy.js (151)
A web-app/twitter-bootstrap/js/bootstrap-tab.js (135)
A web-app/twitter-bootstrap/js/bootstrap-tooltip.js (275)
A web-app/twitter-bootstrap/js/bootstrap-transition.js (61)
A web-app/twitter-bootstrap/js/bootstrap-typeahead.js (285)
A web-app/twitter-bootstrap/less/accordion.less (33)
A web-app/twitter-bootstrap/less/alerts.less (58)
A web-app/twitter-bootstrap/less/bootstrap.less (62)
A web-app/twitter-bootstrap/less/breadcrumbs.less (24)
A web-app/twitter-bootstrap/less/button-groups.less (191)
A web-app/twitter-bootstrap/less/buttons.less (191)
A web-app/twitter-bootstrap/less/carousel.less (121)
A web-app/twitter-bootstrap/less/close.less (29)
A web-app/twitter-bootstrap/less/code.less (57)
A web-app/twitter-bootstrap/less/component-animations.less (20)
A web-app/twitter-bootstrap/less/custom-bootstrap.less (68)
A web-app/twitter-bootstrap/less/custombootstrap.less (1)
A web-app/twitter-bootstrap/less/dropdowns.less (143)
A web-app/twitter-bootstrap/less/forms.less (584)
A web-app/twitter-bootstrap/less/grid.less (5)
A web-app/twitter-bootstrap/less/hero-unit.less (22)
A web-app/twitter-bootstrap/less/labels-badges.less (55)
A web-app/twitter-bootstrap/less/layouts.less (17)
A web-app/twitter-bootstrap/less/mixins.less (631)
A web-app/twitter-bootstrap/less/modals.less (90)
A web-app/twitter-bootstrap/less/navbar.less (364)
A web-app/twitter-bootstrap/less/navs.less (363)
A web-app/twitter-bootstrap/less/pager.less (36)
A web-app/twitter-bootstrap/less/pagination.less (56)
A web-app/twitter-bootstrap/less/popovers.less (49)
A web-app/twitter-bootstrap/less/progress-bars.less (117)
A web-app/twitter-bootstrap/less/reset.less (126)
A web-app/twitter-bootstrap/less/responsive-1200px-min.less (26)
A web-app/twitter-bootstrap/less/responsive-767px-max.less (149)
A web-app/twitter-bootstrap/less/responsive-768px-979px.less (17)
A web-app/twitter-bootstrap/less/responsive-navbar.less (146)
A web-app/twitter-bootstrap/less/responsive-utilities.less (41)
A web-app/twitter-bootstrap/less/responsive.less (48)
A web-app/twitter-bootstrap/less/scaffolding.less (29)
A web-app/twitter-bootstrap/less/sprites.less (191)
A web-app/twitter-bootstrap/less/tables.less (176)
A web-app/twitter-bootstrap/less/tests/css-tests.css (51)
A web-app/twitter-bootstrap/less/tests/css-tests.html (827)
A web-app/twitter-bootstrap/less/thumbnails.less (47)
A web-app/twitter-bootstrap/less/tooltip.less (35)
A web-app/twitter-bootstrap/less/type.less (235)
A web-app/twitter-bootstrap/less/utilities.less (23)
A web-app/twitter-bootstrap/less/variables.less (205)
A web-app/twitter-bootstrap/less/wells.less (27)

-- Patch Links --

 https://github.com/madeupname/juggernaut/pull/14.patch
 https://github.com/madeupname/juggernaut/pull/14.diff

Reply to this email directly or view it on GitHub:
#14

Reply to this email directly or view it on GitHub:
#14 (comment)

Reply to this email directly or view it on GitHub:
#14 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
2 participants
@madeupname @vinhsu