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

1762 Commits

Author SHA1 Message Date
Matt K. Fu 2806dd35a9 spen's fix for user 2013-05-23 14:03:18 +08:00
Matt K. Fu 54a35b30be fix design index bug when start start from blank DB. 
add delay impressionist.
add several i18n vars
 2013-05-23 12:07:43 +08:00
Matt K. Fu 37aa950028 user action 2013-05-23 11:55:57 +08:00
Spen 5b368235e8 ntu dropdown fix list sort 2013-05-14 14:19:55 +08:00
Spen b8da40b4ae ntu_dropdown_fix 2013-05-14 14:19:55 +08:00
Matt K. Fu 287e77836d fix css compiling error 2013-05-14 14:19:20 +08:00
Matt K. Fu 3e6c2b1ec2 fix member error with blank database 2013-05-14 11:48:13 +08:00
Matt K. Fu f2247aab32 ray's css fix 2013-05-14 11:27:15 +08:00
Matt K. Fu ef2c732d2e make blank site working better 2013-05-14 11:26:35 +08:00
Matt K. Fu 1096db79b6 blank site now can be start from rake site:build 2013-05-14 10:32:53 +08:00
Matt K. Fu 88d55989de change logger 2013-05-14 10:29:11 +08:00
chris c2331695cd Set order of page context to match the order of structure 
Add some params to keep the sorting
 2013-05-07 11:15:30 +08:00
chris 127ab3845c Changes for queries 2013-05-03 12:12:19 +08:00
chris aefd62da2a Add tagged_ids to taggable 2013-05-03 12:12:19 +08:00
chris 167a71272a queries need to be rethink 2013-05-03 12:12:19 +08:00
Matt K. Fu 7d077a92a5 system preference 2013-04-29 15:23:15 +08:00
Matt K. Fu 64101109dd disable all sorted_tags 2013-04-26 18:07:59 +08:00
Matt K. Fu 3e567223e3 fix for Spen's translation and Chris's tag error 2013-04-26 15:37:27 +08:00
Spen 79ef86f2c9 member translation fix 2013-04-26 11:26:11 +08:00
Matthew K. Fu JuYuan d047a3d62a chris tags update 2013-04-26 11:26:10 +08:00
Spen 697944a029 user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
Matt K. Fu a0478f2a8f fix page name repeated error when page creating 2013-04-25 12:19:25 +08:00
Matt K. Fu b198b1a17b system preference 2013-04-24 19:21:11 +08:00
Matt K. Fu 62fa589e8a add msg when user session expired at page admin 2013-04-24 11:58:48 +08:00
Matt K. Fu 5ff7dfbac6 fronted open switch and backend openness 2013-04-23 18:48:18 +08:00
Matt K. Fu 41168f4c99 fix for fronted routing failed 2013-04-23 10:01:02 +08:00
Matt K. Fu 7e9fce0c2d clean Harry's code 2013-04-17 14:31:10 +08:00
Harry Bomrah 38d5a193e0 tiny scrollbar trigger fixed and devin branch merged 2013-04-17 14:31:09 +08:00
devin chen 989e5aa974 minor update 2013-04-17 14:29:56 +08:00
devin chen aedab01ae6 minor update 2013-04-17 14:29:04 +08:00
devin chen e3782c9cf7 minor update 2013-04-17 14:29:04 +08:00
Harry Bomrah e2802d94d0 rake task added 2013-04-17 14:28:13 +08:00
devin chen 055d758769 Page Loading Effect 
tinyscrollbar has problem
 2013-04-17 14:27:18 +08:00
