Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

UNL Resource Scheduler
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

0ca1b260

Commit 0ca1b260 authored 8 years ago by Spencer McCoy

Downloads
- Plain Diff

Merge branch 'master' into uiUpdates

parents 2b3b1b7f 9436e114

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 0 additions, 3 deletions

Gemfile.lock
Gruntfile.js 0 additions, 43 deletions

Gruntfile.js
README.md 1 addition, 0 deletions

README.md
db/migrate/20161018150000_add_recurring_reservation_tag.rb 7 additions, 0 deletions

db/migrate/20161018150000_add_recurring_reservation_tag.rb
routes/resources.rb 33 additions, 3 deletions

routes/resources.rb
views/calendar.erb 28 additions, 19 deletions

views/calendar.erb
views/reserve.erb 29 additions, 20 deletions

views/reserve.erb
views/resource_calendar.erb 30 additions, 26 deletions

views/resource_calendar.erb
views/space_home.erb 18 additions, 1 deletion

views/space_home.erb

with 146 additions and 115 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment