Reviewing merge request "appcast" → "mainline"

Commits that would be merged:

• 2cf27df by mtkd about 1 month ago

  New/Edit Milestone
  Cleaned some files up

• 9ae1b51 by mtkd about 1 month ago

  Color changes

• 6c74d0e by mtkd about 1 month ago

  Fixes for the filter

• a7910e8 by mtkd about 1 month ago

  Added drop downs to ticket filter

• 40a1dfd by mtkd about 1 month ago

  Fixed user and routes issue

• feb6949 by mtkd about 1 month ago

  Tidy up of roadmap box and stuff

• 607cf0b by mtkd about 1 month ago

  Added progress box to project summary

• 5ddfdd0 by mtkd about 1 month ago

  Manage milestones

• fe89e84 by mtkd about 1 month ago

  Added new controllers for Components and Milestones

• a53bab3 by mtkd about 1 month ago

  Edit and Close Ticket
  Added project_id to Ticket

• 9c52baf by mtkd about 1 month ago

  New ticket

• a6fae7b by mtkd about 1 month ago

  Current tickets now highlight yellow

• efe4d55 by mtkd about 1 month ago

  Some changes I forgot to commit last week
  Fixed an issue with message routes

• 1ed890b by mtkd about 1 month ago

  Refactored Members tab to Team (with new messages and members controllers)

• 004260b by mtkd about 1 month ago

  Changed wiki tab to default to first wiki page
  Minor change to tickets and users

• c069c92 by mtkd about 1 month ago

  Added nofollow
  Minor ticket changes

• 0db2843 by mtkd 2 months ago

  Added first pass of show ticket
  Fixed user URL issue

• b7a89f4 by mtkd 2 months ago

  Random fixes

• 1f39647 by mtkd 2 months ago

  Style changes

• a4fe39c by mtkd 2 months ago

  Added slug to ticket

• 1670b3f by mtkd 2 months ago

  Summary style changes

• 0fbe692 by mtkd 2 months ago

  Added commits and messages on summary
  Critical tickets show in red

• b32949b by mtkd 2 months ago

  Files missed in previous commit

• 13891e7 by mtkd 2 months ago

  Added critical tickets to summary page
  Changed .size>0 to !.empty?
  Changed if ! to unless
  Removed some thens, != nils

• fe66613 by mtkd 2 months ago

  Added summary tab
  Refactored other tabs
  Project now uses a wiki slug not id
  Changed project.description to project.summary
  Browser title fixes

• f5936cf by mtkd 2 months ago

  Tidied up some controllers

• 4b4ac9f by mtkd 2 months ago

  Changed delete wiki, article to set status to :deleted

• 3403080 by mtkd 2 months ago

  More edit article
  Delete wiki, delete article
  Fixed journal update error

• 1d60c0f by mtkd 2 months ago

  Added norobots meta content (put norobots at top of a page to stop it being indexed)

• d3983e3 by mtkd 2 months ago

  Started articles CRUD
  Renamed config settings

• 6d1b0dd by mtkd 2 months ago

  Added meta description

• 4c39416 by mtkd 2 months ago

  Fixed user registration

• dbd9dc7 by mtkd 2 months ago

  Added popular projects box to more pages

• 92aae27 by mtkd 2 months ago

  Added popular projects box to home page
  Fixed archives/project issue

• d93241f by mtkd 2 months ago

  Added ticket filter
  Cleaned up ticket fixtures

• 313ade1 by mtkd 2 months ago

  Added progress bars to roadmap

• f8da7f5 by mtkd 2 months ago

  Consolidated migrations
  Removed acts_as_taggable

• 813d3a3 by mtkd 2 months ago

  Updated text files

• ea5fdd4 by mtkd 2 months ago

  Removed old skin files

• c31d345 by mtkd 2 months ago

  Removed application_mode flag

• 9b00ccf by mtkd 2 months ago

  Improved journal event entries

• 68d4a13 by mtkd 2 months ago

  New message added
  Moved journals from a model subdir as was causing issue

• 9f4bbf1 by mtkd 2 months ago

  Moved project/activities to seperate controller

• 6697ef6 by mtkd 2 months ago

  Added messages list to project/activity

• bec4a42 by mtkd 2 months ago

  Fixed some @is_member issues
  Fixed project/log

• 593e72b by mtkd 2 months ago

  Refactored @project, moved to a before_filter
  Added a new @is_member global, true of current_user is a member of the active project

