Christophe Vilayphiou
|
2f279c53ff
|
Apply patch from ldap
|
2012-04-23 14:04:55 +08:00 |
Christophe Vilayphiou
|
72efdbd742
|
changes before Chirs and Ray's trip
|
2012-04-19 11:50:54 +08:00 |
Christophe Vilayphiou
|
f54dba8b0b
|
Merge branch 'master' into desktop_harry
|
2012-04-13 13:39:00 +08:00 |
Harry Bomrah
|
193cee2df7
|
new icons and widgets
|
2012-04-12 22:18:58 +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
|
015c0cb452
|
Delete useless code in items
|
2012-04-12 18:13:10 +08:00 |
Christophe Vilayphiou
|
f65bb9b323
|
Merge branch 'master' into desktop_harry
Conflicts:
app/assets/stylesheets/style.css.erb
|
2012-04-06 19:02:39 +08:00 |
Christophe Vilayphiou
|
253f4bcb54
|
Ray's changes for orbit bar
|
2012-04-06 18:06:57 +08:00 |
Harry Bomrah
|
77b2919d8c
|
Desktop Commit
|
2012-04-06 17:47:02 +08:00 |
Christophe Vilayphiou
|
ad740b0daf
|
Missing end tag in side_bar
|
2012-04-05 18:13:52 +08:00 |
Christophe Vilayphiou
|
894f8764d8
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
app/views/layouts/_side_bar.html.erb
|
2012-04-05 17:42:55 +08:00 |
Christophe Vilayphiou
|
cedd782e7f
|
Sidebar fix for ad_banner
|
2012-04-05 13:55:03 +08:00 |
Matthew K. Fu JuYuan
|
d8b20ae993
|
fix ad_banner sidebar
|
2012-04-05 11:11:48 +08:00 |
Matthew K. Fu JuYuan
|
8f28d45379
|
The new AdBanner.
|
2012-04-02 03:04:38 +08:00 |
Christophe Vilayphiou
|
32b7d95669
|
Fix parser_back_end & side_bar & meta
|
2012-03-30 15:51:29 +08:00 |
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +08:00 |
Christophe Vilayphiou
|
f5fd3dec7a
|
Trying nokogiri
|
2012-03-27 18:42:22 +08:00 |
Christophe Vilayphiou
|
472744fc87
|
Changes for IE9 with html5
|
2012-03-21 15:51:55 +08:00 |
Christophe Vilayphiou
|
7cc075e124
|
Change the monkey picture
|
2012-03-19 15:49:40 +08:00 |
Christophe Vilayphiou
|
785ead5209
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
|
2012-03-16 14:55:21 +08:00 |
unknown
|
6f6e84b015
|
fix dashboard & announcement
|
2012-03-16 14:44:57 +08:00 |
Matt Fu
|
13b6892f87
|
code for new fact check
|
2012-03-16 11:09:44 +08:00 |
unknown
|
00ab773942
|
fix dashboard & announcement
|
2012-03-14 20:05:03 +08:00 |
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +08:00 |
Matt Fu
|
ccb61fc2dd
|
change Search bar
|
2012-02-29 11:29:13 +08:00 |
Christophe Vilayphiou
|
0fa5c3ba9d
|
Fix bug in orbit-bar
|
2012-02-29 04:56:52 +08:00 |
Christophe Vilayphiou
|
4b7b57bb3d
|
Add some missing translations
|
2012-02-29 04:48:21 +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
|
f13ebc6c46
|
Fix bugs and changes for nccu
|
2012-02-27 18:50:56 +08:00 |
Christophe Vilayphiou
|
f8d1d7242d
|
Merge branch 'design_team' into dashboard
|
2012-02-23 16:05:33 +08:00 |
Christophe Vilayphiou
|
1a6e497b3d
|
Ika's changes
|
2012-02-23 15:53:15 +08:00 |
Christophe Vilayphiou
|
53ed4b0404
|
Initial changes in announcement for sorting and filtering
|
2012-02-23 15:51:33 +08:00 |
Christophe Vilayphiou
|
22d9741ac8
|
Fix for orbit_bar
|
2012-02-23 15:51:33 +08:00 |
Christophe Vilayphiou
|
ba4d71a026
|
Changes in orbit_bar and js in announcements
|
2012-02-23 15:51:33 +08:00 |
Christophe Vilayphiou
|
1146506063
|
Fix bug when no bulletins or web_links
|
2012-02-20 15:56:17 +08:00 |
Christophe Vilayphiou
|
a3f152b200
|
Changes for jquery 1.7 (.live -> .on), create module_layout
|
2012-02-20 03:24:05 +08:00 |
Christophe Vilayphiou
|
44a346ffe9
|
Changes for orbit bar, login
|
2012-02-19 16:33:22 +08:00 |
Christophe Vilayphiou
|
1f7dae9bee
|
Gemfile and bugs in js for orbit-bar
|
2012-02-15 00:34:22 +08:00 |
Christophe Vilayphiou
|
55ae7de01c
|
Orbit-bar in front-end and back-end, side-bar and drop-down menu
|
2012-02-15 00:34:22 +08:00 |
Matthew Kaito Juyuan Fu
|
dcc6a53430
|
brief starting for dashboard,adds i18n vars
|
2012-02-15 00:34:21 +08:00 |
Christophe Vilayphiou
|
5518ae362d
|
Ray's modification before redesign
|
2012-01-24 11:57:27 +08:00 |
chris2tof
|
7ebfe3a7f9
|
Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug
|
2011-12-29 18:08:08 +08:00 |
chris2tof
|
c1238a7043
|
Prefix ids with "back_" in back-end layout to avoid conflict with site's ids
|
2011-12-29 15:35:13 +08:00 |
chris2tof
|
090493fd51
|
Re-commit
|
2011-12-28 20:51:52 +08:00 |
Christophe Vilayphiou
|
fc591ee308
|
Ray's back_end modification before sub_roles
|
2011-12-23 18:02:45 +08:00 |
Christophe Vilayphiou
|
f774084e9a
|
Back-end standardization
|
2011-12-10 18:03:32 +08:00 |
chris2tof
|
75a3c4d5b1
|
Modify assets
Each layout has a manifest for css and js
|
2011-12-05 09:54:41 +08:00 |
chris2tof
|
a03e9bada8
|
Add missing translations
|
2011-11-20 02:14:51 +08:00 |
chris2tof
|
ad9f9bbf5c
|
Final Ray's modifications
|
2011-11-19 21:47:18 +08:00 |
chris2tof
|
65349796d0
|
Ray's modifications
|
2011-11-18 16:43:14 +08:00 |
chris2tof
|
861237d65b
|
Integration of Ray' modifications
|
2011-11-17 20:02:58 +08:00 |
chris2tof
|
0556dc9297
|
ika's modification to the backend
|
2011-11-16 18:34:54 +08:00 |
chris2tof
|
a1391493a3
|
Revert change in layout/admin.html.erb
|
2011-09-07 14:03:53 +08:00 |
chris2tof
|
0956e9784a
|
Fix bug in layout, parser and change lib/fraisier
|
2011-09-07 11:53:16 +08:00 |
chris2tof
|
294e06d630
|
Change "RulingSite" into "Orbit"
|
2011-08-25 17:59:49 +08:00 |
chris2tof
|
c248b729db
|
CSS problem for page
|
2011-08-25 15:08:23 +08:00 |
chris2tof
|
f898a29fdf
|
Add site link in menu
|
2011-08-25 08:56:01 +08:00 |
chris2tof
|
4cd9854706
|
Ika's changes
|
2011-08-25 08:07:18 +08:00 |
chris2tof
|
09cdb9a852
|
CSS modifications for design team
|
2011-08-23 15:59:07 +08:00 |
chris2tof
|
4f38074932
|
content.css -> content.css.erb
|
2011-08-23 10:05:16 +08:00 |
chris2tof
|
7a4ad240a8
|
Clean code for layout and modifications in dev.rake
|
2011-08-22 13:45:21 +08:00 |
chris2tof
|
e74f2931b1
|
Modifications asset pipeline
|
2011-08-20 22:54:07 +08:00 |
chris2tof
|
86443661e9
|
Merge server and rails_3_1
|
2011-08-18 13:43:33 +08:00 |
Kaito
|
9cea77430f
|
dealing with layout file bug
|
2011-08-08 17:23:20 +08:00 |
Kaito
|
9eb80d7424
|
Made r_editor into class style add functions
|
2011-07-27 17:23:01 +08:00 |
Matthew Fu
|
f387139ae1
|
rails 3.1 and designs (with bug)
|
2011-07-12 16:00:57 +08:00 |
chris2tof
|
a695b9ad29
|
Items UI changes
|
2011-06-10 13:57:42 +08:00 |
chris2tof
|
ddc7c74436
|
Create page.
|
2011-06-01 10:24:14 +08:00 |
chris2tof
|
964440fa86
|
Remove CKEditor due to conflicts with the jQuery library
|
2011-05-26 11:23:46 +08:00 |
chris2tof
|
a8c4e17c56
|
CKEditor.
Edition of page part for single language.
|
2011-05-25 16:27:17 +08:00 |
chris2tof
|
d971a8ecbe
|
Uniformized: @page and @ link in @item
Change parser for page edition.
|
2011-05-25 14:50:56 +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
|
83bbd77d96
|
Built-in user_attribute_models
|
2011-05-02 12:07:31 +08:00 |
chris
|
318c264cae
|
add user_info
|
2011-04-13 18:22:50 +08:00 |
chris
|
2ccc2c9b39
|
add user_info
|
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
|
bebc51e8bb
|
Admin can new/edit user_attributes
|
2010-03-15 17:35:01 +08:00 |
Wen-Tien Chang
|
263da6aa9f
|
Let admin can choose user attributes checkbox
|
2010-03-15 16:13:26 +08:00 |
Wen-Tien Chang
|
29ee4585b2
|
upgrade to rails3, but grip is broken
|
2010-03-08 16:04:05 +08:00 |
Wen-Tien Chang
|
13065aa85a
|
Add devise gem and panel/users controller
|
2010-03-04 16:33:26 +08:00 |
Wen-Tien Chang
|
bd46cb1b12
|
remove component link
|
2010-02-22 17:10:08 +08:00 |
Wen-Tien Chang
|
a19e0dba6c
|
Add asset model and controller
|
2010-02-01 17:24:28 +08:00 |
Wen-Tien Chang
|
e1440a79d8
|
Add Item, Page, Component, Link inheritanced models
|
2010-01-14 18:30:53 +08:00 |
Wen-Tien Chang
|
cd21cadfe7
|
Add panel namespace
|
2010-01-11 17:53:44 +08:00 |
Wen-Tien Chang
|
314f6d5219
|
Add reroute middleware hack
|
2010-01-11 17:09:50 +08:00 |
Wen-Tien Chang
|
38e365e4b5
|
remove blueprint, use easyframework
|
2010-01-08 16:05:58 +08:00 |
Wen-Tien Chang
|
e6d083acda
|
Add zh_tw locale file
|
2010-01-08 15:45:13 +08:00 |
Wen-Tien Chang
|
5570a2dfbf
|
Add announcement admin and view template
|
2009-06-01 14:20:15 +08:00 |
Wen-Tien Chang
|
96f186a71b
|
Add blueprint button style
|
2009-05-15 14:37:03 +08:00 |
Wen-Tien Chang
|
68622bb23c
|
Add blueprint style and install jRails plugin
|
2009-05-15 14:02:28 +08:00 |
Wen-Tien Chang
|
438c508ea1
|
Add snippet support and unpack liquid plugin
|
2009-05-08 02:13:27 +08:00 |
Wen-Tien Chang
|
66604d00f4
|
Add admin/pages scaffold and basic page render
|
2009-05-08 01:18:16 +08:00 |