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

2911 Commits

Author SHA1 Message Date
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
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
Harry Bomrah 6ba840de4a app manager changed plus some changes 2013-03-21 18:29:22 +08:00
Harry Bomrah 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
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
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
Harry Bomrah 6c58a0f773 compatibility page added and tinyscrollbar drag event fixed.. 2013-03-21 18:25:33 +08:00
Harry Bomrah 478b54da26 tinyscrollbar pagination fixed 2013-03-21 18:25:05 +08:00
Harry Bomrah e799ac4395 insert and remove columns 2013-03-21 18:25:05 +08:00
Harry Bomrah 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
Harry Bomrah 7df0be3826 tinyscrollbar pagination fixed 2013-03-21 18:22:28 +08:00
Harry Bomrah 80be9e63ef insert and remove columns 2013-03-21 18:22:28 +08:00
Harry Bomrah 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
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