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 |
Christophe Vilayphiou
|
53fb9d456f
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
|
2012-07-18 18:08:08 +08:00 |
unknown
|
10731dc211
|
demo widget
|
2012-07-18 18:07:45 +08:00 |
Matthew K. Fu JuYuan
|
033667f99b
|
fix for missing disable category at frontend and widget
|
2012-07-17 11:26:50 +08:00 |
|
Matthew K. Fu JuYuan
|
dcf3150deb
|
Merge branch 'cache_test'
|
2012-07-17 10:26:26 +08:00 |
|
Matthew K. Fu JuYuan
|
a7b92ed3e8
|
fix rejection for announcement and news.
|
2012-07-17 10:22:42 +08:00 |
|
Matthew K. Fu JuYuan
|
a4b1681d39
|
fix rejection for announcement and news.
|
2012-07-17 10:21:46 +08:00 |
|
Harry Bomrah
|
5429e8905f
|
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
|
2012-07-16 20:27:39 +08:00 |
|
Harry Bomrah
|
ded9326d1f
|
db fixed
|
2012-07-16 20:27:34 +08:00 |
|
Harry Bomrah
|
9f0c0bee71
|
fixed db error
|
2012-07-16 20:26:32 +08:00 |
|
Harry Bomrah
|
87be934aa3
|
gallery module update
|
2012-07-16 20:26:04 +08:00 |
Joshua
|
b51e656909
|
database fixing
|
2012-07-16 13:25:35 +01:00 |
|
Harry Bomrah
|
833c08eafc
|
fixed db error
|
2012-07-16 17:29:46 +08:00 |
|
unknown
|
e3f5532201
|
Merge branch 'demo_site' of https://github.com/Rulingcom/orbit into demo_site
|
2012-07-16 16:22:59 +08:00 |
|
unknown
|
71742179a8
|
demo widget
|
2012-07-16 16:13:38 +08:00 |
|
Matthew K. Fu JuYuan
|
2ae6b54a45
|
fix for not working cache
|
2012-07-13 18:32:17 +08:00 |
|
Matthew K. Fu JuYuan
|
4daf36908c
|
working cache
|
2012-07-13 15:36:10 +08:00 |
|
Matthew K. Fu JuYuan
|
0e65e379b0
|
cache first commit
|
2012-07-12 11:47:24 +08:00 |
|
Matthew K. Fu JuYuan
|
85d6bbe1c9
|
add i18n variable. fix web_links for disable category
|
2012-07-11 17:56:31 +08:00 |
|
Matthew K. Fu JuYuan
|
ca2c056a07
|
fix for not displaying bulletin at fronted when it's parent category is disable
|
2012-07-11 17:17:44 +08:00 |
|
Harry Bomrah
|
ba3d13790c
|
gallery module update
|
2012-07-10 17:43:21 +08:00 |
devin
|
ff4b131aed
|
tinyscroll bar update
|
2012-07-10 16:34:50 +08:00 |
|
Harry Bomrah
|
1650d86440
|
tinyscrollbar extension
|
2012-07-09 17:29:35 +08:00 |
|
Matthew K. Fu JuYuan
|
98b274d9dd
|
add slave_ok: true to nccu172
|
2012-07-09 17:03:26 +08:00 |
|
Matthew K. Fu JuYuan
|
773371e885
|
fix from messy search
|
2012-07-09 16:48:23 +08:00 |
|
Christophe Vilayphiou
|
e48735a4ac
|
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
|
2012-07-09 16:39:58 +08:00 |
|
Christophe Vilayphiou
|
400650a905
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
|
2012-07-09 16:31:42 +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 |
|
devin
|
68fd726ce1
|
little
|
2012-07-09 16:25:41 +08:00 |
|
devin
|
b6266284b4
|
dump
|
2012-07-09 16:21:02 +08:00 |
|
Harry Bomrah
|
222c0b9564
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-07-09 16:12:45 +08:00 |
|
Harry Bomrah
|
4796de882f
|
Scroll down fixes
|
2012-07-09 16:11:31 +08:00 |
|
Matthew K. Fu JuYuan
|
09d46f2f75
|
NCCU 上傳版本 0709
Merge branch 'nccu0621'
Conflicts:
Gemfile
config/resque.god
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
|
2012-07-09 16:02:59 +08:00 |
|
devin
|
bfedf207c9
|
some changes
|
2012-07-09 15:37:47 +08:00 |
|
Matthew K. Fu JuYuan
|
49862e70f9
|
hide category at front end
|
2012-07-09 12:05:21 +08:00 |
|
devin
|
58d162d225
|
publication adjustment
|
2012-07-09 10:44:01 +08:00 |
|
Matthew K. Fu JuYuan
|
9b86e8f24e
|
fix mid site connection
|
2012-07-06 18:24:25 +08:00 |
|
Matthew K. Fu JuYuan
|
56caf4b34e
|
category disable for backend
|
2012-07-06 18:11:55 +08:00 |
|
Harry Bomrah
|
2e94c19019
|
Merge branch 'desktop_devin' into desktop_harry
|
2012-07-06 16:12:01 +08:00 |
|
Harry Bomrah
|
830eb8eb62
|
Timeline design and timescale update
|
2012-07-06 16:11:03 +08:00 |
|
devin
|
8948ccca25
|
little changes
|
2012-07-06 16:09:26 +08:00 |
|
devin
|
bfaed4deb4
|
timeline change
|
2012-07-05 16:49:03 +08:00 |
|
Harry Bomrah
|
312e63f242
|
New Timeline with books and seminar pages
|
2012-07-05 16:42:00 +08:00 |
|
Joshua Milton
|
bb75383ef0
|
Seminar Pages modified
|
2012-07-05 16:27:59 +08:00 |
|
Matthew K. Fu JuYuan
|
c5fdff764e
|
orbit disable object for categories
|
2012-07-05 16:00:45 +08:00 |
|
Harry Bomrah
|
6923b82284
|
Added seminar section
|
2012-07-04 19:12:02 +08:00 |