Matt K. Fu a4ebe31ada fix for widget edit js missing 2013-04-17 14:19:32 +08:00
Matt K. Fu 3098496083 widget link followed by setting 2013-04-17 14:19:32 +08:00
Matt K. Fu 28f0df5da8 fix default widget link failed 2013-04-17 14:19:32 +08:00
Matt K. Fu 3de4591413 fix frontend ajax respond 404 due to javascript overwritten after assets precompile 2013-04-17 14:19:32 +08:00
devin chen d177fe0369 minor update 2013-04-17 14:19:32 +08:00
Harry Bomrah c6868bf2e0 small fix in select2.js 2013-04-17 14:18:49 +08:00
devin chen 95e308e046 minor update 2013-04-17 14:18:49 +08:00
Matt K. Fu 425a320c02 fix widget and fronted setting interface. checked with Spen 2013-04-17 14:16:24 +08:00
devin chen dc5f24ab22 starting new branch ( add rules in .gitignore for SASS cache folder ) 2013-04-17 14:16:24 +08:00
Harry Bomrah bc0477a5ed widget and gridster fixes 2013-04-17 14:16:24 +08:00
Matt K. Fu 0781779ac0 solved conflicts 2013-04-17 14:14:24 +08:00
devin e7bffe4c0f devin's new branch 2013-04-17 14:14:24 +08:00
chris dd10b3147c Fix js bug and asset url after merge 2013-04-17 14:14:24 +08:00
devin cae43e8acd recover .gitignore file 
Conflicts:
	.gitignore
 2013-04-17 14:14:23 +08:00
Harry Bomrah 793d739726 features and widgets added 
Conflicts:
	app/assets/javascripts/orbitdesktop.js
 2013-04-17 14:14:23 +08:00
devin c8aa50ee87 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-04-17 14:14:23 +08:00
Matt K. Fu 0f6f5aafce 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-04-17 14:12:52 +08:00
Fu Matthew f6b600df59 deliver API 2013-04-17 14:09:01 +08:00
chris 6af375efa4 Fix bug in setup_app_frontend_and_style 2013-04-17 14:09:00 +08:00
Fu Matthew 1709773b0a style for front end 2013-04-17 14:08:01 +08:00
Harry Bomrah 764f83d58c app manager changed plus some changes 2013-04-17 14:01:14 +08:00
Harry Bomrah 8dee211ab4 section page fixed.. 2013-04-17 14:01:14 +08:00
Harry Bomrah f9e7cefc94 compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 13:59:16 +08:00
Harry Bomrah 41643d1f61 tinyscrollbar pagination fixed 2013-04-17 12:11:33 +08:00
Harry Bomrah 54af5e8bd4 insert and remove columns 2013-04-17 12:06:33 +08:00
Harry Bomrah 6db9e70132 Major tinyscrollbar update 2013-04-17 12:04:22 +08:00
Harry Bomrah dae3f069ff app manager changed plus some changes 2013-04-17 11:09:56 +08:00
Harry Bomrah b1d7d5345e section page fixed.. 2013-04-17 11:08:58 +08:00
Fu Matthew 6efef253a6 add conditions for making multi cates and tags more stable 2013-04-17 11:08:57 +08:00
devin 0d5ab20efa add browser compatibility page 2013-04-17 11:07:45 +08:00
Fu Matthew 9815950083 now default options can be chosen by developer at init 2013-04-17 11:07:45 +08:00
Harry Bomrah b8ee2fd559 compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 11:07:20 +08:00
Harry Bomrah 323fadc210 tinyscrollbar pagination fixed 2013-04-17 11:05:57 +08:00
Fu Matthew 69a49a69aa style for front end 2013-04-17 11:05:57 +08:00
Rueshyna 625f2e9ad6 have done conference author filter, journal haven't been done, yet 2013-04-17 11:04:52 +08:00
Harry Bomrah d840b82fa9 insert and remove columns 2013-04-17 10:56:15 +08:00
devin 84dfb44e78 tinyscrollbar css minor update 2013-04-17 10:56:15 +08:00
Fu Matthew 4a08a1992b 1.make module app forbid unearthed access except from admin 
2.override sidebar link when it's object_auth or app_auth.
 2013-04-17 10:56:15 +08:00
Harry Bomrah 1d06bcaae7 Major tinyscrollbar update 2013-04-17 10:54:38 +08:00
Fu Matthew 8e98cb3ec9 put add admin pages using orbit back end controller 2013-04-17 10:54:38 +08:00
Harry Bomrah 0189d1c2c0 all none fixed 2013-04-17 10:54:38 +08:00
chris 3e96cfe514 Changes for FAQ to work with not latest but stable code 2013-03-28 15:05:52 +08:00
chris da8a5123c2 Change in announcement init for query 
Change in default widget query
 2013-03-27 16:31:42 +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
