Commit Graph

158 Commits

Author SHA1 Message Date
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
chris2tof 43d87ecf98 Destroy user_attributes and attribute_values when a user is destroyed 2011-05-02 13:23:39 +08:00
chris2tof 83bbd77d96 Built-in user_attribute_models 2011-05-02 12:07:31 +08:00
ihower 4ed6e8090e Remove useless rspec.rake 2011-04-13 19:19:40 +08:00
chris 5151449bc9 radius parser for multilingual - dev.rake 2011-04-13 18:22:51 +08:00
chris bda67684bd mongoid rc_6 & fix bugs 2011-04-13 18:22:49 +08:00
ihower 19a7d51e60 Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
Wen-Tien Chang 554aa0a95d Support i18n and select options user attributes, but admin edit is broken 2010-03-18 17:57:26 +08:00
Wen-Tien Chang a40b117fbe add rough user attributes API 2010-03-08 17:14:59 +08:00
Wen-Tien Chang 9f1de1b543 Add UserAttribute model, suppose it will store user model want to use which attribute group 2010-03-04 17:11:18 +08:00
Wen-Tien Chang 13065aa85a Add devise gem and panel/users controller 2010-03-04 16:33:26 +08:00
Wen-Tien Chang e2a6d9fe0d Add locale link in template 2010-03-01 14:57:21 +08:00
Wen-Tien Chang 3d6446041b handle destroy layout 2010-02-05 16:59:41 +08:00
Wen-Tien Chang aab1199aee Add rake dev:build for pages 2010-01-18 16:23:33 +08:00
Wen-Tien Chang 736eda103a Add rspec files 2010-01-04 16:08:50 +08:00