developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,820 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

2820 Commits

Author SHA1 Message Date
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
Matthew K. Fu JuYuan fa441814f3 A filter UI for permission select. with Harry's JS 2012-04-06 17:46:50 +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
Matthew K. Fu JuYuan fd5c082225 fix i18n var for fact check pending 2012-04-05 18:30:45 +08:00
Matthew K. Fu JuYuan d1dce81b3e factcheck status for and 2012-04-05 18:27:23 +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
Harry Bomrah e0f5583f43 route fixed. 2012-04-05 13:58:58 +08:00
Christophe Vilayphiou cedd782e7f Sidebar fix for ad_banner 2012-04-05 13:55:03 +08:00
Harry Bomrah 07dadbef70 commit temp 2012-04-05 13:54:49 +08:00
Matthew K. Fu JuYuan d8b20ae993 fix ad_banner sidebar 2012-04-05 11:11:48 +08:00
devin c61a4d7939 add icons 2012-04-05 10:38:47 +08:00
devin a7d84e8583 add tinyscrollbar 2012-04-05 02:31:32 +08:00
devin c4b9a9e275 dock effect 2012-04-04 05:53:49 +08:00
unknown e05a834a5b update icons 2012-04-03 18:32:42 +08:00
Harry Bomrah 4250c26c88 Model commit 2012-04-03 18:25:41 +08:00
unknown 11d3906951 new icons 2012-04-03 18:06:16 +08:00
Christophe Vilayphiou 2c39a7db54 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-04-02 11:01:08 +08:00
Matthew K. Fu JuYuan a9988a0d5c Change for interface,form. 2012-04-02 11:00:51 +08:00
Christophe Vilayphiou 7e922d8ed4 Fic bug from merge 2012-04-02 10:54:48 +08:00
Matthew K. Fu JuYuan 2fddfd367a Change for interface,form. 2012-04-02 10:50:39 +08:00
Christophe Vilayphiou 7f3ae19454 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 
Conflicts:
	lib/parsers/parser_back_end.rb
	lib/parsers/parser_front_end.rb
 2012-04-02 03:06:25 +08:00
Matthew K. Fu JuYuan 8f28d45379 The new AdBanner. 2012-04-02 03:04:38 +08:00