Harry Bomrah
|
e447dc411a
|
design update
|
2012-08-21 19:36:49 +08:00 |
|
Harry Bomrah
|
2f4b93db59
|
Page added for desktop
|
2012-08-08 21:35:51 +08:00 |
|
Harry Bomrah
|
830eb8eb62
|
Timeline design and timescale update
|
2012-07-06 16:11:03 +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 |
|
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 |
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 |
|
Harry Bomrah
|
7151102a86
|
new page add and timeline changes
|
2012-06-28 17:31:48 +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 |
|
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 |
|
Harry Bomrah
|
555ec86403
|
Timeline commit
|
2012-06-26 15:59:28 +08:00 |
|
Harry Bomrah
|
7f0267aedd
|
have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables
|
2012-06-04 18:00:06 +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 |
|
Christophe Vilayphiou
|
9129835f23
|
Add tags to assets
|
2012-05-16 18:19:41 +08:00 |
|
Christophe Vilayphiou
|
0b0916179f
|
Change assets
|
2012-05-16 11:07:11 +08:00 |
|
Matthew K. Fu JuYuan
|
7a6d30ad62
|
Remove unless files and change routes.
|
2012-05-14 00:50:36 +08:00 |
|
Harry Bomrah
|
2c3637e9b4
|
very important update for widgets management..
|
2012-05-11 15:27:16 +08:00 |
|
Christophe Vilayphiou
|
fd52d00187
|
Add drag and drop to structure side_bar
|
2012-05-11 10:00:45 +08:00 |
|
Matthew K. Fu JuYuan
|
07815eee8f
|
fix display for announcement and remove ut field
|
2012-05-10 10:29:18 +08:00 |
|
Matthew K. Fu JuYuan
|
69f2f6a716
|
now jobs is working
|
2012-05-08 20:21:28 +08:00 |
|
Matthew K. Fu JuYuan
|
c28d7d59b6
|
starting Resque
|
2012-05-08 20:21:28 +08:00 |
|
Harry Bomrah
|
2083e0bf4f
|
widget structure improvised…
|
2012-05-07 19:00:50 +08:00 |
|
Christophe Vilayphiou
|
1fb6c20b86
|
Add site_info
|
2012-05-07 00:54:18 +08:00 |
|
Christophe Vilayphiou
|
f190ce18ee
|
Put sorting in web_link, page_context and design
|
2012-05-05 21:20:20 +08:00 |
|
Harry Bomrah
|
fcc875bb5d
|
app store page added… and few other changes..
|
2012-05-04 20:28:12 +08:00 |
|
Matthew K. Fu JuYuan
|
f6307abfbf
|
fix broken ad_banner
|
2012-05-04 15:40:43 +08:00 |
|
Harry Bomrah
|
a3a1e4b92e
|
controller change, views working and db for paper and journals
|
2012-05-03 21:30:12 +08:00 |
|
Harry Bomrah
|
d6cbbff9de
|
connection page working now..
|
2012-05-03 14:40:54 +08:00 |
|
Harry Bomrah
|
c158375d02
|
with connection and some save settings…
|
2012-04-26 21:30:13 +08:00 |
|
Harry Bomrah
|
c2ac682787
|
updates for connections
|
2012-04-26 17:23:47 +08:00 |
|
Harry Bomrah
|
64be61d61b
|
with gmail widget..
|
2012-04-26 14:47:49 +08:00 |
|
Matthew K. Fu JuYuan
|
7f285f4719
|
Change ad_banner preview from using title to id
|
2012-04-25 16:10:11 +08:00 |
|
Harry Bomrah
|
a298cbd5f6
|
Publication started
|
2012-04-24 16:45:26 +08:00 |
|
Matthew K. Fu JuYuan
|
c57ba305e9
|
Fix ad_banner
|
2012-04-24 14:37:06 +08:00 |
|
Christophe Vilayphiou
|
a5b13e680f
|
Add sub_menu in r_tags
|
2012-04-24 02:30:40 +08:00 |
|
Matthew K. Fu JuYuan
|
81b0046f42
|
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
e353afb5ac
|
fix i18n vars in ad_banner
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
1b70852ff7
|
realtime preview is working. but save to object when preview
|
2012-04-23 14:06:37 +08:00 |
|
Matthew K. Fu JuYuan
|
ff472714de
|
AdBanner i18n vars patch
|
2012-04-23 14:05:18 +08:00 |
|
Harry Bomrah
|
02c6933d0b
|
Tiles position saved in db and also change them from section manager
|
2012-04-17 16:33:41 +08:00 |
|
Harry Bomrah
|
48323ac1af
|
lot of changes in fetching
|
2012-04-12 14:44:08 +08:00 |
|
Harry Bomrah
|
25ca29403c
|
section page added
|
2012-04-11 17:58:52 +08:00 |
|
Harry Bomrah
|
5a6541a592
|
Setting page update
|
2012-04-11 17:26:25 +08:00 |