Christophe Vilayphiou
|
9a5e7cc8fa
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/views/admin/sites/site_info.html.erb
|
2012-05-07 16:08:05 +08:00 |
Christophe Vilayphiou
|
f534e6ca7b
|
Ray's changes for site_info
|
2012-05-07 15:55:45 +08:00 |
|
Christophe Vilayphiou
|
8b61314cc4
|
Add i18n for site_info.
Add always display site title.
Changes for menu in front-end
|
2012-05-07 15:11:43 +08:00 |
|
Christophe Vilayphiou
|
1fb6c20b86
|
Add site_info
|
2012-05-07 00:54:18 +08:00 |
|
Christophe Vilayphiou
|
48f8fbde7f
|
Fix site_locale_default_head and active for current locale
|
2012-05-07 00:53:52 +08:00 |
|
Christophe Vilayphiou
|
555aa088d9
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-04 19:23:45 +08:00 |
|
Christophe Vilayphiou
|
e0a191162d
|
Ray's changes
|
2012-05-04 19:11:28 +08:00 |
|
Christophe Vilayphiou
|
15bc4d4268
|
Fix merge error
|
2012-05-04 16:12:28 +08:00 |
Matthew K. Fu JuYuan
|
bff3cefbc7
|
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
|
2012-05-04 15:40:43 +08:00 |
|
Christophe Vilayphiou
|
32faef0c70
|
DRY code for sorting
|
2012-04-30 06:30:52 +08:00 |
|
Christophe Vilayphiou
|
5aca3db95f
|
Ray's changes for structure and web_links
|
2012-04-27 11:02:56 +08:00 |
|
Christophe Vilayphiou
|
6bf4c60d45
|
Changes for js and ccs load for site's pages
|
2012-04-26 01:49:02 +08:00 |
|
Christophe Vilayphiou
|
6f1eb97ace
|
Fix for structure js and css
|
2012-04-25 18:41:38 +08:00 |
|
Christophe Vilayphiou
|
573c19ff4b
|
Remove .erb when including css
|
2012-04-25 15:44:44 +08:00 |
|
Christophe Vilayphiou
|
834cbe3a11
|
Fix side_bar for tags
Modules needs to use the fullpath for active or visible in tags
|
2012-04-23 16:12:07 +08:00 |
|
Christophe Vilayphiou
|
6728c35023
|
Fix side_bar.
In the case of tags, take the uri instead of controller name
|
2012-04-12 18:14:00 +08:00 |
|
Christophe Vilayphiou
|
486845460c
|
Filter and delete for bulletins
|
2012-04-12 06:50:36 +08:00 |
|
Christophe Vilayphiou
|
253f4bcb54
|
Ray's changes for orbit bar
|
2012-04-06 18:06:57 +08:00 |
|
Matthew K. Fu JuYuan
|
8f28d45379
|
The new AdBanner.
|
2012-04-02 03:04:38 +08:00 |
|
Christophe Vilayphiou
|
503f71e554
|
Ray's changes in tags, css and js
|
2012-04-02 02:55:36 +08:00 |
|
Christophe Vilayphiou
|
f5fd3dec7a
|
Trying nokogiri
|
2012-03-27 18:42:22 +08:00 |
|
Christophe Vilayphiou
|
9aa4173933
|
Change orbit-bar for language but bug when user name is too long
|
2012-02-29 04:21:56 +08:00 |
|
Christophe Vilayphiou
|
63d7810b35
|
Add isotope, categories for announcement page, sort for announcement
|
2012-02-23 15:52:58 +08:00 |
|
Christophe Vilayphiou
|
53ed4b0404
|
Initial changes in announcement for sorting and filtering
|
2012-02-23 15:51:33 +08:00 |
|
chris2tof
|
62aaf79491
|
Merge with sub_roles
|
2011-12-23 18:34:21 +08:00 |
|
chris2tof
|
26b49dcf02
|
Remove js from html
|
2011-12-05 10:36:25 +08:00 |
|
chris2tof
|
ddc7c74436
|
Create page.
|
2011-06-01 10:24:14 +08:00 |
|
chris2tof
|
0969f6b6cc
|
CKEditor.
The error came from some script in Application.js
|
2011-05-26 13:48:09 +08:00 |
|
chris2tof
|
3d97c5bfda
|
Modification of the page model
|
2011-05-18 10:00:00 +08:00 |
|
chris2tof
|
24ae7ed5e3
|
Links edition
|
2011-05-13 09:08:42 +08:00 |
|
chris2tof
|
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 |
|
chris2tof
|
2e632f1596
|
#request_uri is deprecated.
|
2011-05-02 13:28:38 +08:00 |
|
chris2tof
|
1909edbe2a
|
Simplification of the 'link_back' code
|
2011-04-19 15:05:48 +08:00 |
|
chris
|
e62df90117
|
user can't delete self and flash_messages
|
2011-04-13 18:22:50 +08:00 |
ihower
|
19a7d51e60
|
Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
|
2011-04-13 18:19:51 +08:00 |
|
Wen-Tien Chang
|
29ee4585b2
|
upgrade to rails3, but grip is broken
|
2010-03-08 16:04:05 +08:00 |
|
Wen-Tien Chang
|
40831c1314
|
init rails 2.3.2
|
2009-05-08 00:53:18 +08:00 |