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

3102 Commits

Author SHA1 Message Date
Matthew Kaito Juyuan Fu 3a8dbd6af4 first commit for object auth,will take new_blog for experiment 2012-02-07 16:16:48 +08:00
Christophe Vilayphiou e26c5529df Include therubyracer in Gemfile 2012-02-07 11:18:54 +08:00
Christophe Vilayphiou 872a00b6a2 Forgot to change title in key in pages_controller 2012-02-06 22:09:33 +08:00
Christophe Vilayphiou 8f885e8bb7 Use key not title for module_app in parser. 
Modify announcement routes.
 2012-02-06 16:58:19 +08:00
Christophe Vilayphiou e02c675595 Put back exception notifications 2012-02-06 16:25:33 +08:00
Christophe Vilayphiou 819a896a4b Merge branch 'new_announcement_dev' of github.com:Rulingcom/orbit into new_announcement_dev 2012-02-06 16:21:32 +08:00
unknown f097f83f2b announcement_category edit 2012-02-06 16:20:51 +08:00
Christophe Vilayphiou 65901edf6f Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-02-06 16:18:15 +08:00
Matthew Kaito Juyuan Fu 8b3b71ca58 fix js bugs,partial bugs 2012-02-06 16:17:07 +08:00
unknown e0409c2c8e Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev 2012-02-06 15:46:17 +08:00
unknown ca735e43ce announcement_category edit 2012-02-06 15:23:27 +08:00
Matthew Kaito Juyuan Fu fff918cd78 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-02-04 10:35:40 +08:00
Matthew Kaito Juyuan Fu ac0b681779 fix js bugs,partial bugs 2012-02-04 10:32:24 +08:00
Christophe Vilayphiou dec2359c3f Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-02-04 09:40:58 +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
Matthew Kaito Juyuan Fu 394099c388 Ad banner close complete,need validation 2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu 68cea1ea49 AdBanner is now working 2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu 2b2b057583 Add rake task for ad_banner. Will have ad_banner at dev:build 2012-02-03 18:02:27 +08:00
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