Matt K. Fu
|
6a40a9555a
|
fix query for un-permitted category use
|
2013-06-26 12:28:14 +08:00 |
|
Matt K. Fu
|
869f3b6815
|
fix object de-authorize failed.
|
2013-06-26 12:28:00 +08:00 |
|
Matt K. Fu
|
be6d185be7
|
Merge branch 'scandary_site_god_setting_feature' into development
|
2013-06-20 17:55:43 +08:00 |
|
Matt K. Fu
|
113ed17fb5
|
Merge branch 'solr_god_feature' into development
|
2013-06-20 17:54:47 +08:00 |
|
Matt K. Fu
|
c5ced8cf16
|
remove useless setting for solar
|
2013-06-20 17:50:18 +08:00 |
|
Matt K. Fu
|
e037507b0e
|
fix solr setting
|
2013-06-20 17:50:18 +08:00 |
|
Matt K. Fu
|
2f01b72ed0
|
fix solr name
|
2013-06-20 17:50:18 +08:00 |
|
Matt K. Fu
|
cd6dd40f45
|
add god to monit sold
|
2013-06-20 17:50:18 +08:00 |
|
Matt K. Fu
|
345c471fc9
|
from now on the rescue namespace will be decided by site object field: resque_namespace
|
2013-06-20 17:50:17 +08:00 |
|
Matt K. Fu
|
ed06be93d6
|
fix rescue scheduler space error
|
2013-06-20 17:50:17 +08:00 |
|
Matt K. Fu
|
1268ce0ae9
|
remove useless setting for solar
|
2013-06-20 17:42:00 +08:00 |
|
Matt K. Fu
|
cd55f2aac2
|
fix solr setting
|
2013-06-19 19:23:45 +08:00 |
|
Matt K. Fu
|
c4ec6c1ac9
|
fix solr name
|
2013-06-19 16:24:56 +08:00 |
|
Matt K. Fu
|
6f46a3f949
|
add god to monit sold
|
2013-06-19 16:11:16 +08:00 |
|
Matt K. Fu
|
d78e816b4e
|
from now on the rescue namespace will be decided by site object field: resque_namespace
|
2013-06-19 15:45:53 +08:00 |
|
Matt K. Fu
|
e10eb833ed
|
fix rescue scheduler space error
|
2013-06-19 15:43:02 +08:00 |
|
Matt K. Fu
|
e20df41db5
|
add user log link at site page
|
2013-06-14 15:24:04 +08:00 |
|
Matt K. Fu
|
d5109c837c
|
Merge branch 'lukas/picked_ques' into development
|
2013-06-06 19:59:30 +08:00 |
|
Matt K. Fu
|
dd206437d8
|
apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.
|
2013-06-06 17:39:36 +08:00 |
|
Matt K. Fu
|
7729161123
|
fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
|
2013-06-06 17:38:17 +08:00 |
|
Matt K. Fu
|
6b8b749b0f
|
fix chris tag cloud
|
2013-06-06 17:18:42 +08:00 |
|
Matt K. Fu
|
30824d1620
|
add search to archive
|
2013-06-05 18:03:09 +08:00 |
|
Matt K. Fu
|
704db56925
|
fix bulletin data having 8 hours difference.
|
2013-06-05 18:01:57 +08:00 |
|
Matt K. Fu
|
06fd305bf9
|
default widget show search
|
2013-06-05 13:00:21 +08:00 |
|
Matt K. Fu
|
c0f1614cb9
|
fix uploading error due to user action decoder can not handle uploading file
|
2013-05-30 10:17:28 +08:00 |
|
Matt K. Fu
|
3e0b7d81ae
|
clean 403 404 500
|
2013-05-27 16:46:49 +08:00 |
|
Matt K. Fu
|
2806dd35a9
|
spen's fix for user
|
2013-05-23 14:03:18 +08:00 |
|
Matt K. Fu
|
54a35b30be
|
fix design index bug when start start from blank DB.
add delay impressionist.
add several i18n vars
|
2013-05-23 12:07:43 +08:00 |
|
Matt K. Fu
|
37aa950028
|
user action
|
2013-05-23 11:55:57 +08:00 |
|
Matt K. Fu
|
3d0a1cef56
|
1.fix for syntax error.
2.Making production console works.
3.Making blank site member no errors.
|
2013-05-22 16:25:12 +08:00 |
|
Matt K. Fu
|
287e77836d
|
fix css compiling error
|
2013-05-14 14:19:20 +08:00 |
|
Matt K. Fu
|
3e6c2b1ec2
|
fix member error with blank database
|
2013-05-14 11:48:13 +08:00 |
|
Matt K. Fu
|
f2247aab32
|
ray's css fix
|
2013-05-14 11:27:15 +08:00 |
|
Matt K. Fu
|
ef2c732d2e
|
make blank site working better
|
2013-05-14 11:26:35 +08:00 |
|
Matt K. Fu
|
1096db79b6
|
blank site now can be start from rake site:build
|
2013-05-14 10:32:53 +08:00 |
|
Matt K. Fu
|
88d55989de
|
change logger
|
2013-05-14 10:29:11 +08:00 |
|
Matt K. Fu
|
caf0426bd4
|
bulletin search
|
2013-05-01 12:16:28 +08:00 |
|
Matt K. Fu
|
7d077a92a5
|
system preference
|
2013-04-29 15:23:15 +08:00 |
|
Matt K. Fu
|
64101109dd
|
disable all sorted_tags
|
2013-04-26 18:07:59 +08:00 |
|
Matt K. Fu
|
3e567223e3
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +08:00 |
|
Matt K. Fu
|
2945e14385
|
use rack gridfs
|
2013-04-25 20:37:13 +08:00 |
|
Matt K. Fu
|
c68c563fb0
|
fix qa problem
|
2013-04-25 20:37:13 +08:00 |
|
Matt K. Fu
|
12e39b4d77
|
fix rescue job won't start
|
2013-04-25 15:46:16 +08:00 |
|
Matt K. Fu
|
a0478f2a8f
|
fix page name repeated error when page creating
|
2013-04-25 12:19:25 +08:00 |
|
Matt K. Fu
|
b198b1a17b
|
system preference
|
2013-04-24 19:21:11 +08:00 |
|
Matt K. Fu
|
62fa589e8a
|
add msg when user session expired at page admin
|
2013-04-24 11:58:48 +08:00 |
|
Matt K. Fu
|
5ff7dfbac6
|
fronted open switch and backend openness
|
2013-04-23 18:48:18 +08:00 |
|
Matt K. Fu
|
41168f4c99
|
fix for fronted routing failed
|
2013-04-23 10:01:02 +08:00 |
|
Matt K. Fu
|
7e9fce0c2d
|
clean Harry's code
|
2013-04-17 14:31:10 +08:00 |
|
Matt K. Fu
|
2416030adc
|
remove useless rake task
|
2013-04-17 14:31:09 +08:00 |
|
Matt K. Fu
|
fcfdd562a6
|
reverse harrys db setting
|
2013-04-17 14:29:56 +08:00 |
|
Matt K. Fu
|
4cbf2fd8b9
|
complete harrys code
|
2013-04-17 14:29:56 +08:00 |
|
Matt K. Fu
|
a4ebe31ada
|
fix for widget edit js missing
|
2013-04-17 14:19:32 +08:00 |
|
Matt K. Fu
|
3098496083
|
widget link followed by setting
|
2013-04-17 14:19:32 +08:00 |
|
Matt K. Fu
|
28f0df5da8
|
fix default widget link failed
|
2013-04-17 14:19:32 +08:00 |
|
Matt K. Fu
|
3de4591413
|
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
|
2013-04-17 14:19:32 +08:00 |
|
Matt K. Fu
|
425a320c02
|
fix widget and fronted setting interface. checked with Spen
|
2013-04-17 14:16:24 +08:00 |
|
Matt K. Fu
|
0781779ac0
|
solved conflicts
|
2013-04-17 14:14:24 +08:00 |
|
Matt K. Fu
|
0f6f5aafce
|
fix for both part and page part settings
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
|
2013-04-17 14:12:52 +08:00 |
|
Matt
|
962bae9a82
|
merge
|
2012-10-01 21:09:09 +08:00 |
|
Matt
|
b65d785834
|
harry's fix, announcement still broken
|
2012-10-01 17:21:23 +08:00 |
|
Matt
|
5f63af4e77
|
fix for search news,needs to applied to announcement,also need to fix some translation
|
2012-09-24 18:10:48 +08:00 |
|
Matt
|
79006201cd
|
ad_image date picker fixed
|
2012-09-19 12:23:05 +08:00 |
|
Matt
|
71021b8c69
|
Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
|
2012-09-11 00:41:52 +08:00 |
|
Matt
|
9d21a86f53
|
Ray's CSS changes for NCCU email
|
2012-09-07 18:16:34 +08:00 |
|
Matt
|
1aea8d91f4
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-08 18:16:38 +08:00 |
|
Matt
|
62ba8c9f18
|
Fix bugs on 172:180
|
2012-08-08 17:56:00 +08:00 |
|
Matt
|
6a022c90da
|
Changes on nccu
|
2012-05-18 15:20:45 +08:00 |
|
Matt
|
2c16284f73
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-18 10:51:49 +08:00 |
|
Matt
|
746f71dfee
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-18 10:37:40 +08:00 |
|
Matt
|
69af2b7b5a
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 23:41:54 +08:00 |
|
Matt
|
27fd48b730
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 23:37:15 +08:00 |
|
Matt
|
4153820dba
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 19:41:51 +08:00 |
|
Matt
|
9e6ea0b8dc
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 19:11:22 +08:00 |
|
Matt
|
5720de2e55
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 18:38:17 +08:00 |
|
Matt
|
0d69403f4a
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 16:42:07 +08:00 |
|
Matt
|
d1d25a12a1
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 10:00:35 +08:00 |
|
Matt
|
e9dde4cefe
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 09:32:57 +08:00 |
|
Matt
|
3d08bd48de
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 06:47:03 +08:00 |
|
Matt
|
d5bb48ef58
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 06:33:03 +08:00 |
|
Matt
|
f1941f1fc5
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-15 23:09:17 +08:00 |
|
Matt
|
f8baa9e26c
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 12:44:09 +08:00 |
|
Matt
|
852314c17c
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 09:32:28 +08:00 |
|
Matt
|
b6f3f3d689
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 09:08:55 +08:00 |
|
Matt
|
0c2a634922
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 01:08:23 +08:00 |
|
Matt
|
1c77cb5c42
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 14:19:55 +08:00 |
|
Matt
|
ea79246f83
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 10:35:07 +08:00 |
|
Matt
|
f9d66687c1
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 00:43:43 +08:00 |
|
Matt
|
3a563dde8b
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 00:35:28 +08:00 |
|
Matt
|
cca2b8fd6c
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 15:26:03 +08:00 |
|
Matt
|
695b779e4b
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 15:04:52 +08:00 |
|
Matt
|
0bcfac8177
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 14:22:09 +08:00 |
|
Matt
|
69187df279
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 14:00:23 +08:00 |
|
Matt
|
e4c41a9310
|
Test version for DB sync schedule job
|
2012-05-09 13:58:19 +08:00 |
|
Matt
|
556b279418
|
Remove publi/assets from github
|
2012-04-25 15:20:15 +08:00 |
|
Matt
|
e0d3319ea9
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-04-23 17:21:30 +08:00 |
|
Matt
|
a8eeaf235f
|
Add Announcement translation
|
2012-04-23 15:28:56 +08:00 |
|
Matt
|
b6f64cd8a5
|
Announcement i18n vars
|
2012-04-23 11:29:00 +08:00 |
|
Matt Fu
|
1e60acaa11
|
Fact check program completed,Lin checked
|
2012-03-27 19:06:28 +08:00 |
|
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +08:00 |
|