unknown
|
23a3a7eff6
|
update archive
|
2012-08-20 17:14:13 +08:00 |
|
unknown
|
c0cac812c5
|
demo site widget
|
2012-07-26 16:39:29 +08:00 |
OrbitServer
|
f223e4bb1e
|
Ika's changes for orbit bar
|
2012-07-20 15:41:27 +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 |
|
devin
|
bfedf207c9
|
some changes
|
2012-07-09 15:37:47 +08:00 |
|
devin
|
58d162d225
|
publication adjustment
|
2012-07-09 10:44:01 +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 |
|
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
|
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 |
|
Joshua Milton
|
3f42a22094
|
Books section added
|
2012-07-04 17:55:30 +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 |
|
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
|
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 |
|
Harry Bomrah
|
7151102a86
|
new page add and timeline changes
|
2012-06-28 17:31:48 +08:00 |
|
Harry Bomrah
|
4aa155a44d
|
timeline updates major ones..
|
2012-06-26 21:09:33 +08:00 |
|
Harry Bomrah
|
555ec86403
|
Timeline commit
|
2012-06-26 15:59:28 +08:00 |
|
Harry Bomrah
|
7488341836
|
Commit for app window..
|
2012-05-25 15:41:07 +08:00 |
Christophe Vilayphiou
|
006b84f6a1
|
Ray's fix for ie
|
2012-05-23 12:06:09 +08:00 |
|
Christophe Vilayphiou
|
541aa5831e
|
JS changes to load drag and drop
|
2012-05-22 17:37:15 +08:00 |
|
Christophe Vilayphiou
|
874a89d99b
|
Ray's fix for structure side_bar
|
2012-05-22 16:48:57 +08:00 |
|
Christophe Vilayphiou
|
d0b030c47d
|
Put inc/ajax_setting in new_admin
Fix callback for link on save
|
2012-05-22 16:11:00 +08:00 |
Matthew K. Fu JuYuan
|
99bcdf6e1e
|
clean up unless code
|
2012-05-22 14:59:54 +08:00 |
|
Matthew K. Fu JuYuan
|
79f67208fa
|
js for preventing user do stupid things durning ajax
|
2012-05-22 14:59:54 +08:00 |
|
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
|
devin
|
6fedf7232a
|
app update
|
2012-05-21 15:45:15 +08:00 |
|
Harry Bomrah
|
81ff0f2c1c
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-21 15:26:38 +08:00 |
|
devin
|
a78b72ebfc
|
app update
|
2012-05-21 15:25:18 +08:00 |
|
Harry Bomrah
|
dfe7ccf166
|
general commit
|
2012-05-21 15:24:47 +08:00 |
|
devin
|
ab7ae6dcee
|
app
|
2012-05-21 14:55:51 +08:00 |
|
Christophe Vilayphiou
|
4d33c7a56d
|
Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
|
2012-05-18 19:42:36 +08:00 |
|
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
|
Harry Bomrah
|
1b1c2c0032
|
image title and description callback fixed…
|
2012-05-17 20:19:31 +08:00 |
|
Christophe Vilayphiou
|
29c54e6480
|
Add mandatory fields to assets
|
2012-05-17 16:40:09 +08:00 |
|
Matthew K. Fu JuYuan
|
a3acd865d7
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-17 06:44:14 +08:00 |
|
Christophe Vilayphiou
|
26292f0dcc
|
Asset upload
|
2012-05-17 06:28:29 +08:00 |
|
Harry Bomrah
|
617a683d00
|
image insertion completed..
|
2012-05-16 16:22:50 +08:00 |
|
Harry Bomrah
|
c380c4cad0
|
popup fixed
|
2012-05-16 15:34:23 +08:00 |