devin
|
50baac2cb7
|
gallery update
add "tag panel", not complete
|
2012-08-09 18:09:36 +08:00 |
Harry Bomrah
|
ee03bd5b65
|
code merge
|
2012-08-08 19:35:36 +08:00 |
|
devin
|
b5227c7b6c
|
gallery update
|
2012-08-07 14:33:30 +08:00 |
|
devin
|
0f5707394b
|
encoding fixed
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
|
2012-08-06 22:11:36 +08:00 |
|
Harry Bomrah
|
13f3d4db70
|
tp
|
2012-08-06 20:10:38 +08:00 |
|
Harry Bomrah
|
a08f85a3e2
|
Button fixes
|
2012-08-06 17:49:10 +08:00 |
|
Harry Bomrah
|
5f0d6c9003
|
Code Merge
|
2012-08-06 17:05:12 +08:00 |
|
Harry Bomrah
|
47408f4467
|
UI modifications
|
2012-08-06 17:01:53 +08:00 |
|
devin
|
9ebee5daea
|
gallery update
|
2012-08-06 14:02:55 +08:00 |
|
devin
|
337d690c54
|
gallery update
|
2012-08-06 11:07:58 +08:00 |
|
Harry Bomrah
|
6159c04da6
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-08-01 20:09:58 +08:00 |
|
Harry Bomrah
|
b0ef2b6957
|
Multi language and side bar update
|
2012-08-01 20:07:54 +08:00 |
|
devin
|
eaa8171689
|
gallery update
|
2012-08-01 16:35:59 +08:00 |
|
Harry Bomrah
|
7accbed1a0
|
gallery translation supported
|
2012-07-31 21:15:42 +08:00 |
|
Harry Bomrah
|
45da2971ef
|
Merge branch 'gallery_orbit' into desktop_harry
|
2012-07-31 01:16:22 +08:00 |
|
Harry Bomrah
|
17dffb15e1
|
Major updates for gallery
|
2012-07-31 01:15:48 +08:00 |
|
Harry Bomrah
|
929cd3b0cc
|
Gallery update..
|
2012-07-29 18:52:30 +08:00 |
|
Harry Bomrah
|
584d5d388e
|
Merge branch 'gallery_orbit' into desktop_harry
|
2012-07-25 16:21:03 +08:00 |
|
Harry Bomrah
|
8f23755c0d
|
Gallery update
|
2012-07-25 16:20:07 +08:00 |
|
Harry Bomrah
|
642e0c20ae
|
Routes conflicts removed
|
2012-07-19 15:54:04 +08:00 |
|
Harry Bomrah
|
59ab1e6d17
|
Got gallery update
|
2012-07-19 15:51:41 +08:00 |
|
Harry Bomrah
|
37f6037333
|
Gallery started.
|
2012-07-19 15:44:44 +08:00 |
|
Harry Bomrah
|
87be934aa3
|
gallery module update
|
2012-07-16 20:26:04 +08:00 |
|
Harry Bomrah
|
ba3d13790c
|
gallery module update
|
2012-07-10 17:43:21 +08:00 |
unknown
|
89446ba796
|
demo
|
2012-07-09 16:28:04 +08:00 |
|
unknown
|
fce2762ec3
|
demo
|
2012-07-09 16:28:04 +08:00 |
|
unknown
|
1d8e386bde
|
demo website widget
|
2012-07-09 16:28:03 +08:00 |
Matthew K. Fu JuYuan
|
11247ce84c
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 17:17:26 +08:00 |
Christophe Vilayphiou
|
75b67dddf5
|
Fix date bugs
|
2012-05-25 09:59:39 +08:00 |
|
Christophe Vilayphiou
|
7c44e94285
|
Order list by created_at desc
Add best image size in news new
|
2012-05-23 11:46:19 +08:00 |
Christophe Vilayphiou
|
d6b92fc604
|
Fixed bugs for nccu
|
2012-05-22 20:00:07 +08:00 |
|
Matthew K. Fu JuYuan
|
e0260542d3
|
fix code
|
2012-05-22 16:11:52 +08:00 |
|
Matthew K. Fu JuYuan
|
99bcdf6e1e
|
clean up unless code
|
2012-05-22 14:59:54 +08:00 |
|
Matthew K. Fu JuYuan
|
79f67208fa
|
js for preventing user do stupid things durning ajax
|
2012-05-22 14:59:54 +08:00 |
|
Christophe Vilayphiou
|
27cf99462e
|
Fix bug in page and news
|
2012-05-22 14:42:19 +08:00 |
|
Christophe Vilayphiou
|
815e6a8361
|
Fix matt's code and add it to filters
|
2012-05-19 03:19:55 +08:00 |
|
Christophe Vilayphiou
|
dc4116bc3d
|
Fix page hits count
|
2012-05-19 01:59:17 +08:00 |
|
Christophe Vilayphiou
|
db410b9c50
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-18 19:44:18 +08:00 |
|
Christophe Vilayphiou
|
4d33c7a56d
|
Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
|
2012-05-18 19:42:36 +08:00 |
|
Matthew K. Fu JuYuan
|
661fcafe70
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
|
2012-05-18 18:50:10 +08:00 |
|
Matthew K. Fu JuYuan
|
6ce6577e83
|
fix news approve and preview
|
2012-05-18 18:47:18 +08:00 |
|
Christophe Vilayphiou
|
7c6b807170
|
Change impression count to exclude when :referrer is nil
|
2012-05-18 14:13:11 +08:00 |
|
Christophe Vilayphiou
|
d9c12ea5a4
|
Proof authed_users for case when no category
|
2012-05-18 10:50:51 +08:00 |
|
Christophe Vilayphiou
|
8ad7f70822
|
Proof i18n_variable for categories
|
2012-05-18 10:28:28 +08:00 |
|
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
|
Christophe Vilayphiou
|
4467bc5e48
|
Change Date to DateTime
Fix filename error
|
2012-05-17 09:59:49 +08:00 |
|
Matthew K. Fu JuYuan
|
7f2564a81e
|
Fix sidebar and hide some links by roles
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
82d78acbad
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
f663985a40
|
starting ad_banner auth
|
2012-05-17 06:42:33 +08:00 |
|
Christophe Vilayphiou
|
be7ce0bf45
|
Redmine change's
|
2012-05-17 06:25:38 +08:00 |