Commit Graph

2937 Commits

Author SHA1 Message Date
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 f29ad27b56 Fix pagination in archive back end 2013-03-18 21:53:31 +08:00
chris aacfcf1997 Fix typo in translations 2013-03-18 21:52:52 +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
Harry Bomrah 31476bb813 app manager changed plus some changes 2013-03-14 17:55:33 +08:00
Harry Bomrah 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
Harry Bomrah 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
Harry Bomrah 84f255173c Merge branch 'desktop_work_devin' into desktop_work 2013-03-14 14:17:13 +08:00
Harry Bomrah b4ba4149d4 section page fixed.. 2013-03-14 14:16:38 +08:00
Harry Bomrah 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
chris 2427bc5b69 Update CSS for archive and put the call in widget index 2013-03-13 17:21:39 +08:00
devin 3d7fbd9711 add browser compatibility page 2013-03-13 15:49:20 +08:00
chris e208e99a73 Fix page part update when no tag or category 2013-03-13 15:45:30 +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
chris b864cc0268 Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
Rueshyna af6813480a add pagination for every controller and view in personal plugin 2013-03-12 17:00:42 +08:00
Harry Bomrah 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
Harry Bomrah 8e369fe819 tinyscrollbar pagination fixed 2013-03-12 11:42:17 +08:00
Harry Bomrah 2b4e53ed1b insert and remove columns 2013-03-12 11:42:17 +08:00
Harry Bomrah 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
Harry Bomrah 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
Harry Bomrah ca64cba9ad updated 2013-03-08 12:54:58 +08:00
Harry Bomrah 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
Harry Bomrah 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
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
Harry Bomrah 39a20f6cc9 Merge branch 'desktop_work' into desktop_work_devin 2013-03-07 19:16:41 +08:00
Harry Bomrah 32d56232bc insert and remove columns 2013-03-07 19:15:30 +08:00