developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
623 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

623 Commits

Author SHA1 Message Date
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
Christophe Vilayphiou 8471120c63 Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry 
Conflicts:
	app/assets/javascripts/orbitdesktop.js
 2012-04-06 17:52:22 +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 7f2f444dba add icons 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
unknown 2646c3fe33 update icons 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 7f8047a645 Merge branch 'babel' of github.com:Rulingcom/orbit into babel 2012-04-06 17:38:14 +08:00
Christophe Vilayphiou 6f9363ef54 Fix bugs in upload design and missing menu 2012-04-06 17:37:45 +08:00
Christophe Vilayphiou ab46084190 Fix bugs in upload design and missing menu 2012-04-06 17:31:22 +08:00
Harry Bomrah 625df9094f theme changes 2012-04-06 17:24:39 +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 20bfd0d984 Dock change and getting values from db 2012-04-05 20:32:56 +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
Matthew K. Fu JuYuan 1a6242edbd fix ad_banner sidebar 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
Christophe Vilayphiou 4da03026a4 Fix pagination bug in bulletins 2012-04-05 15:28:43 +08:00
Christophe Vilayphiou 5f5871d1c2 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
 2012-04-05 15:24:39 +08:00
unknown d45725cf3b fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
unknown 9382ef6ae8 Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard 
Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
 2012-04-05 15:16:33 +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
unknown ccb0110b77 fix announcement & add lang tab 2012-04-05 14:48:31 +08:00
Harry Bomrah a0d5e847e0 Merge branch 'desktop_devin' into desktop_harry 2012-04-05 14:29:04 +08:00
Christophe Vilayphiou 7bf50d6c52 Move the audit block to the bottom 2012-04-05 14:08:03 +08:00
Christophe Vilayphiou 1b79400f44 Fix menu for frontend 2012-04-05 14:06:58 +08:00