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 |
|
Harry Bomrah
|
f635f642fc
|
Merge for new timeline updates and font updates
|
2012-07-04 18:49:10 +08:00 |
|
Joshua Milton
|
441929eb74
|
Latest code by joshua
|
2012-07-04 18:39:28 +08:00 |
|
Joshua Milton
|
6b9926539d
|
Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
Conflicts:
app/assets/javascripts/orbitdesktop.js
app/controllers/desktop_publications_controller.rb
config/routes.rb
|
2012-07-04 18:31:00 +08:00 |
|
Matthew K. Fu JuYuan
|
edef51d58c
|
DM for archive bulletin categroy
|
2012-07-04 17:56:51 +08:00 |
|
Joshua Milton
|
3f42a22094
|
Books section added
|
2012-07-04 17:55:30 +08:00 |
|
Matthew K. Fu JuYuan
|
32480e10ed
|
en translation
|
2012-07-04 17:43:52 +08:00 |
|
Matthew K. Fu JuYuan
|
ae2cbb728e
|
archive for announcement
|
2012-07-04 17:36:51 +08:00 |
|
devin
|
e133673736
|
some change
|
2012-07-04 13:38:18 +08:00 |
|
Harry Bomrah
|
a0c09046a8
|
Timeline merge plus font update
|
2012-07-03 19:53:34 +08:00 |
|
Harry Bomrah
|
f20f36383e
|
Timeline ajax load fixed… a bit change in structure..
|
2012-07-03 19:45:47 +08:00 |
|
Matthew K. Fu JuYuan
|
f7107936d0
|
fix for checking @rulingcom.com
|
2012-07-03 18:21:48 +08:00 |
|
Matthew K. Fu JuYuan
|
9607b5bbfd
|
rulingcom帳號不透過LDAP認證
|
2012-07-03 18:12:44 +08:00 |
|
Matthew K. Fu JuYuan
|
d0632b2e4c
|
change name format
|
2012-07-03 16:05:19 +08:00 |
|
Matthew K. Fu JuYuan
|
56ecf9c69b
|
remove remember for nccu
|
2012-07-03 15:59:25 +08:00 |
|
Matthew K. Fu JuYuan
|
4fe92b844e
|
Add sorting order for NCCU request
|
2012-07-03 15:47:28 +08:00 |
|
Matthew K. Fu JuYuan
|
4014f8ee47
|
fix over queue at resque
|
2012-07-03 10:51:26 +08:00 |
|
Harry Bomrah
|
bacb1f1e63
|
Timeline ajax loading
|
2012-07-02 21:06:36 +08:00 |
|
devin
|
f34cb47618
|
font aweosme change
|
2012-07-02 16:23:14 +08:00 |
|
devin
|
08fd07b6aa
|
timeline and font update
|
2012-07-02 16:22:51 +08:00 |
|
devin
|
6533abf214
|
font awesome update
|
2012-07-02 11:10:01 +08:00 |
|
Christophe Vilayphiou
|
15cdb54599
|
Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
|
2012-06-29 18:36:36 +08:00 |
|
unknown
|
43c38bc940
|
demo
|
2012-06-29 18:36:17 +08:00 |
|
unknown
|
6b15a03f1f
|
demo
|
2012-06-29 18:36:17 +08:00 |
|
unknown
|
3a6cd92e87
|
demo website widget
|
2012-06-29 18:36:17 +08:00 |