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

2934 Commits

Author SHA1 Message Date
Matthew Kaito Juyuan Fu d107d54a82 Ad banner close complete,need validation 2012-02-03 15:14:42 +08:00
Matthew Kaito Juyuan Fu f530eb7112 Revert "mistake commit" 
This reverts commit 2608b72d65.
 2012-02-03 14:39:15 +08:00
Matthew Kaito Juyuan Fu 2608b72d65 mistake commit 2012-02-03 14:28:08 +08:00
Matthew Kaito Juyuan Fu 5cebb638ce AdBanner is now working 2012-02-02 09:55:09 +08:00
Christophe Vilayphiou dddd1f33fd Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
verts commit 331d2c28ef.
 2012-02-01 14:38:35 +08:00
Christophe Vilayphiou 6b9a6b99b1 Merge branch 'ad_plugin' of github.com:Rulingcom/orbit into ad_plugin 2012-02-01 14:30:34 +08:00
Christophe Vilayphiou 331d2c28ef Merge branches 'master' and 'ad_plugin' into design_team 2012-02-01 14:28:53 +08:00
Matthew Kaito Juyuan Fu a980847eb3 Basic function for AdBanner 2012-02-01 14:27:51 +08:00
Matthew Fu 3287b68354 Basic function for ad_banner 2012-02-01 14:27:51 +08:00
Matthew Kaito Juyuan Fu dcecb78afb Basic function for AdBanner 2012-01-31 18:31:31 +08:00
Matthew Fu ec428f240c Basic function for ad_banner 2012-01-31 18:23:32 +08:00
Christophe Vilayphiou ccbde122df Fix bugs in design. 
The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly.
 2012-01-31 16:38:25 +08:00
Christophe Vilayphiou 4906894fb5 Page edit wasn't showing when module_app was nil 2012-01-31 16:35:40 +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
Christophe Vilayphiou 46db173e0b Modifications in the Design code: the uploader works but the edit is broken 2012-01-26 12:05:25 +08:00
Christophe Vilayphiou 783eae4597 Change "NewBlog" folders into "new_blog" in assets 
Modify routes and pages handling for clean front-end urls
 2012-01-24 18:16:58 +08:00
Christophe Vilayphiou 6a196c5d3d Embedded to referenced for users 2012-01-24 15:12:06 +08:00
Christophe Vilayphiou 83827f82ec Fix custom image class 2012-01-24 15:11:42 +08:00
Christophe Vilayphiou b8243df5b5 Update gems but stay on rails 3.1 for now 2012-01-24 13:07:40 +08:00
Christophe Vilayphiou 8ce796b667 Merge branch 'fix_it' of github.com:Rulingcom/orbit into fix_it 
Conflicts:
	app/models/module_app.rb
 2012-01-24 12:30:57 +08:00
Matthew Fu afbb9e266a User role and sub_role simple interface complete 2012-01-24 12:28:33 +08:00
Matthew Fu 25cbe0c2a5 update app package for previous commit 2012-01-24 12:28:32 +08:00
Matthew Fu 959f3e8b2f put setup APP var setup into Orbit class 2012-01-24 12:28:32 +08:00
Matthew Fu 4ed8a2164c First complete with manager and submanager 2012-01-24 12:28:32 +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
Matthew Fu 18a82d7f47 Manger and SubManager 2012-01-24 12:28:32 +08:00
Christophe Vilayphiou 5ae8e84b93 Merge branch 'master' of github.com:Rulingcom/orbit 2012-01-24 11:59:30 +08:00
Christophe Vilayphiou 9fcf8280fa Change "_filename" to "_identifier" for carrierwave 2012-01-24 11:57:27 +08:00
Christophe Vilayphiou 5518ae362d Ray's modification before redesign 2012-01-24 11:57:27 +08:00
Christophe Vilayphiou bfd55277d7 Embed attribute_fields and sub_roles 2012-01-24 11:57:27 +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
chris2tof 1bbb197fba Forgot to remove ":remote => true" for asset new 2012-01-24 11:56:08 +08:00
chris2tof b04d845a5a New rss.js from Harry and fix html form for assets 2012-01-24 11:56:08 +08:00
Christophe Vilayphiou 2ed422fbc4 Merge branch 'master' of github.com:Rulingcom/orbit 2012-01-24 11:48:51 +08:00
Christophe Vilayphiou 5f684ba0f4 Change "_filename" to "_identifier" for carrierwave 2012-01-24 11:47:29 +08:00
Christophe Vilayphiou 9ea613cf4e Embed attribute_fields and sub_roles 2012-01-24 11:47:29 +08:00
chris2tof 4d2809d40b Update carrierwave 
#{column}_identifier must be used to get the name of the file
 2012-01-24 11:47:29 +08:00
Christophe Vilayphiou 6ee1d71c64 Ray's modification before redesign 2012-01-24 11:38:53 +08:00
unknown 68ad208777 announcement widget page 2012-01-20 16:36:25 +08:00
unknown 2c8940e350 announcement widget page 2012-01-20 14:04:52 +08:00
Matthew Fu d284e1e26b User role and sub_role simple interface complete 2012-01-19 17:47:52 +08:00
unknown 4cfae9c107 announcement widget query 2012-01-18 21:34:26 +08:00
Matthew Fu f1a3008e2b update app package for previous commit 2012-01-18 12:04:01 +08:00
Matthew Fu 37b8b85554 put setup APP var setup into Orbit class 2012-01-18 11:51:38 +08:00
Matthew Fu 9fa6131ad3 First complete with manager and submanager 2012-01-17 16:20:03 +08:00
Matthew Fu 1dea9ba156 Add methods to work with manager role,add task to build user test data 2012-01-16 18:52:08 +08:00
Christophe Vilayphiou b6eba5ad9d Merge branch 'carrierwave' 2012-01-16 08:14:18 +08:00
Christophe Vilayphiou f86777b617 Embed attribute_fields and sub_roles 2012-01-16 08:14:05 +08:00
Christophe Vilayphiou b4f2354642 Merge branch 'master' into design_team 2012-01-16 08:07:49 +08:00