chris 7dcea95dd4 Fix query for multi categories and tags (empty array) 2013-03-19 15:10:31 +08:00
chris ef2a32be4c Fix query for multi categories and tags 2013-03-18 22:01:08 +08:00
chris 157935e7eb Page front end stay in the same page when a link is clicked (title or pagination) 2013-03-18 21:54:06 +08:00
chris e208e99a73 Fix page part update when no tag or category 2013-03-13 15:45:30 +08:00
chris b864cc0268 Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
chris 73e9a60212 Pagination or more link for default widget 2013-03-07 21:21:48 +08:00
Spen d7d480ac12 archive edit & plugins edit 2013-03-07 21:12:31 +08:00
chris 147b7b9292 Fix update when no tag or category 2013-03-07 17:30:49 +08:00
chris 27686a5d04 Merge branch 'development' into desktop 2013-03-05 19:07:58 +08:00
Rueshyna a9bf400fac Merge branch 'desktop_work_devin' into desktop 
* desktop_work_devin:
  tinyscrollbar minor update
  desktop CSS update
  tinyscrollbar minor update
  desktop CSS update

Conflicts:
	app/views/desktop/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
	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/_form.html.erb
	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_window.html.erb
 2013-03-05 18:48:12 +08:00
Fu Matthew dc3966be81 fix cates and tags 2013-03-05 18:34:41 +08:00
Rueshyna d5f1d13670 Merge remote-tracking branch 'origin/desktop_work' into desktop 
* origin/desktop_work:
  simple layout tinyscrollbar fixed
  highlighting fixed…
  fixed adding.
  layout fix
  tinyscrollbar_bug fixed
  url handling modified.. tinyscrollbar modified… star checkbox fixed..
  tinyscrollbar fixed
  some changes for gridster
  Lot of changes in gridster

Conflicts:
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
 2013-03-05 17:34:28 +08:00
Rueshyna 806ffe0a1e fixed desktop several bug 2013-03-05 17:31:57 +08:00
devin db2b371744 tinyscrollbar minor update 2013-03-05 17:22:53 +08:00
Fu Matthew 626b2a7bca fix default failed when cate or tags set to empty 2013-03-05 11:48:20 +08:00
Harry Bomrah 3182f5c9a8 merging 2013-03-05 11:20:01 +08:00
Harry Bomrah dc92ef9f42 simple layout tinyscrollbar fixed 2013-03-05 11:04:18 +08:00
devin 4e24223c78 desktop CSS update 2013-03-05 09:39:01 +08:00
Fu Matthew 285119a5f3 fix for multi select cates and tags 2013-03-04 19:29:45 +08:00
Harry Bomrah b5abbc9ef0 highlighting fixed… 2013-03-04 17:57:32 +08:00
Fu Matthew 15b9839b76 fix archive category 
fix page adding failed
 2013-03-04 14:40:29 +08:00
Harry Bomrah e69679d3fe tinyscrollbar_bug fixed 2013-03-04 12:37:29 +08:00
Harry Bomrah 2ead541733 url handling modified.. tinyscrollbar modified… star checkbox fixed.. 2013-03-04 12:37:29 +08:00
Harry Bomrah 23c8c28b52 tinyscrollbar fixed 2013-03-04 12:37:29 +08:00
Harry Bomrah 0f12314213 some changes for gridster 2013-03-04 12:37:29 +08:00
Harry Bomrah b8ee748723 Lot of changes in gridster 2013-03-04 12:37:29 +08:00
Rueshyna ee4b94ace0 Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop 
* 'desktop' of https://github.com/Rulingcom/orbit:
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
 2013-03-04 12:17:14 +08:00
