Matthew K. Fu JuYuan
|
1b70852ff7
|
realtime preview is working. but save to object when preview
|
2012-04-23 14:06:37 +08:00 |
|
Matthew K. Fu JuYuan
|
8cc0611c4a
|
Ray's fix for ad_banner
|
2012-04-23 14:06:36 +08:00 |
devin
|
2ebed9e44a
|
javascript update
|
2012-04-20 09:45:40 +08:00 |
|
devin
|
19750d69e0
|
some update
|
2012-04-20 05:38:53 +08:00 |
Christophe Vilayphiou
|
72efdbd742
|
changes before Chirs and Ray's trip
|
2012-04-19 11:50:54 +08:00 |
Harry Bomrah
|
6b35cf821e
|
some updates
|
2012-04-18 18:15:02 +08:00 |
|
devin
|
8cd4844689
|
html change
|
2012-04-17 16:32:11 +08:00 |
|
Matthew K. Fu JuYuan
|
430b0fd9ae
|
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
Conflicts:
app/views/admin/ad_banners/_ad_image_update.html.erb
|
2012-04-13 16:52:14 +08:00 |
|
Matthew K. Fu JuYuan
|
4af73ecf6f
|
fix preview window size.
|
2012-04-13 16:46:16 +08:00 |
|
Matthew K. Fu JuYuan
|
0fe5baf93f
|
fix for letting ad_banner display even when file in not uploaded
|
2012-04-13 16:14:43 +08:00 |
Christophe Vilayphiou
|
f54dba8b0b
|
Merge branch 'master' into desktop_harry
|
2012-04-13 13:39:00 +08:00 |
|
Harry Bomrah
|
6b43e70f53
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-12 22:21:05 +08:00 |
|
Harry Bomrah
|
193cee2df7
|
new icons and widgets
|
2012-04-12 22:18:58 +08:00 |
|
devin
|
eabbba76fc
|
css change
|
2012-04-12 18:14:26 +08:00 |
|
Christophe Vilayphiou
|
93ac99d235
|
Add missing css in "inc"
|
2012-04-12 18:12:46 +08:00 |
|
devin
|
67d1f7ad08
|
lots of change
|
2012-04-12 14:19:53 +08:00 |
|
Matthew K. Fu JuYuan
|
e4c41ab54c
|
A filter UI for permission select. with Harry's JS
|
2012-04-12 07:14:06 +08:00 |
|
Christophe Vilayphiou
|
7bca339a5b
|
Ray's fix for columns width in bulletins
|
2012-04-12 07:01:34 +08:00 |
|
devin
|
0219c3df28
|
various update
|
2012-04-11 15:04:00 +08:00 |
|
devin
|
42f45aa137
|
theme setting update
|
2012-04-11 13:46:32 +08:00 |
|
devin
|
360e5228b7
|
custom theme settings
|
2012-04-10 17:44:36 +08:00 |
|
devin
|
6006f1b3c6
|
start editing setting page
some relevant stuff updated
|
2012-04-10 01:06:29 +08:00 |
|
Harry Bomrah
|
35567c2139
|
Widgets Loading dynamically and semi structured
|
2012-04-06 23:48:03 +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 |
|
devin
|
cd3e04c55c
|
add tinyscrollbar
|
2012-04-06 17:47:04 +08:00 |
|
devin
|
293e084bea
|
dock effect
|
2012-04-06 17:47:04 +08:00 |
unknown
|
79f005c88e
|
new icons
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
ddf6a606a2
|
with notifications and other changes
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
77b2919d8c
|
Desktop Commit
|
2012-04-06 17:47:02 +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
|
55d12e50f2
|
Ray's changes in announcenment back-end
|
2012-03-27 18:58:03 +08:00 |
|
Christophe Vilayphiou
|
29ec36130e
|
css and js changes
|
2012-03-16 15:06:45 +08:00 |
|
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +08:00 |
|
Christophe Vilayphiou
|
5223a7a3e9
|
Css and js changes
|
2012-02-29 12:45:47 +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
|
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
|
63d7810b35
|
Add isotope, categories for announcement page, sort for announcement
|
2012-02-23 15:52:58 +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
|
cf038183b9
|
Ika's changes in modules
|
2012-02-20 08:48:27 +08:00 |
|
Christophe Vilayphiou
|
44a346ffe9
|
Changes for orbit bar, login
|
2012-02-19 16:33: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 |
|
Christophe Vilayphiou
|
5518ae362d
|
Ray's modification before redesign
|
2012-01-24 11:57:27 +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
|
b002c411ce
|
Merge branch 'design_team'
|
2011-12-28 21:03:35 +08:00 |
|
Christophe Vilayphiou
|
75c9851dbc
|
Ray's back-end modifications for sub-roles
|
2011-12-28 20:57:18 +08:00 |
|
chris2tof
|
090493fd51
|
Re-commit
|
2011-12-28 20:51:52 +08:00 |
|
chris2tof
|
245def9cb6
|
Integration of pop-up and generic js.erb
|
2011-12-28 20:49:53 +08:00 |
|
chris2tof
|
62aaf79491
|
Merge with sub_roles
|
2011-12-23 18:34:21 +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
|
b77282c643
|
Test redmine service-hook
|
2011-12-05 19:28:06 +08:00 |
|
chris2tof
|
75a3c4d5b1
|
Modify assets
Each layout has a manifest for css and js
|
2011-12-05 09:54:41 +08:00 |
|
chris2tof
|
b68f5e11e5
|
Final modifications for the presentation
|
2011-11-22 18:54:10 +08:00 |
|
chris2tof
|
66bc0ce560
|
Modified dev.rake
|
2011-11-20 03:16:35 +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 |
Matthew Kaito Juyuan Fu
|
cb07a35cc9
|
Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD
|
2011-10-20 10:06:06 +08:00 |
|
Matthew Kaito Juyuan Fu
|
ff82391b7d
|
Revert "Merge with new_blog"
This reverts commit 64c68fcdeb.
|
2011-10-20 10:01:39 +08:00 |
|
chris2tof
|
64c68fcdeb
|
Merge with new_blog
|
2011-10-18 11:36:01 +08:00 |
|
chris2tof
|
0956e9784a
|
Fix bug in layout, parser and change lib/fraisier
|
2011-09-07 11:53:16 +08:00 |
|
chris2tof
|
230842d26a
|
Ika fix bug
|
2011-08-25 15:44:51 +08:00 |
|
chris2tof
|
c248b729db
|
CSS problem for page
|
2011-08-25 15:08:23 +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
|
e74f2931b1
|
Modifications asset pipeline
|
2011-08-20 22:54:07 +08:00 |
|
Kaito
|
f6ae58cef4
|
Trying to create Design from upload package
|
2011-08-12 17:47:03 +08:00 |
Matthew Fu
|
c48a11d9f5
|
Add some JS for design uploading
|
2011-07-19 18:31:53 +08:00 |
|
Matthew Fu
|
f73f09ffcf
|
adding files not commited from previous commit
|
2011-07-12 16:02:41 +08:00 |