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

80 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 2f500ff460 For non-login user,show no drop down menu and return to home after press orbit button. 2012-05-29 16:33:38 +08:00
Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap 
Conflicts:
	Gemfile
	app/models/ad_banner.rb
 2012-05-15 23:02:22 +08:00
Christophe Vilayphiou e54f4409fb Add impressionist 2012-05-15 21:26:09 +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 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +08:00
Christophe Vilayphiou fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +08:00
Matthew K. Fu JuYuan 7af17f19ac God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 20:26:36 +08:00
Matthew K. Fu JuYuan dbac219c18 now jobs is working 2012-05-08 20:25:11 +08:00
Matthew K. Fu JuYuan f3b58ea36d starting Resque 2012-05-08 20:24:37 +08:00
Matthew K. Fu JuYuan f949523bbb God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan 69f2f6a716 now jobs is working 2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan c28d7d59b6 starting Resque 2012-05-08 20:21:28 +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 d7194dc805 God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 11:41:58 +08:00
Matthew K. Fu JuYuan 5b604037f8 now jobs is working 2012-05-08 11:41:58 +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 7e355b77c2 Merge branch 'ldap' 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/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:31:05 +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 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 f5fd3dec7a Trying nokogiri 2012-03-27 18:42:22 +08:00
nccu a1034f90ba close alpha on nccu 2012-03-20 14:38:01 +08:00
Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	config/application.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-03-19 14:27:15 +08:00
Christophe Vilayphiou b58db48d26 Changes in Gemfile 2012-03-19 14:04:28 +08:00
unknown a755eb184b fix announcement links & files 2012-03-16 16:49:25 +08:00
Christophe Vilayphiou f4fda08e86 Replace PrototypeR4 by Orbit. 
Move session into mongoid_store.
Reset session when sing_in.
 2012-03-16 14:58:32 +08:00
Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap 
Conflicts:
	config/environments/development.rb
 2012-03-01 10:13:49 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +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 7f9a7edc98 Changes in bulletins widget and front-end, add categories to link 2012-02-28 04:24:09 +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 f8d1d7242d Merge branch 'design_team' into dashboard 2012-02-23 16:05:33 +08:00
Christophe Vilayphiou 1a6e497b3d Ika's changes 2012-02-23 15:53:15 +08:00
Matt Fu 678f1eabef LDAP connection and modified Devise 2012-02-22 14:43:24 +08:00
Christophe Vilayphiou c304819d6b Commented out code for Windows 2012-02-20 08:55:21 +08:00
Christophe Vilayphiou cf038183b9 Ika's changes in modules 2012-02-20 08:48:27 +08:00
Christophe Vilayphiou 6b551defce Remove therubyracer, it's already a dependency of execjs 2012-02-15 10:07:41 +08:00
Christophe Vilayphiou 1913f0aca8 Add tinymce 2012-02-15 10:02:05 +08:00
Christophe Vilayphiou a0f58b543b Remove ckeditor 2012-02-15 01:05:24 +08:00
Christophe Vilayphiou c3e57f8bde Put back therubyracer 2012-02-13 17:22:13 +08:00
unknown 964d7b6054 announcement path error 2012-02-13 17:09:37 +08:00
Christophe Vilayphiou c6048ada82 Include therubyracer in Gemfile 2012-02-13 17:09:37 +08:00
Christophe Vilayphiou b8243df5b5 Update gems but stay on rails 3.1 for now 2012-01-24 13:07:40 +08:00
chris2tof 04f51f2d98 Update carrierwave 
#{column}_identifier must be used to get the name of the file
 2012-01-24 11:57:27 +08:00
Christophe Vilayphiou 3e912b6262 Merge branches 'master' and 'exception_notification' into new_announcement_dev 2012-01-16 07:57:40 +08:00
Christophe Vilayphiou a55a93cb3b Add exception notification in development env 2012-01-13 15:49:07 +08:00
unknown ec235bcaa3 merge with master 2012-01-11 20:31:52 +08:00
unknown 9f93af100b merge with master 2012-01-11 20:14:28 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +08:00