Rueshyna 8f1d7b55ab authors auto-complete 2013-03-04 12:16:46 +08:00
Harry Bomrah c1cb5e5ffb tinyscrollbar_bug fixed 2013-03-01 17:49:58 +08:00
Harry Bomrah 9b8ab2a2c1 url handling modified.. tinyscrollbar modified… star checkbox fixed.. 2013-03-01 14:45:20 +08:00
Harry Bomrah c82e9a646d tinyscrollbar fixed 2013-02-27 18:55:26 +08:00
Harry Bomrah 7ef02d3108 Merge branch 'desktop' into desktop_work 2013-02-27 11:51:56 +08:00
Harry Bomrah 912080482b some changes for gridster 2013-02-27 11:47:41 +08:00
chris ca946fc881 Merge branch 'development' of github.com:Rulingcom/orbit into development 
Conflicts:
	lib/tasks/migrate.rake
 2013-02-27 11:03:52 +08:00
Fu Matthew 0dabd5b95f fix widget field reload 2013-02-27 10:51:41 +08:00
Fu Matthew 071e8a349c link to more 2013-02-27 10:50:50 +08:00
Fu Matthew 8a8bfcb8fb fix default widget link 2013-02-27 10:50:47 +08:00
Fu Matthew d7699e1a46 fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init 2013-02-27 10:49:51 +08:00
Fu Matthew 0e6599e9b9 fix javascript disable checkbox failed after cate and tags being reloaded. 2013-02-27 10:49:51 +08:00
Fu Matthew 99e67c8719 first version of multi categories and tags 2013-02-27 10:49:48 +08:00
Rueshyna fb931b0a4a Merge remote-tracking branch 'origin/desktop' into desktop 
* origin/desktop:
  Remove Gemfile.lock
  sort conference and type
  add conferene list order function
  css minor changes.
  gridster, url code fixed, views removed.
  Fix selection of sub_menu for widget (the value wasn't set)
  Fix bug in widget selection
  css minor changes.
  Fix public_r_tag selection
  gridster, url code fixed, views removed.
 2013-02-26 17:02:01 +08:00
Rueshyna 4ac0f19011 generate journal page by rails side and fixed model name bug 2013-02-26 15:15:09 +08:00
Harry Bomrah e9c0f443b7 Lot of changes in gridster 2013-02-26 11:47:39 +08:00
Fu Matthew 5f832a17d4 fix widget field reload 2013-02-25 12:49:06 +08:00
Harry Bomrah edd2c1f522 css minor changes. 2013-02-25 11:08:57 +08:00
Harry Bomrah 9f362d9ae6 gridster, url code fixed, views removed. 2013-02-25 11:08:56 +08:00
chris 3572856486 Fix selection of sub_menu for widget (the value wasn't set) 2013-02-25 10:35:59 +08:00
Fu Matthew 0be1c45c81 link to more 2013-02-23 18:29:50 +08:00
chris 5b0b8e6c79 Fix bug in widget selection 2013-02-23 17:25:07 +08:00
chris caac9191ce Fix public_r_tag selection 2013-02-23 16:52:37 +08:00
Fu Matthew 73bca03b33 fix default widget link 2013-02-23 15:19:51 +08:00
Fu Matthew 8592015b1b fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init 2013-02-23 15:19:04 +08:00
chris ad9b91f792 Fix url with id in default widget 2013-02-23 12:20:45 +08:00
Fu Matthew d6dd38744b fix javascript disable checkbox failed after cate and tags being reloaded. 2013-02-23 11:34:47 +08:00
Fu Matthew 9fec7beb47 Merge branch 'development' of github.com:Rulingcom/orbit into development 
Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake
 2013-02-22 17:53:49 +08:00
Fu Matthew b315215bed first version of multi categories and tags 2013-02-22 16:32:05 +08:00
chris 680d7908b9 member plugin init edit 2013-02-21 17:53:08 +08:00
unknown d46abd7caf member list edit 2013-02-21 14:13:46 +08:00
Rueshyna 158fd8ffff fixed conference icon and rename _p to _window of conference view 2013-02-21 13:51:42 +08:00
unknown f59da3ce81 member plugin init edit 2013-02-20 18:05:09 +08:00
unknown bc44d38948 member plugin edit 2013-02-20 17:25:20 +08:00
unknown a7bc19768e member list edit 2013-02-20 11:12:08 +08:00
chris 39c6660c67 Remove useless code not removed in merge 
Fix argument bug in link_to_field
 2013-02-19 20:42:46 +08:00