developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,921 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

1631 Commits

Author SHA1 Message Date
chris 12df0e7f85 Remove ckeditor 2013-04-12 04:22:36 +08:00
chris a9d25dcdec Orbit bar 
Structure: page, link, edit and new, page view, edit page parts
Temporary disable authentication in items controller
 2013-04-12 03:13:03 +08:00
chris e4c33b443f Put new assets and use some old ones 2013-04-12 03:09:40 +08:00
chris 76b4356bc0 Move the old assets to Archive 2013-04-12 03:07:01 +08:00
Matt K. Fu b58e08b872 Merge commit 'fb800b488b2e81eec259554e9e6a9ac4ffc4f231' into development 2013-04-08 11:53:20 +08:00
Matt K. Fu e3666acdeb Merge commit '0a7c43bbb96e7f91bd6ecb76f60733093473feaa' into development 2013-04-08 10:53:10 +08:00
Matt K. Fu fb800b488b widget link followed by setting 2013-04-03 19:03:16 +08:00
Matt K. Fu 0a7c43bbb9 fix default widget link failed 2013-04-03 18:05:12 +08:00
Matt K. Fu a85d1f938c fix frontend ajax respond 404 due to javascript overwritten after assets precompile 2013-04-03 17:49:59 +08:00
chris 5b2f653b5a Change in announcement init for query 
Change in default widget query
 2013-04-03 12:05:59 +08:00
Matt K. Fu 74f9dea6b9 Merge commit '20bdeb3c2d55f6c0404ae604108c4c23c3d4aa67' into development 2013-04-02 18:40:48 +08:00
Matt K. Fu 20bdeb3c2d fix widget and fronted setting interface. checked with Spen 2013-04-02 18:39:46 +08:00
Matt K. Fu 695d712843 Merge commit '8b44f930f38d70098da5793bd795400eb088a052' into development 
Conflicts:
	app/assets/javascripts/orbitdesktop.js
 2013-04-02 18:05:30 +08:00
Harry Bomrah 8b44f930f3 widget and gridster fixes 2013-04-01 18:00:47 +08:00
Matt K. Fu 3476237fa7 solved conflicts 2013-04-01 17:18:41 +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
Harry Bomrah 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
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
Harry Bomrah 5685e11511 app manager changed plus some changes 2013-03-21 18:25:37 +08:00
Harry Bomrah 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
Harry Bomrah 6c58a0f773 compatibility page added and tinyscrollbar drag event fixed.. 2013-03-21 18:25:33 +08:00
Rueshyna 12fdb5a0ca have done conference author filter, journal haven't been done, yet 2013-03-21 18:24:16 +08:00
Harry Bomrah 7df0be3826 tinyscrollbar pagination fixed 2013-03-21 18:22:28 +08:00
Harry Bomrah 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
Harry Bomrah 7b2e7f5297 Major tinyscrollbar update 2013-03-21 18:09:39 +08:00
Harry Bomrah df83c6fff7 all none fixed 2013-03-21 18:09:38 +08:00
chris d01968dcd0 Changes in query for default widget 2013-03-21 02:29:56 +08:00
chris 617ebfd43a Revert "Fix query for top in bulletin" 
This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f.
 2013-03-19 23:44:02 +08:00
chris b55988af33 Fix query for top in bulletin 2013-03-19 23:44:02 +08:00
chris 9684189258 Fix query for date in bulletin 2013-03-19 23:43:59 +08:00
chris 8374bc8d12 Set I18n from browser 2013-03-19 23:43:31 +08:00
chris 9cf8c2b72b Revert "Page front end stay in the same page when a link is clicked (category)" 
This reverts commit 14d856b4d6.
 2013-03-19 20:00:16 +08:00
chris 14d856b4d6 Page front end stay in the same page when a link is clicked (category) 2013-03-19 19:44:04 +08:00
chris 37a38369e7 Fix typo in default widget not showing objects in front end 2013-03-19 18:41:03 +08:00
chris ff30b3d05e Fix link not showing for default front end 2013-03-19 18:23:35 +08:00
chris f3c809fd58 Fix link switch not showing for default front end 2013-03-19 17:49:46 +08:00
chris 5e4e3ac560 Fix link for default widget 
Convert single id to array to find item
 2013-03-19 17:14:01 +08:00