Commit Graph

389 Commits

Author SHA1 Message Date
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
Harry Bomrah c55cd5c9bb Last commit 2012-04-11 15:50:27 +08:00
Harry Bomrah 68803c0c97 Lets see 2012-04-11 15:36:32 +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
devin 1fabe3d8f7 theme setting update 2012-04-11 15:22:05 +08:00
devin 0219c3df28 various update 2012-04-11 15:04:00 +08:00
devin 42f45aa137 theme setting update 2012-04-11 13:46:32 +08:00
devin ee85380ab2 little update 2012-04-10 18:09:29 +08:00
devin 360e5228b7 custom theme settings 2012-04-10 17:44:36 +08:00
devin 6006f1b3c6 start editing setting page
some relevant stuff updated
2012-04-10 01:06:29 +08:00
Harry Bomrah 695c1dee58 Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin 2012-04-09 17:55:17 +08:00
Harry Bomrah 32a1be624b Fully updated.. 2012-04-09 17:55:03 +08:00
Harry Bomrah eb219c14b7 Merge branch 'desktop_harry' of https://github.com/Rulingcom/orbit into desktop_harry 2012-04-09 17:40:13 +08:00
Harry Bomrah f807cd026d app section modified… 2012-04-09 17:40:03 +08:00
devin 9dde708c01 app manager page update 2012-04-09 17:13:24 +08:00
Christophe Vilayphiou e1ef109b8b Fix bug: Snake -> snake 2012-04-07 01:33:36 +08:00
Harry Bomrah 35567c2139 Widgets Loading dynamically and semi structured 2012-04-06 23:48:03 +08:00
Harry Bomrah bb2375b15e Temp Commit 2012-04-06 19:05:11 +08:00
Christophe Vilayphiou f65bb9b323 Merge branch 'master' into desktop_harry
Conflicts:
	app/assets/stylesheets/style.css.erb
2012-04-06 19:02:39 +08:00
Christophe Vilayphiou 253f4bcb54 Ray's changes for orbit bar 2012-04-06 18:06:57 +08:00
Harry Bomrah e1ef2b28e7 theme changes 2012-04-06 17:49:22 +08:00
Harry Bomrah 7309d9c446 Dock change and getting values from db 2012-04-06 17:49:22 +08:00
Harry Bomrah b2c9229099 route fixed. 2012-04-06 17:47:04 +08:00
Harry Bomrah 3acd8a86c7 commit temp 2012-04-06 17:47:04 +08:00
devin cd3e04c55c add tinyscrollbar 2012-04-06 17:47:04 +08:00
devin 293e084bea dock effect 2012-04-06 17:47:04 +08:00
Harry Bomrah f5c080efd4 Model commit 2012-04-06 17:47:04 +08:00
unknown 79f005c88e new icons 2012-04-06 17:47:03 +08:00
Harry Bomrah 58b51f0d17 Themes fixed… 2012-04-06 17:47:03 +08:00
Harry Bomrah ddf6a606a2 with notifications and other changes 2012-04-06 17:47:03 +08:00
Harry Bomrah 6158799a47 Stupid theme 2012-04-06 17:47:03 +08:00
Harry Bomrah 77b2919d8c Desktop Commit 2012-04-06 17:47:02 +08:00
Harry Bomrah da7b415ad8 Desktop commit 2012-04-06 17:47:01 +08:00
Christophe Vilayphiou 6f9363ef54 Fix bugs in upload design and missing menu 2012-04-06 17:37:45 +08:00
Harry Bomrah 94816ce224 js change 2012-04-06 15:18:39 +08:00
devin 74f083b226 details changed
orbitdesktop.js, orbitdesktopAPI.js update!
2012-04-06 04:42:20 +08:00
Harry Bomrah 39e1bc8948 new setting page 2012-04-05 20:09:11 +08:00
Christophe Vilayphiou ad740b0daf Missing end tag in side_bar 2012-04-05 18:13:52 +08:00
Christophe Vilayphiou 894f8764d8 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
	app/views/layouts/_side_bar.html.erb
2012-04-05 17:42:55 +08:00
Matthew K. Fu JuYuan 01bda515a6 fact_check with Ray's permission check.
needs Ray's new css
2012-04-05 17:41:43 +08:00
Christophe Vilayphiou ef8eb0450b Changes in tinymce bar 2012-04-05 17:28:21 +08:00
devin f7997bbd85 layout adjustment 2012-04-05 15:52:15 +08:00
unknown d45725cf3b fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
Matthew K. Fu JuYuan ef88c2dbc2 fact_check with Ray's permission check.
needs Ray's new css
2012-04-05 15:06:01 +08:00
Christophe Vilayphiou 1259d62249 Fix mainTablePosition in js -> remove the notable class 2012-04-05 14:55:41 +08:00