Commit Graph

23 Commits

Author SHA1 Message Date
Harry Bomrah 793d739726 features and widgets added
Conflicts:
	app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
devin c8aa50ee87 Lots of Update
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-04-17 14:14:23 +08:00
Harry Bomrah 79dc99d431 br fixed 2012-12-06 07:59:43 +08:00
Harry Bomrah 830eb8eb62 Timeline design and timescale update 2012-07-06 16:11:03 +08:00
devin bfaed4deb4 timeline change 2012-07-05 16:49:03 +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 2c3637e9b4 very important update for widgets management.. 2012-05-11 15:27:16 +08:00
devin 682880c5bf skip it 2012-04-26 23:18:52 +08:00
Harry Bomrah a298cbd5f6 Publication started 2012-04-24 16:45:26 +08:00
Harry Bomrah 3c5b7a5de3 Modified confirm box… 2012-04-19 15:36:03 +08:00
Harry Bomrah 4bad25e682 Msg box added and background image saving complete 2012-04-18 22:01:12 +08:00
Harry Bomrah 6b35cf821e some updates 2012-04-18 18:15:02 +08:00
Harry Bomrah edf6089e0c Devin complete 2012-04-11 15:34:19 +08:00
Harry Bomrah 4875b339f8 Fetching desktop from db 2012-04-11 15:31:10 +08:00
Harry Bomrah 32a1be624b Fully updated.. 2012-04-09 17:55:03 +08:00
Harry Bomrah 7309d9c446 Dock change and getting values from db 2012-04-06 17:49:22 +08:00
Harry Bomrah ddf6a606a2 with notifications and other changes 2012-04-06 17:47:03 +08:00
Harry Bomrah 77b2919d8c Desktop Commit 2012-04-06 17:47:02 +08:00
devin 74f083b226 details changed
orbitdesktop.js, orbitdesktopAPI.js update!
2012-04-06 04:42:20 +08:00
Harry Bomrah aa3997f7cf with notifications and other changes 2012-03-29 19:50:23 +08:00
Harry Bomrah 2e283a039d Desktop Commit 2012-03-28 18:53:30 +08:00