Harry Bomrah
|
1daf405b3d
|
Gallery started.
|
2012-08-20 23:14:10 +08:00 |
|
Harry Bomrah
|
5fd367a8d9
|
fixed db error
|
2012-08-20 23:14:10 +08:00 |
Joshua
|
22c43e7f7d
|
database fixing
|
2012-08-20 23:14:10 +08:00 |
|
Harry Bomrah
|
207d360d1e
|
fixed db error
|
2012-08-20 23:11:32 +08:00 |
|
Harry Bomrah
|
9f3d22360e
|
gallery module update
|
2012-08-20 23:11:32 +08:00 |
devin
|
801c7cab0c
|
tinyscroll bar update
|
2012-08-20 23:11:32 +08:00 |
|
Harry Bomrah
|
1efb807246
|
tinyscrollbar extension
|
2012-08-20 23:11:32 +08:00 |
unknown
|
9333503545
|
demo_site widget edit
|
2012-08-10 15:33:28 +08:00 |
|
unknown
|
d5c55c9697
|
widget & frontend field
|
2012-08-09 15:25:30 +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 |
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 |
|
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 |
|
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 |
|
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 |
|
Joshua Milton
|
bb75383ef0
|
Seminar Pages modified
|
2012-07-05 16:27:59 +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 |
|
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
|
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 |
|
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
|
3542e58869
|
Merge branch 'desktop_devin' into desktop_joshua
|
2012-06-28 17:33:32 +08:00 |