Orbit/.gitignore

!.gitignore
.bundle
.DS_Store
.rvmrc

Gemfile.lock
Procfile
log/*

db/*.sqlite3
log/*.log
public/assets
public/index.html
public/panel/**/*
public/uploads/**/*
solr/data
tmp/**/*
uploads/**/*
config/*.god
log/*.gz
tmp/restart.txt
*.swp
*.pid
*.lck

.sass-cache/*
*.supported
mongoid.yml
add log folder 2011-01-28 02:27:24 +00:00			`!.gitignore`
upgrade to rails3, but grip is broken 2010-03-08 08:04:05 +00:00			`.bundle`
Lots of Update 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb 2013-03-25 08:23:07 +00:00			`.DS_Store`
			`.rvmrc`

			`Gemfile.lock`
Changes for NTU common Conflicts: lib/tasks/migrate.rake Conflicts: lib/tasks/migrate.rake Conflicts: config/resque_schedule.yml lib/tasks/migrate.rake 2013-06-10 07:52:11 +00:00			`Procfile`
			`log/*`
Lots of Update 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb 2013-03-25 08:23:07 +00:00
upgrade to rails3, but grip is broken 2010-03-08 08:04:05 +00:00			`db/*.sqlite3`
init rails 2.3.2 2009-05-07 16:53:18 +00:00			`log/*.log`
Lots of Update 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb 2013-03-25 08:23:07 +00:00			`public/assets`
			`public/index.html`
			`public/panel/*/`
add log folder 2011-01-28 02:27:24 +00:00			`public/uploads/*/`
add sold setting back 2013-06-17 05:45:30 +00:00			`solr/data`
Lots of Update 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb 2013-03-25 08:23:07 +00:00			`tmp/*/`
CarrierWave workaround: the files have to be saved manually 2011-07-14 00:48:42 +00:00			`uploads/*/`
fix template for solar error. gitingore 2013-08-28 02:37:19 +00:00			`config/*.god`
			`log/*.gz`
			`tmp/restart.txt`
complete del and destroy funciton for desgin 2011-07-22 07:54:38 +00:00			`*.swp`
stop saving sold files on git 2012-09-04 01:34:14 +00:00			`*.pid`
starting new branch ( add rules in .gitignore for SASS cache folder ) 2013-04-02 04:02:19 +00:00			`*.lck`

			`.sass-cache/*`
add sold setting back 2013-06-17 05:45:30 +00:00			`*.supported`
Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. 2013-06-19 09:16:52 +00:00			`mongoid.yml`