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

149 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan c57ba305e9 Fix ad_banner 2012-04-24 14:37:06 +08:00
Christophe Vilayphiou c856b4cdce Fix for upload image component in announcement 2012-04-24 12:41:28 +08:00
Christophe Vilayphiou 2eeb530422 Merge branch 'master' into ldap 
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
 2012-04-23 14:13:37 +08:00
Matthew K. Fu JuYuan 8eedbc951e add i18n vars 2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan 1b70852ff7 realtime preview is working. but save to object when preview 2012-04-23 14:06:37 +08:00
Matthew K. Fu JuYuan ff472714de AdBanner i18n vars patch 2012-04-23 14:05:18 +08:00
Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
 2012-04-12 18:50:48 +08:00
Matthew K. Fu JuYuan 1a6242edbd fix ad_banner sidebar 2012-04-05 17:41:43 +08:00
Matthew K. Fu JuYuan d8b20ae993 fix ad_banner sidebar 2012-04-05 11:11:48 +08:00
Matthew K. Fu JuYuan a9988a0d5c Change for interface,form. 2012-04-02 11:00:51 +08:00
nccu a1034f90ba close alpha on nccu 2012-03-20 14:38:01 +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
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +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
Matt Fu 10fd8ce455 Change locales for orbit 2012-02-29 10:48:15 +08:00
Christophe Vilayphiou 4b7b57bb3d Add some missing translations 2012-02-29 04:48:21 +08:00
Christophe Vilayphiou 53ed4b0404 Initial changes in announcement for sorting and filtering 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
Matt Fu 678f1eabef LDAP connection and modified Devise 2012-02-22 14:43:24 +08:00
Christophe Vilayphiou 44a346ffe9 Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
Christophe Vilayphiou 3e70634add Announcement modifications and tags 2012-02-15 00:34:22 +08:00
Christophe Vilayphiou 55ae7de01c Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
Matthew Kaito Juyuan Fu dcc6a53430 brief starting for dashboard,adds i18n vars 2012-02-15 00:34:21 +08:00
Matthew Fu 4ed8a2164c First complete with manager and submanager 2012-01-24 12:28:32 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +08:00
Christophe Vilayphiou fc591ee308 Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
chris2tof a03e9bada8 Add missing translations 2011-11-20 02:14:51 +08:00
chris2tof 861237d65b Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
chris2tof e0e14ddfac Modify purchases list 2011-08-23 16:33:01 +08:00
chris2tof 2842001a3b Update source: pull from git 2011-08-23 15:01:22 +08:00
chris2tof ddc7c74436 Create page. 2011-06-01 10:24:14 +08:00
chris2tof a8c4e17c56 CKEditor. 
Edition of page part for single language.
 2011-05-25 16:27:17 +08:00
chris2tof 24ae7ed5e3 Links edition 2011-05-13 09:08:42 +08:00
chris 25752b7065 tags: image and css - show ID in assets/index 2011-04-13 18:22:52 +08:00
chris 4b4cdbfd31 admin status change 2011-04-13 18:22:50 +08:00
chris e62df90117 user can't delete self and flash_messages 2011-04-13 18:22:50 +08:00
chris 318c264cae add user_info 2011-04-13 18:22:50 +08:00
chris 27bdbadf08 404 for pages and asset column error 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 bebc51e8bb Admin can new/edit user_attributes 2010-03-15 17:35:01 +08:00
Wen-Tien Chang 29ee4585b2 upgrade to rails3, but grip is broken 2010-03-08 16:04:05 +08:00
Wen-Tien Chang 13065aa85a Add devise gem and panel/users controller 2010-03-04 16:33:26 +08:00
Wen-Tien Chang 93169b1098 Add Item list interface, but acts_as_list can not used 2010-02-22 16:10:13 +08:00
Wen-Tien Chang a19e0dba6c Add asset model and controller 2010-02-01 17:24:28 +08:00
Wen-Tien Chang e1440a79d8 Add Item, Page, Component, Link inheritanced models 2010-01-14 18:30:53 +08:00
Wen-Tien Chang 9f1ba2ae66 1.fix parent page 2.add page title 2010-01-08 18:36:36 +08:00
Wen-Tien Chang e6d083acda Add zh_tw locale file 2010-01-08 15:45:13 +08:00
Wen-Tien Chang 40831c1314 init rails 2.3.2 2009-05-08 00:53:18 +08:00