OSDN Git Service

conflict
[pettanr/pettanr.git] / app / assets / javascripts / main.js.coffee
2015-10-01 yasushiitoconflict
2015-08-25 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-08-25 yasushiitofix: any
2015-08-20 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-08-20 yasushiitofix: sync error
2015-08-13 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-08-13 yasushiitot#:
2015-08-06 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-08-05 yasushiitofix: suport yasapp oauth
2015-07-23 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-07-23 yasushiitofix: view
2015-04-12 yasushiitofix: cache
2015-04-09 yasushiitooperator move to cache
2015-04-06 yasushiitomerge:
2015-04-06 yasushiitochange: cache system
2015-03-13 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-03-13 yasushiitoadd cache
2015-02-10 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-02-08 yasushiitosave point
2015-02-06 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-02-05 yasushiitofix router and render
2015-02-02 yasushiitofix layout default
2015-02-01 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-01-29 yasushiitocrush router and render
2014-12-01 yasushiitoclean
2014-11-28 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-11-28 yasushiitoadd editor event
2014-10-17 yasushiitofix initial page
2014-10-16 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-10-16 yasushiitofix sign in header
2014-10-09 yasushiitoredraw page title
2014-10-05 yasushiitoassets compile
2014-10-05 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-10-03 yasushiitofix summary
2014-10-01 yasushiitoadd cache
2014-09-26 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-09-25 yasushiitoadd show
2014-09-22 yasushiitofix bucket
2014-09-21 yasushiitoadd bucket
2014-09-19 yasushiitomrg
2014-09-19 yasushiitocolor helper
2014-09-02 yasushiitofix filer edit box
2014-08-31 yasushiitofix profiler
2014-08-30 yasushiitofix filer
2014-08-29 yasushiitoadd profiler
2014-08-23 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-08-21 yasushiitofix:js filer router
2014-08-20 yasushiitofix:js filer router
2014-08-11 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-08-10 yasushiitofix js filer folder
2014-08-09 yasushiitoadd js controllers
2014-08-08 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-08-08 yasushiitofix js filer
2014-07-19 yasushiitofix js filer
2014-07-17 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-07-11 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-07-11 yasushiitoadd js
2014-07-02 yasushiitofix ap
2014-06-27 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-06-27 yasushiitofix ap
2014-06-16 yasushiitofix boost template