• c2d0e9f by mtkd 2 months ago

  First pass at adding activity messages

• c03e148 by mtkd 2 months ago

  Fixed members and tickets tabs

• 58d1587 by mtkd 2 months ago

  Added project events views

• 8993af0 by mtkd 2 months ago

  Added new event detail models

• 4b4b80f by mtkd 2 months ago

  Refactored model directory
  Fixed project list issue

• e92f1ea by mtkd 2 months ago

  Increase wiki view count
  Wiki tweaks

• 9cca876 by mtkd 2 months ago

  Blog post

• 7bb6e4c by mtkd 2 months ago

  Deleted some more old Appcast files
  Added Settings and Shortcuts models

• 97f3d5b by mtkd 2 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

  Conflicts:

  app/models/project.rb

• 366072f by mtkd 2 months ago

  Renamed project Gitlab

• d974156 by mtkd 2 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

• b647645 by mtkd 2 months ago

  Added activity tab

• 4c88887 by mtkd 2 months ago

  Added Event tab to project
  Renamed Documentation tab to Wiki

• 5274194 by mtkd 2 months ago

  Added Event (removed actions)

• 85ff46f by mtkd 2 months ago

  Journaling system (working for wiki)

• 9350cd8 by mtkd 2 months ago

  Added project membership system
  Added list wikis

• db50157 by mtkd 2 months ago

  Added new Wiki
  Added list Wiki

• 20411c9 by mtkd 2 months ago

  Added edit wiki
  Added input form styling

• 41e82b5 by mtkd 2 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

  Conflicts:

  app/controllers/users_controller.rb
  spec/controllers/users_controller_spec.rb

• 822e1b5 by mtkd 2 months ago

  User page working

• be4917c by mtkd 2 months ago

  First pass at action links for project tabs

• 9021c5d by mtkd 2 months ago

  Login working now
  Trivial text changes

• df822ca by mtkd 2 months ago

  Added Life Cycle, OS and Platform to Project

• ba25bb0 by mtkd 2 months ago

  Fixed <pre> style issue

• 78008a9 by mtkd 2 months ago

  Merge branch 'master' of git@gitorious.org:gitorious/appcast

  Conflicts:

  app/helpers/bluecloth_helper.rb
  test/fixtures/wiki_pages/_appcast_contents.txt

  nothing added to commit but untracked files present (use "git add" to track)

• 4a1f187 by mtkd 2 months ago

  Added :format to wiki to support <pre> as well as Markdown
  Added GNU AGPL license, links etc.
  Cleaned up some wiki pages

• dcf4651 by mtkd 2 months ago

  Cleaned up the Appcast wiki pages

• 1832dbd by mtkd 2 months ago

  Changed summary to a wiki page
  Removed wiki tab from project navigation

• ef3f457 by mtkd 2 months ago

  Got Bluecloth markdown reading wiki fixtures

• 631e6ac by mtkd 2 months ago

  Removed old Mediacloth files

• 59b937a by mtkd 2 months ago

  Added CodeRay syntax highlighting to Wiki

• 8e637bc by mtkd 2 months ago

  Changed from using MediaCloth to BlueCloth for Wiki
  Added more journal/action/event code

• a789a2d by mtkd 2 months ago

  Merging in Events and Actions from Krawek
  Minor journal changes

• 3f2c33f by mtkd 2 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

  Conflicts:

  app/models/project.rb
  app/views/logs/_log.html.erb

• 57cc0eb by mtkd 3 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

  Conflicts:

  TODO.txt

• 43b5569 by mtkd 3 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

• 892d6fa by mtkd 3 months ago

  Missing end after merge

• bd7b55f by mtkd 3 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

  Conflicts:

  .gitignore
  HACKING
  app/helpers/application_helper.rb
  app/helpers/repositories_helper.rb
  app/models/repository.rb
  app/views/logs/_log.html.erb
  app/views/logs/show.html.erb
  app/views/projects/show.html.erb
  public/stylesheets/base.css
  spec/helpers/application_helper_spec.rb
  spec/models/repository_spec.rb

• e7c9b25 by mtkd 3 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

• fb2ca29 by mtkd 3 months ago

  Added later version of MediaCloth

• 6953f21 by mtkd 3 months ago

  Fixed wiki paths in _appcast_contents

• 3ec5b72 by mtkd 3 months ago

  Fixed wiki paths in _appcast_contents

• 21802d3 by mtkd 3 months ago

  Fixed show article issue

