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 |
|
Matthew K. Fu JuYuan
|
1278581a82
|
add rescue job . can work with init script
|
2012-06-29 17:42:36 +08:00 |
|
Christophe Vilayphiou
|
a1e74987dc
|
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
|
2012-06-29 16:10:29 +08:00 |
|
Matthew K. Fu JuYuan
|
c0b3798bad
|
fix for date for qu menu
|
2012-06-29 11:41:06 +08:00 |
|
Matthew K. Fu JuYuan
|
f66c3d9c0c
|
fix bugs.
|
2012-06-29 11:17:35 +08:00 |
|
Harry Bomrah
|
3542e58869
|
Merge branch 'desktop_devin' into desktop_joshua
|
2012-06-28 17:33:32 +08:00 |
|
Harry Bomrah
|
7151102a86
|
new page add and timeline changes
|
2012-06-28 17:31:48 +08:00 |
|
Matthew K. Fu JuYuan
|
6c4c1046bc
|
fix date select cause error back to the time of Jesus
|
2012-06-28 15:19:51 +08:00 |
|
Matthew K. Fu JuYuan
|
58a11ff569
|
fix javascript for new and anc link removing
|
2012-06-28 13:50:11 +08:00 |
|
Matthew K. Fu JuYuan
|
243c9e2946
|
fix relation between bulletin and category (news also)
|
2012-06-27 15:16:16 +08:00 |
|
Matthew K. Fu JuYuan
|
04a23db745
|
fix invalid invalid byte sequence in US-ASCII for js files
|
2012-06-27 14:27:27 +08:00 |
|
Matthew K. Fu JuYuan
|
55449efb35
|
fix 新聞與公告QA
1.優先處理-快速編輯中的檔案上傳無法新增，但可刪除
2.優先處理-編輯中的檔案列表，無法刪除
3.優先處理-刪除時應彈出警告視窗，請user確認一次，再將檔案刪除
|
2012-06-27 14:21:06 +08:00 |
|
Christophe Vilayphiou
|
4c4929c20a
|
Fix js for news quick_edit and edit for files
|
2012-06-27 11:36:18 +08:00 |
|
Matthew K. Fu JuYuan
|
6a4abc6c43
|
fix news error
|
2012-06-27 09:59:32 +08:00 |
|
Harry Bomrah
|
32d1f8840c
|
Merge branch 'desktop_harry' into desktop_joshua
|
2012-06-26 21:11:19 +08:00 |
|
Harry Bomrah
|
4aa155a44d
|
timeline updates major ones..
|
2012-06-26 21:09:33 +08:00 |
|
Matthew K. Fu JuYuan
|
83a72bdf6e
|
fix for announcement
|
2012-06-26 18:23:44 +08:00 |
|
Matthew K. Fu JuYuan
|
818c58c1ee
|
fix for 新聞與公告QA
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示）
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位
|
2012-06-26 17:46:02 +08:00 |
|
Harry Bomrah
|
e8c3a1b904
|
Joshua branch update
|
2012-06-26 17:04:50 +08:00 |
|
Joshua Milton
|
8c7a0fdf0a
|
test
|
2012-06-26 16:59:29 +08:00 |
|
Matthew K. Fu JuYuan
|
df722ba90f
|
change display of user dept for showing announcement
|
2012-06-26 16:21:18 +08:00 |
|
Harry Bomrah
|
555ec86403
|
Timeline commit
|
2012-06-26 15:59:28 +08:00 |
|
unknown
|
9aea2824b9
|
demo
|
2012-06-26 14:42:18 +08:00 |
|
unknown
|
0c48664af0
|
demo
|
2012-06-26 14:31:29 +08:00 |
|
Matthew K. Fu JuYuan
|
2b54067ecb
|
change order of display menu of categories of news_bulletin and bulletin.
|
2012-06-26 14:28:21 +08:00 |
|
Matthew K. Fu JuYuan
|
56b1bd9eaa
|
add translation
|
2012-06-26 10:57:51 +08:00 |