Commit Graph

1218 Commits

Author SHA1 Message Date
Harry Bomrah a0c09046a8 Timeline merge plus font update 2012-07-03 19:53:34 +08:00
Harry Bomrah f20f36383e Timeline ajax load fixed… a bit change in structure.. 2012-07-03 19:45:47 +08:00
Harry Bomrah bacb1f1e63 Timeline ajax loading 2012-07-02 21:06:36 +08:00
devin f34cb47618 font aweosme change 2012-07-02 16:23:14 +08:00
devin 08fd07b6aa timeline and font update 2012-07-02 16:22:51 +08:00
devin 6533abf214 font awesome update 2012-07-02 11:10:01 +08:00
Christophe Vilayphiou 15cdb54599 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site 2012-06-29 18:36:36 +08:00
unknown 43c38bc940 demo 2012-06-29 18:36:17 +08:00
unknown 6b15a03f1f demo 2012-06-29 18:36:17 +08:00
unknown 3a6cd92e87 demo website widget 2012-06-29 18:36:17 +08:00
Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
Harry Bomrah 3542e58869 Merge branch 'desktop_devin' into desktop_joshua 2012-06-28 17:33:32 +08:00
Harry Bomrah 7151102a86 new page add and timeline changes 2012-06-28 17:31:48 +08:00
Harry Bomrah 32d1f8840c Merge branch 'desktop_harry' into desktop_joshua 2012-06-26 21:11:19 +08:00
Harry Bomrah 4aa155a44d timeline updates major ones.. 2012-06-26 21:09:33 +08:00
Harry Bomrah e8c3a1b904 Joshua branch update 2012-06-26 17:04:50 +08:00
Joshua Milton 8c7a0fdf0a test 2012-06-26 16:59:29 +08:00
Harry Bomrah 555ec86403 Timeline commit 2012-06-26 15:59:28 +08:00
unknown 9aea2824b9 demo 2012-06-26 14:42:18 +08:00
unknown 0c48664af0 demo 2012-06-26 14:31:29 +08:00
unknown db571d2c65 demo website widget 2012-06-25 15:38:32 +08:00
Harry Bomrah 7f0267aedd have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables 2012-06-04 18:00:06 +08:00
Christophe Vilayphiou c1c9cca952 Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg 2012-05-29 17:19:17 +08:00
Matthew K. Fu JuYuan 11247ce84c Clean up code , cache other auths. Fix sidebar 2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan 4d288fb9d1 add script for cache user 2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan 1f1868a75f cache privilege user list. 2012-05-29 17:17:26 +08:00
Harry Bomrah 7488341836 Commit for app window.. 2012-05-25 15:41:07 +08:00
Christophe Vilayphiou 75b67dddf5 Fix date bugs 2012-05-25 09:59:39 +08:00
Matthew K. Fu JuYuan 20eb8b4d15 Clean up code , cache other auths. Fix sidebar 2012-05-23 13:00:51 +08:00
Christophe Vilayphiou 71d4241a2f Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-23 12:11:26 +08:00
Christophe Vilayphiou 006b84f6a1 Ray's fix for ie 2012-05-23 12:06:09 +08:00
Christophe Vilayphiou 7c44e94285 Order list by created_at desc
Add best image size in news new
2012-05-23 11:46:19 +08:00
Christophe Vilayphiou eab82269c1 Remove seconds from date display 2012-05-22 20:19:04 +08:00
Christophe Vilayphiou d6b92fc604 Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
Matthew K. Fu JuYuan 3e60b34491 add script for cache user 2012-05-22 17:57:45 +08:00
Christophe Vilayphiou 11a371cbb9 Fix destroy in structure
Fix sorting
2012-05-22 17:55:45 +08:00
Matthew K. Fu JuYuan 97e289f823 cache privilege user list. 2012-05-22 17:55:18 +08:00
Christophe Vilayphiou 541aa5831e JS changes to load drag and drop 2012-05-22 17:37:15 +08:00
Christophe Vilayphiou 1c35e38097 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-22 16:54:35 +08:00
Christophe Vilayphiou dd4c1697cd Fix bug when object_auth was only built but not created 2012-05-22 16:52:12 +08:00
Christophe Vilayphiou 874a89d99b Ray's fix for structure side_bar 2012-05-22 16:48:57 +08:00
Christophe Vilayphiou f497851fe3 Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg 2012-05-22 16:12:00 +08:00
Matthew K. Fu JuYuan e0260542d3 fix code 2012-05-22 16:11:52 +08:00
Christophe Vilayphiou d0b030c47d Put inc/ajax_setting in new_admin
Fix callback for link on save
2012-05-22 16:11:00 +08:00
Matthew K. Fu JuYuan 1bbf89a354 fix code 2012-05-22 15:54:46 +08:00
Christophe Vilayphiou ef72a2330c Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg 2012-05-22 15:00:37 +08:00
Matthew K. Fu JuYuan 99bcdf6e1e clean up unless code 2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan 79f67208fa js for preventing user do stupid things durning ajax 2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan 361722f252 fix orbit core to adopt current user behavior 2012-05-22 14:59:54 +08:00
Christophe Vilayphiou 70b5654b35 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-22 14:47:40 +08:00