Harry Bomrah
|
19b60a2ddb
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-07-31 01:16:43 +08:00 |
|
Harry Bomrah
|
45da2971ef
|
Merge branch 'gallery_orbit' into desktop_harry
|
2012-07-31 01:16:22 +08:00 |
|
Harry Bomrah
|
17dffb15e1
|
Major updates for gallery
|
2012-07-31 01:15:48 +08:00 |
|
Harry Bomrah
|
929cd3b0cc
|
Gallery update..
|
2012-07-29 18:52:30 +08:00 |
unknown
|
c0cac812c5
|
demo site widget
|
2012-07-26 16:39:29 +08:00 |
|
Harry Bomrah
|
6d745e9ea7
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-07-25 16:21:49 +08:00 |
|
Harry Bomrah
|
584d5d388e
|
Merge branch 'gallery_orbit' into desktop_harry
|
2012-07-25 16:21:03 +08:00 |
|
Harry Bomrah
|
8f23755c0d
|
Gallery update
|
2012-07-25 16:20:07 +08:00 |
OrbitServer
|
f223e4bb1e
|
Ika's changes for orbit bar
|
2012-07-20 15:41:27 +08:00 |
|
Harry Bomrah
|
3415c3b17f
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-07-19 15:54:33 +08:00 |
|
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 |
|
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 |
|
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 |
|
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 |