chris
|
76b4356bc0
|
Move the old assets to Archive
|
2013-04-12 03:07:01 +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 |
|
chris
|
41dff814fb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
|
chris
|
7d5531bf01
|
Merge branch 'nccu_master' into demo_site
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
|
2012-08-22 18:07:49 +08:00 |
Matt
|
62ba8c9f18
|
Fix bugs on 172:180
|
2012-08-08 17:56:00 +08:00 |
Harry Bomrah
|
a0c09046a8
|
Timeline merge plus font update
|
2012-07-03 19:53:34 +08:00 |
|
devin
|
6533abf214
|
font awesome update
|
2012-07-02 11:10:01 +08:00 |
|
Christophe Vilayphiou
|
a1e74987dc
|
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
|
2012-06-29 16:10:29 +08:00 |
|
devin
|
887bda1491
|
lots of change
|
2012-05-02 17:04:16 +08:00 |
|
Christophe Vilayphiou
|
799fd1e3ac
|
Fix css bugs (opacity=) and changes in sign_in page
|
2012-04-27 15:27:59 +08:00 |
Christophe Vilayphiou
|
55d12e50f2
|
Ray's changes in announcenment back-end
|
2012-03-27 18:58:03 +08:00 |
|
Christophe Vilayphiou
|
55ae7de01c
|
Orbit-bar in front-end and back-end, side-bar and drop-down menu
|
2012-02-15 00:34:22 +08:00 |