Commit Graph

2910 Commits

Author SHA1 Message Date
Harry Bomrah 38a695d8a9 all none for conf done 2013-03-21 18:09:38 +08:00
Harry Bomrah df83c6fff7 all none fixed 2013-03-21 18:09:38 +08:00
chris 41311c74d0 Spen's changes in archive 2013-03-21 14:38:04 +08:00
chris ee8a78621a Add task to flatten category and tag for page and page_part 2013-03-21 14:15:58 +08:00
chris d01968dcd0 Changes in query for default widget 2013-03-21 02:29:56 +08:00
chris 04d3e177d5 Fix typo in core lib
Change i18n for more link in announcement init
2013-03-20 17:45:08 +08:00
chris 031cf927d5 Sort archive by top and creation date 2013-03-20 17:22:40 +08:00
chris 91afd49f75 Fix for scope 2013-03-20 17:20:17 +08:00
chris e71b002438 Fix archive front end query for multiple categories 2013-03-20 15:37:34 +08:00
chris 90f08c96fc Fix merge error: add missing delete route 2013-03-20 02:11:29 +08:00
chris 43f7711433 Put back Gemfile.lock 2013-03-20 00:30:58 +08:00
chris b92f6d2274 Update Gemfile.lock 2013-03-19 23:59:40 +08:00
chris 535b373af0 Remove nccu's backup db schedule 2013-03-19 23:44:02 +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
Rueshyna 6abf53f34d change page number of archive 2013-03-19 23:43:28 +08:00
Rueshyna 4e151690e9 fixed archive bug, make it have page and category 2013-03-19 23:42:39 +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 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