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

768 Commits

Author SHA1 Message Date
Christophe Vilayphiou ebf3a2eae4 Fix extra loaded js: the widgets only need to render layout when they need js. 2012-03-01 10:57:13 +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 7c55f6fb88 Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth 
Conflicts:
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.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/announcement/app/models/bulletin.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
	vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
 2012-02-29 19:03:29 +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 8932615f05 add "all_user" for app&object auth 2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu 2e58c63ff7 fix bugs with token 2012-02-29 18:56:42 +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
Matthew Kaito Juyuan Fu 3bcd7ea349 Exp with object_auth 2012-02-29 18:50:23 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00
Matt Fu 819f815023 for different database for demo 2012-02-29 13:15:25 +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 5223a7a3e9 Css and js changes 2012-02-29 12:45:47 +08:00
Matt Fu b84b7bad63 ldap config for 0229 nccu demo 2012-02-29 12:35:54 +08:00
Christophe Vilayphiou 0a23ce7b24 Add missing i18n for announcement 2012-02-29 12:00:16 +08:00
Matt Fu 438dc0ad3d i18n vars for announcement 2012-02-29 11:54:48 +08:00
Matt Fu ccb61fc2dd change Search bar 2012-02-29 11:29:13 +08:00
Matt Fu b83a783a26 Add translation files for Announcement 2012-02-29 11:12:34 +08:00
Matt Fu 10fd8ce455 Change locales for orbit 2012-02-29 10:48:15 +08:00
Christophe Vilayphiou 0fa5c3ba9d Fix bug in orbit-bar 2012-02-29 04:56:52 +08:00
Christophe Vilayphiou 344ec86c57 Remove class 'error' in devise forms 2012-02-29 04:56:32 +08:00
Christophe Vilayphiou 4b7b57bb3d Add some missing translations 2012-02-29 04:48:21 +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 18617850e5 Add categories for all the widgets 2012-02-28 22:00:05 +08:00
Christophe Vilayphiou 6a30b0a1e4 Add RSS event 2012-02-28 18:29:13 +08:00
Christophe Vilayphiou fdf4cfad2d Add category for announcement widget 2012-02-28 14:08:57 +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 81bb3120ca Merge branches 'new_announcement_dev' and 'design_team' into dashboard 2012-02-27 18:57:56 +08:00
Christophe Vilayphiou 3adfeb91a6 Merge branches 'design_team' and 'dashboard' into new_announcement_dev 2012-02-27 18:57:07 +08:00
Christophe Vilayphiou fe4c0986e7 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	Gemfile.lock
	app/controllers/admin/pages_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
 2012-02-27 18:56:15 +08:00
Christophe Vilayphiou 0029ef2b5a Fix bug due to image_filename -> image_identifier 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou 680b28023a Fix ad_banner loading 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou 70b4c83cf5 Fix bugs and changes for nccu 2012-02-24 19:11:51 +08:00
Matt Fu 3209f9aa27 Complete for 229 check. 2012-02-24 19:07:47 +08:00
Christophe Vilayphiou f4d663c67d Temporary changes for announcement form 2012-02-24 15:35:21 +08:00
Christophe Vilayphiou dcc64a20d2 Finish sorting for announcements 2012-02-24 15:30:49 +08:00
Christophe Vilayphiou 8f531a6fe5 Fix bus for pages and page content 2012-02-24 15:14:23 +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
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
Christophe Vilayphiou 22d9741ac8 Fix for orbit_bar 2012-02-23 15:51:33 +08:00
Christophe Vilayphiou ba4d71a026 Changes in orbit_bar and js in announcements 2012-02-23 15:51:33 +08:00
Christophe Vilayphiou 48d94d5e15 Fix bug widget when no bulletins or web_links, put link in bulletins 2012-02-23 15:50:30 +08:00
Christophe Vilayphiou ad27537cf7 Change pagination in bulletins 2012-02-23 15:50:30 +08:00
unknown 20c320961f edit page_content 2012-02-23 15:13:36 +08:00
Matt Fu 678f1eabef LDAP connection and modified Devise 2012-02-22 14:43:24 +08:00
unknown 9b001aa6c3 new page_content app 2012-02-21 19:22:42 +08:00
unknown b0834c0c62 Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev 
Conflicts:
	app/views/layouts/module_widget.html.erb
 2012-02-20 16:25:29 +08:00
unknown e82fd405c9 remove bulletins_list 2012-02-20 16:23:54 +08:00