3432d1359b
Fix bug in show_from_link
2012-09-12 16:46:03 +08:00
e88b09cf72
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/controllers/pages_controller.rb
app/views/layouts/_side_bar.html.erb
lib/parsers/parser_common.rb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
vendor/built_in_modules/gallery/config/locales/en.yml
vendor/built_in_modules/gallery/config/locales/zh_tw.yml
2012-09-12 02:21:18 +08:00
3749e919cb
front ends updates
2012-09-12 02:12:15 +08:00
b726c10857
front ends updates
2012-09-04 21:30:17 +08:00
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
50b313976e
Fix page: take category and tag at the same time
2012-08-03 17:12:54 +08:00
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
a657a7d615
remove cache
2012-07-27 19:14:24 +08:00
de831f1f96
disable homepage cache for english page
2012-07-27 05:08:24 +08:00
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
0e65e379b0
cache first commit
2012-07-12 11:47:24 +08:00
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
8fcb8ef8de
Change the way links are displayed in menus in front-end
2012-05-14 21:43:10 +08:00
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
82fa85def8
Clean the parsers code
2012-05-13 19:32:05 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +08:00
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
f5fd3dec7a
Trying nokogiri
2012-03-27 18:42:22 +08:00
4dd9b7ffa4
Fix announcement pagination in front-end
2012-03-07 18:16:59 +08:00
9aa4173933
Change orbit-bar for language but bug when user name is too long
2012-02-29 04:21:56 +08:00
7f9a7edc98
Changes in bulletins widget and front-end, add categories to link
2012-02-28 04:24:09 +08:00
8f531a6fe5
Fix bus for pages and page content
2012-02-24 15:14:23 +08:00
0b71714d44
Improve code in items, pages, links
2012-02-17 14:54:11 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
872a00b6a2
Forgot to change title in key in pages_controller
2012-02-06 22:09:33 +08:00
783eae4597
Change "NewBlog" folders into "new_blog" in assets
...
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
5518ae362d
Ray's modification before redesign
2012-01-24 11:57:27 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
d971a8ecbe
Uniformized: @page and @ link in @item
...
Change parser for page edition.
2011-05-25 14:50:56 +08:00
d9ba76ebd5
- No more Home object
...
- Sitemap on the left side and view of the current page in the main block
2011-05-09 18:49:57 +08:00
8b8eff6920
replace Liquid by Radius
2011-04-13 18:22:51 +08:00
27bdbadf08
404 for pages and asset column error
2011-04-13 18:22:49 +08:00
19a7d51e60
Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
2011-04-13 18:19:51 +08:00
29ee4585b2
upgrade to rails3, but grip is broken
2010-03-08 16:04:05 +08:00
9fa03db2c0
Let nested route works
2010-02-11 16:46:20 +08:00
aab1199aee
Add rake dev:build for pages
2010-01-18 16:23:33 +08:00
314f6d5219
Add reroute middleware hack
2010-01-11 17:09:50 +08:00
ff2dffaeb4
add i18n for layout and snippet
2009-07-06 16:23:34 +08:00
Christophe Vilayphiou
Harry Bomrah
Matthew K. Fu JuYuan
Christophe Vilayphiou
ihower