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

2278 Commits

Author SHA1 Message Date
Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
 2012-04-12 18:50:48 +08:00
Christophe Vilayphiou f8873267a2 Ray's fix for announcement list 2012-04-12 18:41:14 +08:00
devin eabbba76fc css change 2012-04-12 18:14:26 +08:00
Christophe Vilayphiou 6728c35023 Fix side_bar. 
In the case of tags, take the uri instead of controller name
 2012-04-12 18:14:00 +08:00
Christophe Vilayphiou 167f6d07a0 Remove extra "]" 2012-04-12 18:13:26 +08:00
Christophe Vilayphiou 015c0cb452 Delete useless code in items 2012-04-12 18:13:10 +08:00
Christophe Vilayphiou 93ac99d235 Add missing css in "inc" 2012-04-12 18:12:46 +08:00
Harry Bomrah 01af32aa60 added divs with id 2012-04-12 16:52:32 +08:00
Harry Bomrah 92427e8831 section page done… 2012-04-12 16:25:06 +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
Christophe Vilayphiou c7d6929c21 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-04-12 07:15:12 +08:00
Matthew K. Fu JuYuan b54578ce1e ad banner preview 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 83b4443910 add pic and js for permission checkbox and filter 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 57402b8602 add permission-checkbox js 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan e4c41ab54c A filter UI for permission select. with Harry's JS 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 0909156eb4 fix i18n var for fact check pending 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 1fd38c8135 factcheck status for and 2012-04-12 07:14:06 +08:00
Christophe Vilayphiou 5417c6fec0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
 2012-04-12 07:13:13 +08:00
Christophe Vilayphiou 7bca339a5b Ray's fix for columns width in bulletins 2012-04-12 07:01:34 +08:00
Christophe Vilayphiou 486845460c Filter and delete for bulletins 2012-04-12 06:50:36 +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
Matthew K. Fu JuYuan d2e77d6bf8 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-09 12:45:27 +08:00
Matthew K. Fu JuYuan d2a3a4d26e ad banner preview 2012-04-09 12:44:08 +08:00
Matthew K. Fu JuYuan 0eab9ca8fa add pic and js for permission checkbox and filter 2012-04-09 12:43:51 +08:00
Matthew K. Fu JuYuan c7c3af91dd add permission-checkbox js 2012-04-09 12:43:10 +08:00
Christophe Vilayphiou e1ef109b8b Fix bug: Snake -> snake 2012-04-07 01:33:36 +08:00
Christophe Vilayphiou 963a0cb604 Change filter to js with history for bulletins 2012-04-07 00:20:52 +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