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

86 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 3f744dab05 First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued 2012-05-15 18:55:16 +08:00
Matthew K. Fu JuYuan b23b5e8ec5 Object auth for ad_banner 2012-05-15 16:39:23 +08:00
Matthew K. Fu JuYuan 0a9f0bcc45 starting ad_banner auth 2012-05-15 09:57:05 +08:00
Matthew K. Fu JuYuan 2cd67356a5 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509 
Conflicts:
	config/locales/zh_tw.yml
 2012-05-14 12:36:09 +08:00
Matthew K. Fu JuYuan e1450ec748 Change to apply page to had object_auth 2012-05-14 12:34:15 +08:00
Matthew K. Fu JuYuan 0119ab1a74 New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
Christophe Vilayphiou 82fa85def8 Clean the parsers code 2012-05-13 19:32:05 +08:00
Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/helpers/admin/item_helper.rb
 2012-05-11 18:09:34 +08:00
Christophe Vilayphiou 076f5ad6ef Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +08:00
Matthew K. Fu JuYuan 20a1a6e30f New Interface for App Auth and Object Auth 2012-05-11 16:44:40 +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 b6aad17681 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 14:16:37 +08:00
Matthew K. Fu JuYuan 87ebcc48e7 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 11:51:44 +08:00
Christophe Vilayphiou 2b03263fb7 Dashboard partial implementation 2012-05-09 05:53:07 +08:00
Christophe Vilayphiou a3868cb785 Ray's changes for front-end banner 2012-05-08 17:21:26 +08:00
Christophe Vilayphiou 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/views/admin/sites/site_info.html.erb
 2012-05-07 16:08:05 +08:00
Christophe Vilayphiou f534e6ca7b Ray's changes for site_info 2012-05-07 15:55:45 +08:00
Christophe Vilayphiou 8b61314cc4 Add i18n for site_info. 
Add always display site title.
Changes for menu in front-end
 2012-05-07 15:11:43 +08:00
Christophe Vilayphiou 1fb6c20b86 Add site_info 2012-05-07 00:54:18 +08:00
Christophe Vilayphiou 48f8fbde7f Fix site_locale_default_head and active for current locale 2012-05-07 00:53:52 +08:00
Christophe Vilayphiou ce1fecaf93 Add position ordering and hiding page for i18n 2012-05-06 00:35:13 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Christophe Vilayphiou 555aa088d9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:23:45 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Christophe Vilayphiou 15bc4d4268 Fix merge error 2012-05-04 16:12:28 +08:00
Matthew K. Fu JuYuan bff3cefbc7 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan 05ded8de03 Fix for NCCU 0430 all functions ok with two submanagers but different behavors 2012-05-04 15:38:18 +08:00
Christophe Vilayphiou b8f52fa1ec Separate announcement and news 2012-04-30 06:31:46 +08:00
Christophe Vilayphiou 63ee8eaca9 Remove url from sorting 
Add sorting_options to params in filters
 2012-04-30 06:30:52 +08:00
Christophe Vilayphiou 32faef0c70 DRY code for sorting 2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan a46a8898d7 Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen 2012-04-30 00:24:11 +08:00
Christophe Vilayphiou 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
Christophe Vilayphiou 6bf4c60d45 Changes for js and ccs load for site's pages 2012-04-26 01:49:02 +08:00
Christophe Vilayphiou 6f1eb97ace Fix for structure js and css 2012-04-25 18:41:38 +08:00
Christophe Vilayphiou 573c19ff4b Remove .erb when including css 2012-04-25 15:44:44 +08:00
Christophe Vilayphiou 834cbe3a11 Fix side_bar for tags 
Modules needs to use the fullpath for active or visible in tags
 2012-04-23 16:12:07 +08:00
Christophe Vilayphiou 72efdbd742 changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
Christophe Vilayphiou 6728c35023 Fix side_bar. 
In the case of tags, take the uri instead of controller name
 2012-04-12 18:14:00 +08:00
Matthew K. Fu JuYuan b54578ce1e ad banner preview 2012-04-12 07:14:06 +08:00
Christophe Vilayphiou 486845460c Filter and delete for bulletins 2012-04-12 06:50:36 +08:00
Christophe Vilayphiou 253f4bcb54 Ray's changes for orbit bar 2012-04-06 18:06:57 +08:00
Matthew K. Fu JuYuan 8f28d45379 The new AdBanner. 2012-04-02 03:04:38 +08:00
Christophe Vilayphiou 503f71e554 Ray's changes in tags, css and js 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou f5fd3dec7a Trying nokogiri 2012-03-27 18:42:22 +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
Christophe Vilayphiou 9aa4173933 Change orbit-bar for language but bug when user name is too long 2012-02-29 04:21:56 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou 63d7810b35 Add isotope, categories for announcement page, sort for announcement 2012-02-23 15:52:58 +08:00
Christophe Vilayphiou 53ed4b0404 Initial changes in announcement for sorting and filtering 2012-02-23 15:51:33 +08:00