• 1028b59 by mtkd 3 months ago

  Fix to get action migration working

• 6983249 by mtkd 3 months ago

  Deleting some files

• 47ab2b0 by mtkd 3 months ago

  Added Ticket, Component, Milestone, Journal models
  Changed project tab order
  Added project config tab
  Changed wikis to use slug
  Updated articles
  Added first pass wiki pages
  Added Action and Event tables from Krawek's event branch
  Added stubs for all project tabs

• 528882f by mtkd 3 months ago

  404 error now aware of Appcast
  Fixed some bullet issues
  Merged all project right column code in to one method with partials

• 21b4246 by mtkd 3 months ago

  Added projects/articles tab
  Added Wiki model, fixtures
  Added Mediacloth to /vendor
  Added wiki_id to Project

• e930737 by mtkd 3 months ago

  Removed spurious }; ref on error pages and fixed a margin issue

• deea82d by mtkd 3 months ago

  Fixed percentages on repotree

• 651a184 by mtkd 3 months ago

  Improved repo tree to support n (more than 2) repos
  Repository style tweaks and comments
  Changed some user.login to user.fullname
  Removed display of HTTP Clone URL
  Merged in most recent gitorious/master changes

• bfbb43d by mtkd 3 months ago

  Merge branch 'master' of git://gitorious.org/gitorious/mainline

• 36d078e by mtkd 3 months ago

  Added a repository tree table (in new repotree_helper.rb)
  Repository style tweaks

• abce72b by mtkd 3 months ago

  Second pass at formatting repository pages:

  Added description column to repositories
  Added number_of_displayed_commits to gitorious.yml
  Added action boxes for repository pages
  Got repositories tab system working without need for changing Gitorious projects route
  Style'd up all repository, log, commit and tree pages
  Breadcrumbs, tabs for all pages

• d4d5fc5 by mtkd 3 months ago

  First pass at formatting repository pages:

  Added project repository tab
  Added mech to breadcrumb as repository is drilled
  Added styling to repos pages
  Changed repository _infobox partial
  Reduced number of commits shown per page in Appcast to 10

• 686c7b7 by mtkd 3 months ago

  Added project show view and some helpers

• 9b316f9 by mtkd 3 months ago

  Fixed time minute wrong in format_datetime_article
  Added a global variable $application_mode to cache it
  Added system message to layout
  Prefixed all views and partials related to Appcast to ac_
  Added project index view
  Added Member model
  Renamed MODE_DEFAULT to MODE_GITORIOUS

• f12f2d9 by mtkd 3 months ago

  Fixed remove_column issue stopping migrations down

• 8510e1b by mtkd 3 months ago

  This commit adds everything to render the home page, archive page,
  and article page. There are 4 fixtured blog posts. The CSS has
  only been tested with Firefox 2

  Added APPCAST-README.txt
  Added enum-column plugin
  Added has_many_polymorphs plugin
  Added redhillonrails_core plugin (needed by foreign_key_migrations)
  Added foreign_key_migrations plugin
  Added fixture_references plugin
  Added Article and Category models
  Added config.load_paths to Rails::Initializer.run
  Added fixtures for Article and Category
  Added fixtures for basic Gitorious models
  Added routes for Article and more
  Added Articles controller and Articles helper
  Added Appcast specific home page and articles/ views
  Merged some methods in to application_helper
  Added extra fields to Projects
  Renamed user.displayname to user.fullname
  Added a new appcast_config.rb with all the global contstants
  Added image files

  Gitorious specific:
  - Had to add references => nil to some migrations to stop
  foreign key constraints being applied to Gitorious core

  - Note at least one existing Gitorious self.down appears bugged,
  and the schema won't go down/up I may do a seperate commit
  to fix

  Note: Run 'rake db:migrate' and 'rake db:fixtures:load' to test

  Screenshot of what it should render like:

  http://www.prj2.com/screenshot.png

• 86a15f8 by mtkd 3 months ago

  Added appcast.css stylesheet

• b7ebb4e by mtkd 3 months ago

  Added constants for application name etc.
  Added layout for Appcast

• 1ada413 by mtkd 3 months ago

  System to change to a different layout by setting:
  config/gitorious.sample.yml:
  application_mode = Gitorious|Appcast

• ede01de by mtkd 3 months ago

  More .gitingore additions

• 8b97d67 by mtkd 3 months ago

  Testing push to Gitorious, added nbproject to .gitignore

• Home |
• About |
• FAQ |
• Discussion group