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

164 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 6dfe10040b fix object auth without app_auth 2012-10-16 14:23:44 +08:00
Matthew K. Fu JuYuan d027cf8e6a add new data from NCCU 2012-10-09 14:40:28 +08:00
Matthew K. Fu JuYuan 9f825de288 user new interface 70% 2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan 89b1aace8a fix for rescue job failed on 171 2012-10-08 16:42:49 +08:00
Matthew K. Fu JuYuan 4a5fc47c0a NCCU maintenance rake task 2012-10-08 10:35:11 +08:00
Matthew K. Fu JuYuan 54b874b2c9 fix nccu login 2012-09-25 15:07:07 +08:00
Matthew K. Fu JuYuan 87e2510d02 add rake task for rebuild index 2012-09-24 18:46:38 +08:00
Matthew K. Fu JuYuan 19db9d0037 basic function 2012-09-17 13:32:52 +08:00
Matthew K. Fu JuYuan df6c7afd68 add data_migration for rename field for attribute_field. not yet tested 2012-09-14 00:02:22 +08:00
Matthew K. Fu JuYuan 5fb94f644d break down Ray's HTML 2012-09-14 00:02:22 +08:00
Christophe Vilayphiou 0a3a140b18 Fix migration bug 2012-09-11 16:32:20 +08:00
Christophe Vilayphiou 73e48aebc6 Change news subtitle to textarea, no tinymce 2012-09-11 15:40:27 +08:00
Matthew K. Fu JuYuan e8317e0a4b 1.Remove category column when category is specified 
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
 2012-08-08 14:46:08 +08:00
Matthew K. Fu JuYuan 06919e76ed fix approval at news and announcement for abnormal flags that causing search result fault. 2012-08-08 11:01:50 +08:00
Matthew K. Fu JuYuan 1cdc0e24bd First version of Solr search. 2012-08-08 10:59:55 +08:00
Matthew K. Fu JuYuan acebec8904 don't dislay web links if no eng. lists in widget is now sorted. 2012-08-01 15:24:55 +08:00
Christophe Vilayphiou f092aff9e9 Fix for data_migration but there's still a bug with red is, the red is code has to be commented out to run the rake task 2012-08-01 02:43:06 +08:00
Christophe Vilayphiou c951cc6b6f Fix for data_migration 2012-08-01 00:58:59 +08:00
Matthew K. Fu JuYuan b989f458d3 Do not show news/anc if no context. 2012-07-31 18:22:40 +08:00
Matthew K. Fu JuYuan 7e3b59c09a finished tag clouds 2012-07-31 11:57:32 +08:00
Matthew K. Fu JuYuan f76b1c02b5 first version of mid_site_sync for new i18n var 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou ad3ec43a00 Remove comments in migrate task 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 804695749d Fix bugs after removal of i18n_variable 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 49dd3a1770 Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 327996a7b0 Task part for i18n_variable removal for web_resource 2012-07-27 19:12:59 +08:00
Christophe Vilayphiou 207b0c5886 Remove i18n_variable for web_resource 2012-07-27 19:12:59 +08:00
Christophe Vilayphiou 50813eb57d Remove i18n_variable for page_content 2012-07-27 19:12:59 +08:00
Christophe Vilayphiou 61c1af7316 Remove i18n_variable for news 2012-07-27 19:12:58 +08:00
Christophe Vilayphiou e2ebd48b22 Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan 7c3cc30784 fix for rake encoding 2012-07-26 16:58:17 +08:00
Matthew K. Fu JuYuan 30cc3431b9 rename sub roles 2012-07-26 14:12:52 +08:00
Matthew K. Fu JuYuan 397b444390 fix for bugs 2012-07-24 20:58:34 +08:00
Matthew K. Fu JuYuan 834fcddc52 Add data migration for search widget for news and announcement. 2012-07-20 16:30:43 +08:00
Matthew K. Fu JuYuan f9bdb4a327 New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
Matthew K. Fu JuYuan 4daf36908c working cache 2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan edef51d58c DM for archive bulletin categroy 2012-07-04 17:56:51 +08:00
Matthew K. Fu JuYuan 4fe92b844e Add sorting order for NCCU request 2012-07-03 15:47:28 +08:00
Matthew K. Fu JuYuan 4014f8ee47 fix over queue at resque 2012-07-03 10:51:26 +08:00
Matthew K. Fu JuYuan 3480fa2545 Fix login and label. Check sync jobs and update info function. 2012-05-24 17:01:00 +08:00
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Matthew K. Fu JuYuan 77deffb512 Nccu calendar and daily job. 2012-05-15 14:03:54 +08:00
Matthew K. Fu JuYuan 551e1ef740 Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly. 2012-05-15 11:28:24 +08:00
Christophe Vilayphiou 1ecdb91778 Merge branch 'design_team' into ldap 2012-05-14 09:31:44 +08:00
Christophe Vilayphiou f0dd1eb871 Fix designs.rake 2012-05-14 09:30:49 +08:00
Christophe Vilayphiou 9837f8eae7 Merge branch 'design_team' into ldap 2012-05-14 09:07:36 +08:00
Christophe Vilayphiou 33e3821e61 Rake task to change design_ids 2012-05-14 08:59:53 +08:00
Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap 
Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json
 2012-05-14 00:57:17 +08:00
Christophe Vilayphiou 17b486f9e9 Fix bugs for shift_to and change items.rake for the missing position in db 2012-05-11 17:56:26 +08:00
Christophe Vilayphiou 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +08:00
Matthew K. Fu JuYuan c28d7d59b6 starting Resque 2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan 083963af65 Test version for DB sync schedule job 2012-05-08 19:20:53 +08:00
Christophe Vilayphiou 65a0998080 Merge branch 'jobs_and_mail' into ldap 
Conflicts:
	config/environments/development.rb
	config/routes.rb
 2012-05-08 11:45:34 +08:00
