rake task added

Merge branch 'desktop_design_devin' into desktop_work1
Conflicts: app/assets/javascripts/orbitdesktop.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
2013-04-09 01:05:54 +08:00 · 2013-04-08 17:30:13 +08:00 · 2013-04-03 15:38:59 +08:00 · 2013-04-03 15:27:24 +08:00 · 2013-04-03 15:24:30 +08:00 · 2013-04-03 15:03:05 +08:00
3445 changed files with 37767 additions and 147840 deletions
@@ -11,7 +11,7 @@ public/assets
 public/index.html
 public/panel/**/*
 public/uploads/**/*
-solr/data
+solr
 tmp/**/*
 uploads/**/*

@@ -20,6 +20,4 @@ uploads/**/*
 *.lck

 .sass-cache/*
-*.supported
-mongoid.yml
-*.
+*.supported
@@ -11,14 +11,10 @@ gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
-gem 'jquery-rails', '3.0.4'
-gem 'jquery-ui-rails', "4.0.5"
+gem 'jquery-rails', '2.1.4'
+gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
-gem 'time_difference'
-gem "acts_as_unvlogable"
-gem 'youtube_it'
-gem 'gotcha'
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'

 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -30,7 +26,6 @@ gem "mongo_session_store-rails3", '3.0.6'
 gem 'nokogiri'

 gem 'fb_graph'
-gem 'rack-gridfs'
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'
@@ -39,7 +34,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip', '< 1.0.0'
+gem 'rubyzip'

 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -50,15 +45,14 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'

-gem 'ckeditor'
-# gem 'tinymce-rails', "~> 3.5.8"
+gem 'tinymce-rails'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
-gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")
+gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")


-gem "impressionist",'1.2.0'
+gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
 #gem 'contacts'
 #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'

@@ -68,8 +62,6 @@ gem 'chinese_pinyin', '0.4.1'
 gem 'rmmseg-cpp-huacnlee', '0.2.9'
 gem 'redis-namespace'
 gem 'redis-search'
-gem 'syslog-logger'
-gem "recaptcha", :require => "recaptcha/rails"

 # Gems used only for assets and not required
 # in production environments by default.
@@ -98,8 +90,6 @@ group :test, :development do
  gem "watchr"
  gem "spork"
  gem "capybara"
-  #gem 'rack-mini-profiler'
-  gem "better_errors"
  # gem 'yard'
  # gem "bluecloth"
 end
@@ -0,0 +1,402 @@
+GIT
+  remote: git://github.com/amatsuda/kaminari.git
+  revision: 2e09b5374fec33b57c6387ca7bac89ecaa60c9eb
+  specs:
+    kaminari (0.14.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+
+GIT
+  remote: git://github.com/charlotte-ruby/impressionist.git
+  revision: 0894f6a550a33f83f4937d655e9f0774521781e4
+  specs:
+    impressionist (1.2.0)
+      httpclient (~> 2.2)
+      nokogiri (~> 1.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
+      mail (~> 2.4.4)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    attr_required (0.0.5)
+    bcrypt-ruby (3.0.0)
+    binding_of_caller (0.7.1)
+      debug_inspector (>= 0.0.1)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    brakeman (1.9.2)
+      erubis (~> 2.6)
+      fastercsv (~> 1.5)
+      haml (~> 3.0)
+      highline (~> 1.6)
+      multi_json (~> 1.2)
+      ruby2ruby (~> 2.0)
+      ruby_parser (~> 3.1.1)
+      sass (~> 3.0)
+      terminal-table (~> 1.4)
+    bson (1.8.2)
+    bson_ext (1.8.2)
+      bson (~> 1.8.2)
+    builder (3.0.4)
+    capybara (2.0.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    carrierwave (0.6.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    carrierwave-mongoid (0.2.2)
+      carrierwave (~> 0.6.1)
+      mongoid (~> 2.1)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    chinese_pinyin (0.4.1)
+    chronic (0.9.0)
+    coderay (1.0.9)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    columnize (0.3.6)
+    database_cleaner (0.9.1)
+    debug_inspector (0.0.2)
+    debugger (1.2.4)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.7)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.8)
+    delorean (2.1.0)
+      chronic
+    devise (1.5.3)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.1)
+    diff-lcs (1.1.3)
+    encrypted_strings (0.3.3)
+    erubis (2.7.0)
+    exception_notification (3.0.1)
+      actionmailer (>= 3.0.4)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+    faker (1.1.2)
+      i18n (~> 0.5)
+    fastercsv (1.5.5)
+    fattr (2.2.1)
+    fb_graph (2.6.4)
+      httpclient (>= 2.2.0.2)
+      multi_json (>= 1.3)
+      rack-oauth2 (>= 0.14.4)
+      tzinfo
+    ffi (1.4.0)
+    haml (3.1.8)
+    highline (1.6.15)
+    hike (1.2.1)
+    httpclient (2.3.2)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.0.1)
+      jquery-rails
+      railties (>= 3.1.0)
+    json (1.7.7)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    method_source (0.8.1)
+    mime-types (1.21)
+    mini_magick (3.5.0)
+      subexec (~> 0.2.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    mongo (1.8.2)
+      bson (~> 1.8.2)
+    mongo_session_store-rails3 (3.0.6)
+      actionpack (>= 3.0)
+      mongo
+    mongoid (2.6.0)
+      activemodel (~> 3.1)
+      mongo (~> 1.7)
+      tzinfo (~> 0.3.22)
+    mongoid-encryptor (0.0.5)
+      activesupport (~> 3.0)
+      encrypted_strings (~> 0.3.3)
+      mongoid (~> 2)
+    mongoid-tree (0.7.0)
+      mongoid (~> 2.0)
+    multi_json (1.6.1)
+    net-ldap (0.3.1)
+    nokogiri (1.5.6)
+    options (2.3.0)
+      fattr
+    orm_adapter (0.0.7)
+    polyglot (0.3.3)
+    pr_geohash (1.0.0)
+    progress_bar (0.4.0)
+      highline (~> 1.6.1)
+      options (~> 2.3.0)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-debugger (0.2.1)
+      debugger (~> 1.2.0)
+      pry (~> 0.9.10)
+    pry-remote (0.1.6)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-stack_explorer (0.4.9)
+      binding_of_caller (>= 0.7)
+      pry (~> 0.9.11)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-oauth2 (1.0.0)
+      activesupport (>= 2.3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.2.0.2)
+      i18n
+      multi_json (>= 1.3.6)
+      rack (>= 1.1)
+    rack-protection (1.3.2)
+      rack
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    radius (0.7.3)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
+      bundler (~> 1.0)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    redis (3.0.2)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
+    redis-search (0.9.0)
+      chinese_pinyin (>= 0.3.0)
+      redis (>= 2.1.1)
+      redis-namespace (>= 1.0.2)
+    resque (1.23.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque-restriction (0.3.0)
+      resque (>= 1.7.0)
+    resque-scheduler (2.0.0)
+      redis (>= 2.0.1)
+      resque (>= 1.20.0)
+      rufus-scheduler
+    rmmseg-cpp-huacnlee (0.2.9)
+    rsolr (1.0.8)
+      builder (>= 2.1.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    ruby2ruby (2.0.3)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.1.1)
+      sexp_processor (~> 4.1)
+    rubyzip (0.9.9)
+    rufus-scheduler (2.0.17)
+      tzinfo (>= 0.3.23)
+    sass (3.2.5)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    select2-rails (3.3.1)
+      sass-rails (>= 3.2)
+      thor (~> 0.14)
+    selenium-webdriver (2.30.0)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip
+      websocket (~> 1.0.4)
+    sexp_processor (4.1.5)
+    shoulda-matchers (1.4.2)
+      activesupport (>= 3.0.0)
+      bourne (~> 1.1.2)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    slop (3.4.3)
+    social-share-button (0.1.1)
+    spork (0.9.2)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    subexec (0.2.2)
+    sunspot (1.3.3)
+      pr_geohash (~> 1.0)
+      rsolr (~> 1.0.7)
+    sunspot-rails-tester (0.0.4)
+      sunspot_rails (~> 1.2)
+    sunspot_mongo (1.0.1)
+      sunspot_rails
+    sunspot_rails (1.3.3)
+      nokogiri
+      sunspot (= 1.3.3)
+    sunspot_solr (1.3.3)
+    terminal-table (1.4.5)
+    thor (0.17.0)
+    tilt (1.3.3)
+    tinymce-rails (3.5.8)
+      railties (>= 3.1.1)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    warden (1.2.1)
+      rack (>= 1.0)
+    watchr (0.7)
+    websocket (1.0.7)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  brakeman
+  bson_ext
+  capybara
+  carrierwave
+  carrierwave-mongoid
+  chinese_pinyin (= 0.4.1)
+  coffee-rails
+  database_cleaner
+  debugger
+  delorean
+  devise (= 1.5.3)
+  exception_notification
+  execjs
+  factory_girl_rails
+  faker
+  fb_graph
+  impressionist!
+  jquery-rails (= 2.1.4)
+  jquery-ui-rails
+  kaminari!
+  mime-types
+  mini_magick
+  mongo_session_store-rails3 (= 3.0.6)
+  mongoid (> 2.1, < 3.0.0)
+  mongoid-encryptor
+  mongoid-tree
+  net-ldap (~> 0.3.1)
+  nokogiri
+  progress_bar
+  pry
+  pry-debugger
+  pry-remote
+  pry-stack_explorer
+  radius
+  rails (~> 3.2.9)
+  rake
+  redis (>= 2.1.1)
+  redis-namespace
+  redis-search
+  resque
+  resque-restriction
+  resque-scheduler
+  rmmseg-cpp-huacnlee (= 0.2.9)
+  rspec (~> 2.0)
+  rspec-rails (~> 2.0)
+  rubyzip
+  sass-rails
+  select2-rails (= 3.3.1)
+  shoulda-matchers
+  simplecov
+  sinatra
+  social-share-button
+  spork
+  sprockets
+  sunspot-rails-tester
+  sunspot_mongo
+  sunspot_solr
+  tinymce-rails
+  uglifier
+  watchr
Author	SHA1	Message	Date
harrybomrah	4eefca8531	rake task added	2013-04-09 01:05:54 +08:00
harrybomrah	96b6f7e3fd	Merge branch 'desktop_design_devin' into desktop_work1 Conflicts: app/assets/javascripts/orbitdesktop.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb	2013-04-08 17:30:13 +08:00
devin chen	3d7b54df1c	minor update	2013-04-03 15:38:59 +08:00
harrybomrah	e8a6c2cc3c	stupid commit	2013-04-03 15:27:24 +08:00
harrybomrah	ecf0aa7d2e	small fix in select2.js	2013-04-03 15:24:30 +08:00
devin chen	2f0533db2d	minor update	2013-04-03 15:03:05 +08:00
devin chen	350c68611c	starting new branch ( add rules in .gitignore for SASS cache folder )	2013-04-02 12:02:19 +08:00
harrybomrah	8b44f930f3	widget and gridster fixes	2013-04-01 18:00:47 +08:00
devin	d2330d6e3e	devin's new branch	2013-04-01 11:45:12 +08:00
chris	bd3e9fe4f6	Fix js bug and asset url after merge	2013-03-29 17:50:21 +08:00
devin	4bb5e18f44	recover .gitignore file Conflicts: .gitignore	2013-03-29 12:33:35 +08:00
harrybomrah	78205d8b00	features and widgets added Conflicts: app/assets/javascripts/orbitdesktop.js	2013-03-29 12:04:21 +08:00
devin	a62ff9308f	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-29 12:03:15 +08:00
Matt K. Fu	474e8b9b57	fix for both part and page part settings Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb	2013-03-29 11:12:52 +08:00
Spen	a8f7422c25	faq app	2013-03-29 11:09:56 +08:00
Fu Matthew	9e02011956	deliver API	2013-03-29 11:08:22 +08:00
chris	3f0addf04d	Fix bug in setup_app_frontend_and_style	2013-03-26 16:29:35 +08:00
chris	0a01faedc9	Fix merge error	2013-03-26 16:16:19 +08:00
chris	8e0331449f	Merge branch 'patrial_Select_for_default_widget_style' of github.com:Rulingcom/orbit into patrial_Select_for_default_widget_style Conflicts: app/controllers/admin/pages_controller.rb app/helpers/admin/page_parts_helper.rb	2013-03-21 18:51:16 +08:00
Fu Matthew	635d3f1690	add conditions for making multi cates and tags more stable	2013-03-21 18:49:53 +08:00
Fu Matthew	9e33bdadc3	now default options can be chosen by developer at init	2013-03-21 18:46:57 +08:00
Fu Matthew	54acaebc98	style for front end	2013-03-21 18:46:56 +08:00
Fu Matthew	7f7e21b4f2	1.make module app forbid unearthed access except from admin 2.override sidebar link when it's object_auth or app_auth.	2013-03-21 18:45:28 +08:00
Fu Matthew	8609c8dec0	put add admin pages using orbit back end controller	2013-03-21 18:45:27 +08:00
chris	f3e40c1405	Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop Conflicts: Gemfile.lock vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb	2013-03-21 18:39:09 +08:00
Rueshyna	42aca64dc3	correct model method	2013-03-21 18:29:25 +08:00
harrybomrah	6ba840de4a	app manager changed plus some changes	2013-03-21 18:29:22 +08:00
harrybomrah	53953e57db	section page fixed..	2013-03-21 18:27:23 +08:00
Rueshyna	ddf61e5606	fixed co author relation save button	2013-03-21 18:25:37 +08:00
harrybomrah	5685e11511	app manager changed plus some changes	2013-03-21 18:25:37 +08:00
harrybomrah	0e39de56e2	section page fixed..	2013-03-21 18:25:36 +08:00
devin	677faf1811	add browser compatibility page	2013-03-21 18:25:36 +08:00
Rueshyna	f0fbd50261	fixed checkout and start in personal plugin	2013-03-21 18:25:36 +08:00
Rueshyna	573270c98c	correct factoried girl for journal	2013-03-21 18:25:36 +08:00
Rueshyna	f61b786e90	one abstract one column for personal plugin	2013-03-21 18:25:36 +08:00
Rueshyna	d085197635	add pagination for every controller and view in personal plugin	2013-03-21 18:25:36 +08:00
harrybomrah	6c58a0f773	compatibility page added and tinyscrollbar drag event fixed..	2013-03-21 18:25:33 +08:00
harrybomrah	478b54da26	tinyscrollbar pagination fixed	2013-03-21 18:25:05 +08:00
harrybomrah	e799ac4395	insert and remove columns	2013-03-21 18:25:05 +08:00
harrybomrah	c101413d32	Major tinyscrollbar update	2013-03-21 18:25:02 +08:00
Rueshyna	50a09763ec	modify translation for journal_co_author_relation button	2013-03-21 18:24:20 +08:00
Rueshyna	811b30791b	modify nil of email string and sort	2013-03-21 18:24:20 +08:00
Rueshyna	4b8c68500a	remove redundant space of co_author sample data	2013-03-21 18:24:20 +08:00
Rueshyna	e5e45f3ada	make index of list can be hightline list when click cancel button	2013-03-21 18:24:20 +08:00
Rueshyna	f619c5e389	fixed author sample data generation and model method	2013-03-21 18:24:20 +08:00
Rueshyna	3c6ca3c254	add author filter for journal and fix some bug	2013-03-21 18:24:20 +08:00
Rueshyna	12fdb5a0ca	have done conference author filter, journal haven't been done, yet	2013-03-21 18:24:16 +08:00
harrybomrah	7df0be3826	tinyscrollbar pagination fixed	2013-03-21 18:22:28 +08:00
harrybomrah	80be9e63ef	insert and remove columns	2013-03-21 18:22:28 +08:00
harrybomrah	0444b1f5e5	Major tinyscrollbar update	2013-03-21 18:22:06 +08:00
Rueshyna	91d3e1d92c	add pagination for personal plugin	2013-03-21 18:16:08 +08:00
Rueshyna	fb8407dbe3	fixed bug	2013-03-21 18:10:55 +08:00
harrybomrah	9963c9fb68	insert and remove columns	2013-03-21 18:09:39 +08:00
devin	80a2f67dda	tinyscrollbar css minor update	2013-03-21 18:09:39 +08:00
harrybomrah	7b2e7f5297	Major tinyscrollbar update	2013-03-21 18:09:39 +08:00
harrybomrah	38a695d8a9	all none for conf done	2013-03-21 18:09:38 +08:00
harrybomrah	df83c6fff7	all none fixed	2013-03-21 18:09:38 +08:00
Rueshyna	adec8c8938	correct model method	2013-03-15 15:10:14 +08:00
Rueshyna	2746616610	Merge branch 'desktop_work' into desktop * desktop_work: app manager changed plus some changes section page fixed.. section page fixed.. add browser compatibility page Conflicts: vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb	2013-03-14 19:00:06 +08:00
Rueshyna	61cc8f0f54	fixed co author relation save button	2013-03-14 18:29:24 +08:00
harrybomrah	31476bb813	app manager changed plus some changes	2013-03-14 17:55:33 +08:00
harrybomrah	d2c1abeb95	section page fixed..	2013-03-14 17:54:38 +08:00
devin	f0c19cfdf9	add browser compatibility page	2013-03-14 17:54:38 +08:00
harrybomrah	8ab4e90a06	app manager changed plus some changes	2013-03-14 17:48:45 +08:00
Rueshyna	7a78594594	fixed checkout and start in personal plugin	2013-03-14 17:43:29 +08:00
Rueshyna	b50548c538	correct factoried girl for journal	2013-03-14 17:43:01 +08:00
harrybomrah	84f255173c	Merge branch 'desktop_work_devin' into desktop_work	2013-03-14 14:17:13 +08:00
harrybomrah	b4ba4149d4	section page fixed..	2013-03-14 14:16:38 +08:00
harrybomrah	3830fddfe0	section page fixed..	2013-03-14 14:00:04 +08:00
Fu Matthew	66633443de	add conditions for making multi cates and tags more stable	2013-03-13 17:53:11 +08:00
devin	3d7fbd9711	add browser compatibility page	2013-03-13 15:49:20 +08:00
Fu Matthew	aa851cad76	now default options can be chosen by developer at init	2013-03-13 14:09:10 +08:00
Rueshyna	4a2c994401	one abstract one column for personal plugin	2013-03-13 14:05:06 +08:00
Rueshyna	af6813480a	add pagination for every controller and view in personal plugin	2013-03-12 17:00:42 +08:00
harrybomrah	4a83521b84	compatibility page added and tinyscrollbar drag event fixed..	2013-03-12 15:23:38 +08:00
Rueshyna	470dbea22d	Merge branch 'desktop' into desktop_work * desktop: tinyscrollbar pagination fixed insert and remove columns Major tinyscrollbar update modify translation for journal_co_author_relation button modify nil of email string and sort remove redundant space of co_author sample data make index of list can be hightline list when click cancel button fixed author sample data generation and model method add author filter for journal and fix some bug have done conference author filter, journal haven't been done, yet	2013-03-12 14:16:25 +08:00
harrybomrah	8e369fe819	tinyscrollbar pagination fixed	2013-03-12 11:42:17 +08:00
harrybomrah	2b4e53ed1b	insert and remove columns	2013-03-12 11:42:17 +08:00
harrybomrah	6d194759fa	Major tinyscrollbar update	2013-03-12 11:42:16 +08:00
Rueshyna	d20081157a	modify translation for journal_co_author_relation button	2013-03-12 11:22:11 +08:00
harrybomrah	e88487bc9f	tinyscrollbar pagination fixed	2013-03-12 11:18:32 +08:00
Fu Matthew	311d741f92	style for front end	2013-03-11 18:21:17 +08:00
Rueshyna	8e0632236b	modify nil of email string and sort	2013-03-11 17:21:02 +08:00
Rueshyna	78abcac1cb	remove redundant space of co_author sample data	2013-03-11 17:20:24 +08:00
Rueshyna	385e043809	make index of list can be hightline list when click cancel button	2013-03-11 17:18:58 +08:00
Rueshyna	8d5a2d71b7	fixed author sample data generation and model method	2013-03-11 14:53:21 +08:00
Rueshyna	1880ed11ca	add author filter for journal and fix some bug	2013-03-11 10:41:07 +08:00
Rueshyna	96602842a3	have done conference author filter, journal haven't been done, yet	2013-03-08 19:16:01 +08:00
harrybomrah	ca64cba9ad	updated	2013-03-08 12:54:58 +08:00
harrybomrah	4f64ff3568	insert and remove columns	2013-03-08 12:23:15 +08:00
devin	a22c0c46e0	tinyscrollbar css minor update	2013-03-08 12:23:15 +08:00
harrybomrah	196030b4b4	Major tinyscrollbar update	2013-03-08 12:23:15 +08:00
Rueshyna	75a5e74bc0	add pagination for personal plugin	2013-03-08 12:01:13 +08:00
harrybomrah	39a20f6cc9	Merge branch 'desktop_work' into desktop_work_devin	2013-03-07 19:16:41 +08:00
harrybomrah	32d56232bc	insert and remove columns	2013-03-07 19:15:30 +08:00
devin	b7beadfc04	tinyscrollbar css minor update	2013-03-07 17:44:02 +08:00
Fu Matthew	e53ad9f5d1	1.make module app forbid unearthed access except from admin 2.override sidebar link when it's object_auth or app_auth.	2013-03-07 16:51:47 +08:00
Rueshyna	b2cbcf6629	fixed bug	2013-03-07 10:50:43 +08:00
harrybomrah	906e522a6a	Major tinyscrollbar update	2013-03-06 19:04:33 +08:00
Fu Matthew	4f7928ad1b	Merge branch 'development' of github.com:Rulingcom/orbit into development	2013-03-06 15:17:06 +08:00
Fu Matthew	77c7053bf1	put add admin pages using orbit back end controller	2013-03-06 15:16:20 +08:00
harrybomrah	20ac4f1ac0	all none for conf done	2013-03-06 12:08:08 +08:00
harrybomrah	9931eb7f61	all none fixed	2013-03-06 11:32:53 +08:00