Commit Graph

117 Commits

Author SHA1 Message Date
Harry Bomrah 5fb32f3867 desktopAPI update. 2012-11-08 19:42:22 +08:00
Harry Bomrah e45502cd68 desktop api update.. 2012-11-08 17:02:10 +08:00
Harry Bomrah da5e7f670e Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
Harry Bomrah 2e809c5c19 Calander view updated... 2012-11-05 11:40:11 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +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
devin 68fd726ce1 little 2012-07-09 16:25:41 +08:00
devin b6266284b4 dump 2012-07-09 16:21:02 +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
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
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 08fd07b6aa timeline and font update 2012-07-02 16:22:51 +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
Harry Bomrah 81ff0f2c1c Merge branch 'desktop_harry' into desktop_devin 2012-05-21 15:26:38 +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
Harry Bomrah 75cbae049b few experiments… 2012-05-16 11:18:54 +08:00
Harry Bomrah 1a9fa8f505 Merge branch 'desktop_harry' into desktop_devin 2012-05-11 15:28:05 +08:00
Harry Bomrah 2c3637e9b4 very important update for widgets management.. 2012-05-11 15:27:16 +08:00
devin 97b60c48b2 update 2012-05-10 17:41:56 +08:00
devin ada56a7a63 some update 2012-05-10 10:54:43 +08:00
Harry Bomrah 2083e0bf4f widget structure improvised… 2012-05-07 19:00:50 +08:00
Harry Bomrah fcc875bb5d app store page added… and few other changes.. 2012-05-04 20:28:12 +08:00
Harry Bomrah 3ad11f2098 View functionality, changed controller, journal and pages collections 2012-05-03 21:38:03 +08:00
Harry Bomrah a3a1e4b92e controller change, views working and db for paper and journals 2012-05-03 21:30:12 +08:00
devin aeaf2f05d1 Start Add Page - no function 2012-05-03 17:59:07 +08:00
Harry Bomrah 1fce99c96f Merge branch 'desktop_harry' into desktop_devin 2012-05-03 14:42:07 +08:00
Harry Bomrah d6cbbff9de connection page working now.. 2012-05-03 14:40:54 +08:00
devin b87cf0e2ff list page 2012-05-03 14:39:22 +08:00
Harry Bomrah 6b8c79a9a8 Merge branch 'desktop_devin' into desktop_harry 2012-05-02 17:06:56 +08:00
Harry Bomrah 5b7c422446 position update fixed.. 2012-05-02 17:05:40 +08:00
devin 887bda1491 lots of change 2012-05-02 17:04:16 +08:00
devin bfc4507696 Connection page design 2012-05-01 18:05:17 +08:00
Harry Bomrah 769a67f026 the group more structured and also demo connecting with gmail account.. 2012-04-30 21:17:20 +08:00
Harry Bomrah 1b7fb106f8 lot of updates 2012-04-30 14:33:12 +08:00
Harry Bomrah aacd9da9fb auto login encryption done… 2012-04-30 14:29:42 +08:00
devin b6fceadff4 column group experiment 2012-04-30 06:41:05 +08:00
devin 2ebba577eb journal start 2012-04-27 14:04:11 +08:00
Harry Bomrah c158375d02 with connection and some save settings… 2012-04-26 21:30:13 +08:00
Harry Bomrah a298cbd5f6 Publication started 2012-04-24 16:45:26 +08:00