Matthew K. Fu JuYuan
|
a50ccdafb2
|
consolidate_object_auth for 171 production
|
2012-10-16 15:08:02 +08:00 |
|
Matthew K. Fu JuYuan
|
b3a9a7ab07
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-10-16 14:24:01 +08:00 |
|
Matthew K. Fu JuYuan
|
6dfe10040b
|
fix object auth without app_auth
|
2012-10-16 14:23:44 +08:00 |
chris
|
afff128e9c
|
Fix page_part creation when design is changed
|
2012-10-16 14:15:33 +08:00 |
|
chris
|
f7f0b48707
|
Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
config/initializers/resque.rb
|
2012-10-16 14:14:56 +08:00 |
|
Matthew K. Fu JuYuan
|
67bd68d492
|
harry's js fix
|
2012-10-08 10:11:45 +08:00 |
|
Matthew K. Fu JuYuan
|
e67ca84282
|
object_auth change to reload
|
2012-10-04 18:20:21 +08:00 |
Matt
|
962bae9a82
|
merge
|
2012-10-01 21:09:09 +08:00 |
|
Matthew K. Fu JuYuan
|
7919750d4f
|
171 doesn't have bug with javascript remove log script
|
2012-10-01 19:05:23 +08:00 |
|
Matthew K. Fu JuYuan
|
3dc4dc2316
|
debug commit
|
2012-10-01 17:56:55 +08:00 |
|
Matthew K. Fu JuYuan
|
506fa179a1
|
fix announcement
|
2012-10-01 17:48:51 +08:00 |
|
Matt
|
b65d785834
|
harry's fix, announcement still broken
|
2012-10-01 17:21:23 +08:00 |
|
Matthew K. Fu JuYuan
|
5ac04ea07d
|
devin's css for tinymce
|
2012-09-28 09:58:28 +08:00 |
|
Matthew K. Fu JuYuan
|
aa5d0bb1ad
|
Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
config/locales/zh_tw.yml
|
2012-09-28 09:49:22 +08:00 |
|
Matthew K. Fu JuYuan
|
cfc80340b8
|
add setting for tinymce config
|
2012-09-28 09:45:50 +08:00 |
Harry Bomrah
|
9a4c8137fe
|
Fix for images
|
2012-09-27 15:33:37 +08:00 |
Fu Matthew
|
dc8ca7e575
|
fix i18n.file upload failed
|
2012-09-27 13:34:40 +08:00 |
|
Fu Matthew
|
87904f8b8d
|
fix i18n
|
2012-09-27 11:03:08 +08:00 |
|
Matthew K. Fu JuYuan
|
54b874b2c9
|
fix nccu login
|
2012-09-25 15:07:07 +08:00 |
|
Christophe Vilayphiou
|
c846a102ff
|
Page by page changes for i18n yml
|
2012-09-24 09:06:44 +08:00 |
|
Christophe Vilayphiou
|
4fb35b00f2
|
Add missing translations
|
2012-09-24 09:02:46 +08:00 |
|
Christophe Vilayphiou
|
2ca7e1b548
|
Fix typos after i18n yml
|
2012-09-24 09:02:45 +08:00 |
|
Christophe Vilayphiou
|
bdd5a1a047
|
Changes for i18n yml
|
2012-09-24 09:02:45 +08:00 |
|
Harry Bomrah
|
b6c06c6d4f
|
tiny mce fix
|
2012-09-19 17:59:17 +08:00 |
|
Matthew K. Fu JuYuan
|
12db3118b4
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-09-19 15:09:56 +08:00 |
|
Matthew K. Fu JuYuan
|
8b68387199
|
fix share loading failed
|
2012-09-19 15:09:08 +08:00 |
|
Matt
|
79006201cd
|
ad_image date picker fixed
|
2012-09-19 12:23:05 +08:00 |
|
Matthew K. Fu JuYuan
|
6fd2dac4d5
|
fix ad_banner data picker not working when on 180
|
2012-09-19 12:15:03 +08:00 |
|
Matthew K. Fu JuYuan
|
d480a10661
|
fix for object_auth update
|
2012-09-19 11:12:22 +08:00 |
|
Matthew K. Fu JuYuan
|
959b6aee12
|
fix for listing object error
|
2012-09-19 10:45:03 +08:00 |
|
Matthew K. Fu JuYuan
|
1240064e23
|
add url generate
|
2012-09-18 17:37:52 +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 |
|
Matthew K. Fu JuYuan
|
3db2664c14
|
add missing file
|
2012-09-10 14:23:45 +08:00 |
|
Matthew K. Fu JuYuan
|
e12701b34b
|
preview for association object
|
2012-09-10 14:19:39 +08:00 |
|
Matthew K. Fu JuYuan
|
768f907f66
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-09-10 11:54:20 +08:00 |
|
Matthew K. Fu JuYuan
|
a20db344f1
|
preview for update
|
2012-09-10 11:53:59 +08:00 |
|
Matt
|
9d21a86f53
|
Ray's CSS changes for NCCU email
|
2012-09-07 18:16:34 +08:00 |
|
Fu Matthew
|
6044857fea
|
complete preview for both new and announcement
|
2012-09-07 17:55:59 +08:00 |
|
Fu Matthew
|
8bd5481b3f
|
fix object_auth security problem
|
2012-09-07 17:53:43 +08:00 |
|
Matthew K. Fu JuYuan
|
671f86b612
|
First version of new preview. Only plain text
|
2012-09-04 12:31:27 +08:00 |
|
Matthew K. Fu JuYuan
|
ae1595a008
|
view for preview
|
2012-09-04 09:24:12 +08:00 |
|
Matthew K. Fu JuYuan
|
fc4e2ceba5
|
fix for 403 for new interface
|
2012-08-31 18:56:26 +08:00 |
|
Matthew K. Fu JuYuan
|
26f99c296f
|
fix page blank for 403 forbidden.
|
2012-08-31 18:33:18 +08:00 |
|
Matthew K. Fu JuYuan
|
6b904a37ad
|
let all signed in users at NCCU upload files
|
2012-08-31 17:54:25 +08:00 |
|
chris
|
3c283d1a7a
|
Set default picture
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
|
2012-08-16 17:24:12 +08:00 |
|
Christophe Vilayphiou
|
96fd89cca3
|
Fix js for ie in list
|
2012-08-16 01:09:45 +08:00 |
|
Christophe Vilayphiou
|
53c5f6a3b9
|
New css and images for rss
|
2012-08-15 18:00:55 +08:00 |
|
Christophe Vilayphiou
|
0d330edfa3
|
New css and images for rss
|
2012-08-15 17:42:45 +08:00 |
|
Christophe Vilayphiou
|
43bc704468
|
Error popup only shows on flash[:error]
|
2012-08-15 15:55:29 +08:00 |
|
Christophe Vilayphiou
|
a19a5415c1
|
Ray's changes for list.css
|
2012-08-15 12:13:58 +08:00 |