saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,128 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

1128 Commits

Author SHA1 Message Date
Christophe Vilayphiou 1fb6c20b86 Add site_info 2012-05-07 00:54:18 +08:00
Christophe Vilayphiou 48f8fbde7f Fix site_locale_default_head and active for current locale 2012-05-07 00:53:52 +08:00
Christophe Vilayphiou 51f87e7212 Add missing translation for enabled_for 2012-05-06 03:36:01 +08:00
Christophe Vilayphiou ce1fecaf93 Add position ordering and hiding page for i18n 2012-05-06 00:35:13 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Christophe Vilayphiou b48099d752 Fix bug in is_admin? 
Fix bug in helpers for news and announcement
 2012-05-05 17:40:07 +08:00
Harry Bomrah fcc875bb5d app store page added… and few other changes.. 2012-05-04 20:28:12 +08:00
Christophe Vilayphiou 555aa088d9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:23:45 +08:00
Christophe Vilayphiou 3ef81c520e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:16:57 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Christophe Vilayphiou 8e6fd277c2 Fix bug: preview was always true 2012-05-04 19:02:40 +08:00
Christophe Vilayphiou e9b337a385 Copy changes into news after merge 2012-05-04 18:49:07 +08:00
Christophe Vilayphiou 15bc4d4268 Fix merge error 2012-05-04 16:12:28 +08:00
Christophe Vilayphiou 3bd3820519 Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust 
Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/config/locales/en.yml
	vendor/built_in_modules/announcement/config/locales/zh_tw.yml
 2012-05-04 15:59:26 +08:00
Christophe Vilayphiou 8f1ce78ab4 Fix bug when homepage 2012-05-04 15:51:51 +08:00
Matthew K. Fu JuYuan 119d8ff13a add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data. 2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan 048ce4c97e disable input 2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan 453cb21066 Announcement preivew 2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan f6307abfbf fix broken ad_banner 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan bff3cefbc7 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan f427c3803f clean up useless flash msgs. add i18n vars for app auth and object auth 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan 05ded8de03 Fix for NCCU 0430 all functions ok with two submanagers but different behavors 2012-05-04 15:38:18 +08:00
Harry Bomrah 4dc82e91a0 Merge branch 'desktop_devin' into desktop_harry 2012-05-03 21:41:20 +08:00
Harry Bomrah 49ab5bd858 minor update 2012-05-03 21:40:40 +08:00
Harry Bomrah 3ad11f2098 View functionality, changed controller, journal and pages collections 2012-05-03 21:38:03 +08:00
Harry Bomrah a3a1e4b92e controller change, views working and db for paper and journals 2012-05-03 21:30:12 +08:00
Matthew K. Fu JuYuan b89975b4c4 add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data. 2012-05-03 18:27:39 +08:00
devin aeaf2f05d1 Start Add Page - no function 2012-05-03 17:59:07 +08:00
Matthew K. Fu JuYuan eb81aa6980 disable input 2012-05-03 15:48:42 +08:00
Matthew K. Fu JuYuan 2a14c8bad4 Announcement preivew 2012-05-03 14:57:10 +08:00
Harry Bomrah 1fce99c96f Merge branch 'desktop_harry' into desktop_devin 2012-05-03 14:42:07 +08:00
Harry Bomrah d6cbbff9de connection page working now.. 2012-05-03 14:40:54 +08:00
devin b87cf0e2ff list page 2012-05-03 14:39:22 +08:00
Christophe Vilayphiou 45e21f9569 Fix filter category in news 2012-05-02 17:55:02 +08:00
Harry Bomrah 6b8c79a9a8 Merge branch 'desktop_devin' into desktop_harry 2012-05-02 17:06:56 +08:00
Harry Bomrah 5b7c422446 position update fixed.. 2012-05-02 17:05:40 +08:00
devin 887bda1491 lots of change 2012-05-02 17:04:16 +08:00
Christophe Vilayphiou b8cd7097b0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-02 16:27:09 +08:00
Christophe Vilayphiou 2762c24593 Fix wrong variable names in translations 2012-05-02 16:22:06 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
Matthew K. Fu JuYuan de457e7dfc fix broken ad_banner 2012-05-01 18:23:42 +08:00
devin bfc4507696 Connection page design 2012-05-01 18:05:17 +08:00
Matthew K. Fu JuYuan 7a5d3ecae3 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. 2012-05-01 16:05:05 +08:00
Harry Bomrah 769a67f026 the group more structured and also demo connecting with gmail account.. 2012-04-30 21:17:20 +08:00
Matthew K. Fu JuYuan a803309380 clean up useless flash msgs. add i18n vars for app auth and object auth 2012-04-30 15:51:22 +08:00
Harry Bomrah 1b7fb106f8 lot of updates 2012-04-30 14:33:12 +08:00
Harry Bomrah aacd9da9fb auto login encryption done… 2012-04-30 14:29:42 +08:00
Christophe Vilayphiou fe54c6ae71 Fix bug when id or single object 2012-04-30 14:23:41 +08:00
Christophe Vilayphiou bda21baed2 Add missing js 2012-04-30 08:32:54 +08:00
Christophe Vilayphiou 8a99086802 News translation 2012-04-30 08:24:58 +08:00