developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,620 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

39 Commits

Author SHA1 Message Date
Harry Bomrah 6c3f4bff8c new stuff for gmail and fb 2013-12-27 10:16:29 +08:00
Harry Bomrah 73b82bc177 second commit for harry.tp 2013-11-27 09:46:00 +08:00
Harry Bomrah 42615f02ea new feature in desktop for uploading wallpapers or putting url link 2013-08-02 19:32:41 +08:00
Harry Bomrah f7dbbf1bca new themes added to desktop plus theme uploader created 2013-07-30 16:43:32 +08:00
Harry Bomrah 5f9190db39 few updates with fb integration and some other changes in user and supports data to android 
Conflicts:
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
 2013-07-30 16:43:11 +08:00
devin chen ac58b993c2 simple component update 
minor update
 2013-07-30 16:43:09 +08:00
devin chen 874819266d minor update 2013-07-30 16:42:23 +08:00
devin e7bffe4c0f devin's new branch 2013-04-17 14:14:24 +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 1d06bcaae7 Major tinyscrollbar update 2013-04-17 10:54:38 +08:00
Harry Bomrah 3182f5c9a8 merging 2013-03-05 11:20:01 +08:00
Harry Bomrah dc92ef9f42 simple layout tinyscrollbar fixed 2013-03-05 11:04:18 +08:00
devin 4e24223c78 desktop CSS update 2013-03-05 09:39:01 +08:00
Harry Bomrah c82e9a646d tinyscrollbar fixed 2013-02-27 18:55:26 +08:00
Harry Bomrah 08b99011d0 all sections and sections megerd 2012-12-07 10:10:38 +08:00
Harry Bomrah 8094ddc967 section fixed and some other fixes 2012-12-06 17:43:19 +08:00
Harry Bomrah a56d80698f desktop api update.. 2012-11-12 15:11:36 +08:00
Harry Bomrah 1a9fa8f505 Merge branch 'desktop_harry' into desktop_devin 2012-05-11 15:28:05 +08:00
devin ada56a7a63 some update 2012-05-10 10:54:43 +08:00
Harry Bomrah fcc875bb5d app store page added… and few other changes.. 2012-05-04 20:28:12 +08:00
Harry Bomrah d6cbbff9de connection page working now.. 2012-05-03 14:40:54 +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 aacd9da9fb auto login encryption done… 2012-04-30 14:29:42 +08:00
Harry Bomrah c158375d02 with connection and some save settings… 2012-04-26 21:30:13 +08:00
Harry Bomrah 670ec2a40e Themes from db fixed.. 2012-04-23 21:04:02 +08:00
devin 19750d69e0 some update 2012-04-20 05:38:53 +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 95a1e266ae Custom thème done and theme id done… 2012-04-17 21:15:40 +08:00
devin 8cd4844689 html change 2012-04-17 16:32:11 +08:00
Harry Bomrah 64a9579b92 final on 13 april 00:00 2012-04-13 00:00:24 +08:00
Harry Bomrah 193cee2df7 new icons and widgets 2012-04-12 22:18:58 +08:00
Harry Bomrah 01af32aa60 added divs with id 2012-04-12 16:52:32 +08:00
Harry Bomrah 7b423877bf new updates 2012-04-12 14:50:45 +08:00
Harry Bomrah 48323ac1af lot of changes in fetching 2012-04-12 14:44:08 +08:00
devin 67d1f7ad08 lots of change 2012-04-12 14:19:53 +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