Matthew K. Fu JuYuan 7339d1ee4a starting Resque 2012-05-08 11:41:58 +08:00
nccu fe9032787c NCCU ldap debug 2012-04-23 10:13:44 +08:00
Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit 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
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
 2012-04-19 14:06:00 +08:00
Christophe Vilayphiou 717e50a25e Add rake task for layout with nokogiri 2012-03-27 19:00:03 +08:00
Matt Fu 13b6892f87 code for new fact check 2012-03-16 11:09:44 +08:00
Matt Fu d5a2de5476 LDAP with sync rake task 2012-03-06 16:41:06 +08:00
Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap 
Conflicts:
	config/environments/development.rb
 2012-03-01 10:13:49 +08:00
Matt Fu cceb785a8d change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
Matthew Kaito Juyuan Fu cc550c5745 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine 
Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb
 2012-02-29 13:07:21 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Matt Fu 3209f9aa27 Complete for 229 check. 2012-02-24 19:07:47 +08:00
Christophe Vilayphiou 9cd3cbc478 Modifications for design, pages, page_parts… 
Move orbit_bar out of kernel.js
 2012-02-17 02:09:32 +08:00
Christophe Vilayphiou e61aa6b210 Modify dev.rake to create the ModuleApp object for web_recsource 2012-02-16 13:28:51 +08:00
Christophe Vilayphiou e0accbecaa Changes into page_part edition. 
Can choose between 'text', 'public_r_tag' and 'widget'
 2012-02-16 13:09:09 +08:00
Matthew Kaito Juyuan Fu 0af37c0688 Add rake task for ad_banner. Will have ad_banner at dev:build 2012-02-04 09:37:23 +08:00
Christophe Vilayphiou 762c2f5e8a Add key in module_app.rb to use instead of title for authorization 2012-01-30 18:12:18 +08:00
Christophe Vilayphiou 7f999f20ab Modify rake.dev for new design structure 2012-01-30 15:45:55 +08:00
Matthew Fu 4df8ab6cc3 Add methods to work with manager role,add task to build user test data 2012-01-24 12:28:32 +08:00
Christophe Vilayphiou 5518ae362d Ray's modification before redesign 2012-01-24 11:57:27 +08:00
Matthew Fu cae3daa9c4 Change NewBlog to new_blog 2012-01-10 18:29:11 +08:00
chris2tof d465febca7 merge with november_presentation 2011-12-22 15:43:38 +08:00
chris2tof 708a174345 Remove radius from plugins, put it in Gemfile 2011-12-22 11:27:37 +08:00
chris2tof a09f8e4551 merge with november_presentation 2011-12-20 16:47:17 +08:00
chris2tof afbffe37d5 Users can now be saved with sub_roles 2011-12-20 14:35:28 +08:00
chris2tof d27d7a623c Changes for sub_roles 
Issues: update doesn't create new i18n_variables, role form has bugs
 2011-12-18 10:07:42 +08:00
chris2tof b7ac5478b4 Change role structure 
Still needs to: change the views and create sub_roles in the dev.rake
 2011-12-10 18:12:39 +08:00
chris2tof b68f5e11e5 Final modifications for the presentation 2011-11-22 18:54:10 +08:00
chris2tof 66bc0ce560 Modified dev.rake 2011-11-20 03:16:35 +08:00
chris2tof dac6348402 Integration of module_app workflow 2011-11-19 14:33:26 +08:00
chris2tof 65349796d0 Ray's modifications 2011-11-18 16:43:14 +08:00
Matthew Kaito Juyuan Fu 0e252cf93c APP fronted showing 2011-10-20 15:29:54 +08:00
chris2tof f2e3cb00db Fix bug when editing a page, the theme wasn't including blank 2011-09-13 14:03:03 +08:00
chris2tof 4db88282a1 Modification in Design structure_css -> default_css 2011-09-13 11:57:20 +08:00
chris2tof 0956e9784a Fix bug in layout, parser and change lib/fraisier 2011-09-07 11:53:16 +08:00
chris2tof f4b1d1e182 Modifications in Layout 
In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch)
 2011-09-05 01:14:49 +08:00
chris2tof 27d47215e9 Modify edit page. Still need to handle "form" with drop down lists 2011-08-24 02:34:24 +08:00
chris2tof 1d214bedec Revert "Revert "Clean code and add 'name' in theme.rb"" 
This reverts commit 00813c9060.
 2011-08-24 02:06:27 +08:00
chris2tof 00813c9060 Revert "Clean code and add 'name' in theme.rb" 
This reverts commit 608180646b.
 2011-08-24 02:04:54 +08:00
chris2tof 608180646b Clean code and add 'name' in theme.rb 2011-08-24 01:39:28 +08:00
chris2tof 7a4ad240a8 Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +08:00
chris2tof 86443661e9 Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
Kaito 1839269581 finishing saving edited file online and redo dev.rake modification 2011-07-28 18:08:16 +08:00
chris2tof dda4b30d67 Set editable parts 2011-06-01 15:49:55 +08:00
chris2tof ddc7c74436 Create page. 2011-06-01 10:24:14 +08:00
chris2tof 2522cde2f5 Edition of page part for multiple languages. 2011-05-27 11:27:54 +08:00
chris2tof 3d97c5bfda Modification of the page model 2011-05-18 10:00:00 +08:00
chris2tof d9ba76ebd5 - No more Home object 
- Sitemap on the left side and view of the current page in the main block
 2011-05-09 18:49:57 +08:00