aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2012-06-06Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Alban Peignier
2012-06-06Add view to manage several Import implementationsAlban Peignier
2012-06-06Merge branch 'master' into journey_patternMarc Florisson
2012-06-06pre-select all route's stop on journey_pattern creation formMarc Florisson
2012-06-06fix vehicle_journeys viewsMarc Florisson
2012-06-06correct trac #28, #30 and #35Michel Etienne
2012-06-05referential specMichel Etienne
2012-06-05Remove forced let!Alban Peignier
2012-06-05Make all requests specs pendingAlban Peignier
2012-06-05Make all requests specs pendingAlban Peignier
2012-06-04Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Alban Peignier
2012-06-04Add several import types supportAlban Peignier
2012-06-04add fields to referentials and update textilesMichel Etienne
2012-06-04update ninoxeMarc Florisson
2012-06-04vehicle_journey change journey_patternMarc Florisson
2012-06-04update ninoxeMarc Florisson
2012-06-04Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Marc Florisson
2012-06-01Add popup with name for stop_areaLuc Donnet
2012-06-01Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Marc Florisson
2012-06-01refactor table and column namesMarc Florisson
2012-05-30Create and display ImportLogMessages. Refs #39Alban Peignier
2012-05-30Remove a nice putsAlban Peignier
2012-05-29Removes explicit ApplicationMap#html_safeAlban Peignier
2012-05-29Manage multiple selection to destroy several lines. Refs #25Alban Peignier
2012-05-29Include html_safe an ready? in ApplicationMap#to_htmlAlban Peignier
2012-05-23Revert changes in database.ymlAlban Peignier
2012-05-23Add jruby-rack-worker to run workers. Fixes #37Alban Peignier
2012-05-23Run migrations after initialize when CHOUETTE_RUN_MIGRATIONS is defined. Defi...Alban Peignier
2012-05-23Add chouette2.war and vendor/bundle in .gitignoreAlban Peignier
2012-05-22Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Marc Florisson
2012-05-22add a request spec on stop_pointMarc Florisson
2012-05-22add iteration info in helpMichel Etienne
2012-05-21second workaroundMichel Etienne
2012-05-21Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Marc Florisson
2012-05-21workaround for spec/request/stop_pointsMarc Florisson
2012-05-21spec changes on action labelsMichel Etienne
2012-05-21pluralize in will paginateMichel Etienne
2012-05-21synchro Gemfile.lockMichel Etienne
2012-05-21Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Michel Etienne
2012-05-21sass-railsMichel Etienne
2012-05-21Fix ninoxe version in GemfileLuc Donnet
2012-05-21Add ffi for georuby ext and update stop area map Refs #18 #20 #22Luc Donnet
2012-05-21Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Marc Florisson
2012-05-20Disable asynchronous import for the momentAlban Peignier
2012-05-17Marks ImportsController specs as pending. Refs #23Alban Peignier
2012-05-16add some spec on route and stop_pointsMarc Florisson
2012-05-16Configure production.rb for chouette-command and Import.root. Fixes #23Alban Peignier
2012-05-16Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2Alban Peignier
2012-05-16Integrate DelayedJob to delay imports. Refs #139Alban Peignier
2012-05-16fix redirect_to on after stop_point insertMarc Florisson