developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,159 Commits 5 Branches 0 Tags
4e7ff62c2b3f8ea14dcfa879acfa4fa2d49ae436
Commit Graph
99 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Vilayphiou 006b84f6a1 Ray's fix for ie 2012-05-23 12:06:09 +08:00
Christophe Vilayphiou d6b92fc604 Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
Christophe Vilayphiou 874a89d99b Ray's fix for structure side_bar 2012-05-22 16:48:57 +08:00
Christophe Vilayphiou 27cf99462e Fix bug in page and news 2012-05-22 14:42:19 +08:00
Christophe Vilayphiou c4d7079059 Fix's Matt code for not showing bulletins in index 2012-05-21 18:10:03 +08:00
Christophe Vilayphiou aab030efa9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:26:21 +08:00
Christophe Vilayphiou be7ce0bf45 Redmine change's 2012-05-17 06:25:38 +08:00
Christophe Vilayphiou 42881553a8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-15 22:48:40 +08:00
Christophe Vilayphiou 5e9b55e08e Ray took out 'default' tags 2012-05-15 22:47:28 +08:00
Christophe Vilayphiou 01d0c002f5 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/views/admin/pages/_edit.html.erb
	app/views/admin/pages/_form.html.erb
	lib/parsers/parser_back_end.rb
 2012-05-13 23:14:13 +08:00
Christophe Vilayphiou ef2d416c70 Ray's changes for page_edit 2012-05-13 19:36:04 +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
Christophe Vilayphiou ecd21338bc Matt's changes for side_bar 2012-05-10 00:23:42 +08:00
Christophe Vilayphiou 6727f27181 Change for 0509 Nccu check 2012-05-09 16:58:12 +08:00
Christophe Vilayphiou 038378be9a Ray's changes for inccu in orbit_bar 2012-05-09 15:20:09 +08:00
Christophe Vilayphiou 50edfdd02f Changes for tag key in side_bar announcement and news, fix ad_banner css for dot 2012-05-09 14:59:06 +08:00
Christophe Vilayphiou 3a38992f29 Ray's changes for mail_setting i18n 2012-05-09 12:45:27 +08:00
Christophe Vilayphiou 9216f29bc9 Ray's changes for mail settings 2012-05-09 12:19:32 +08:00
Christophe Vilayphiou 909ca19456 Fix bugs in sub_menu 2012-05-09 04:31:04 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +08:00
Christophe Vilayphiou 8d70d87120 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-09 04:13:14 +08:00
Christophe Vilayphiou a186ae08d8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 21:47:03 +08:00
Christophe Vilayphiou 23d2d9a81e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 17:36:35 +08:00
Christophe Vilayphiou d2e07f537a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 17:24:40 +08:00
Christophe Vilayphiou a3868cb785 Ray's changes for front-end banner 2012-05-08 17:21:26 +08:00
Christophe Vilayphiou f534e6ca7b Ray's changes for site_info 2012-05-07 15:55:45 +08:00
Christophe Vilayphiou 3ef81c520e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:16:57 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
Christophe Vilayphiou 851dc72f42 Ray's changes in css and html 2012-04-30 00:17:18 +08:00
Christophe Vilayphiou 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
Christophe Vilayphiou 44ded537b3 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-25 16:28:34 +08:00
Christophe Vilayphiou 65a6f9c416 Ray's css fix for quick edit 2012-04-25 16:26:27 +08:00
Christophe Vilayphiou 291d5e3a03 Ray's changes in css 2012-04-24 16:24:50 +08:00
Christophe Vilayphiou 45c194e870 Ray's changes in css 2012-04-24 15:15:36 +08:00
Christophe Vilayphiou 42aeaead93 Ray's changes, put the js for upload image component in a separate file 2012-04-24 12:15:32 +08:00
Christophe Vilayphiou b80339d704 Ray's changes for image upload component and sign-in page 2012-04-24 11:35:50 +08:00
Christophe Vilayphiou 0c4328987a Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
Christophe Vilayphiou 499930a680 Pull from github 2012-04-23 14:29:55 +08:00
Christophe Vilayphiou 2f279c53ff Apply patch from ldap 2012-04-23 14:04:55 +08:00
Christophe Vilayphiou 72efdbd742 changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
Christophe Vilayphiou f8873267a2 Ray's fix for announcement list 2012-04-12 18:41:14 +08:00
Christophe Vilayphiou 7bca339a5b Ray's fix for columns width in bulletins 2012-04-12 07:01:34 +08:00
Christophe Vilayphiou 253f4bcb54 Ray's changes for orbit bar 2012-04-06 18:06:57 +08:00
Christophe Vilayphiou ef8eb0450b Changes in tinymce bar 2012-04-05 17:28:21 +08:00
Christophe Vilayphiou 7bf50d6c52 Move the audit block to the bottom 2012-04-05 14:08:03 +08:00
Christophe Vilayphiou 1b79400f44 Fix menu for frontend 2012-04-05 14:06:58 +08:00
Christophe Vilayphiou 7e922d8ed4 Fic bug from merge 2012-04-02 10:54:48 +08:00
Christophe Vilayphiou 503f71e554 Ray's changes in tags, css and js 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou f7dafbc0cd Ray's changes in tags, css and js 2012-04-02 02:46:34 +08:00
Christophe Vilayphiou ecc789c248 Add missing load ofr meta folder 2012-04-02 02:45:23 +08:00
Christophe Vilayphiou 32519f308f Fix several bus when there is no design 2012-04-02 02:41:42 +08:00
Christophe Vilayphiou d6e4da6dad Ray's fix for margin-top 2012-03-28 11:31:07 +08:00
Christophe Vilayphiou 649f343e6f Ray's fix for margin-top 2012-03-28 11:17:59 +08:00
Christophe Vilayphiou 50be40f7b3 Ray's changes in announcenment back-end 2012-03-27 19:10:35 +08:00
Christophe Vilayphiou 07ba457dd7 admin now can post without fact check 2012-03-27 18:58:03 +08:00
Christophe Vilayphiou 55d12e50f2 Ray's changes in announcenment back-end 2012-03-27 18:58:03 +08:00
Christophe Vilayphiou 97adf94e15 fix with what ray needs for the fact_check form 2012-03-27 18:56:18 +08:00
Christophe Vilayphiou 436c866a6f admin now can post without fact check 2012-03-27 15:10:29 +08:00
Christophe Vilayphiou 422a49f56c Ray's changes in announcenment back-end 2012-03-27 15:03:00 +08:00
Christophe Vilayphiou 662c8c7a8a fix with what ray needs for the fact_check form 2012-03-23 12:00:48 +08:00
Christophe Vilayphiou 29ec36130e css and js changes 2012-03-16 15:06:45 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +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
Christophe Vilayphiou 1a6e497b3d Ika's changes 2012-02-23 15:53:15 +08:00
Christophe Vilayphiou cf038183b9 Ika's changes in modules 2012-02-20 08:48:27 +08:00
Christophe Vilayphiou 434e464f17 Ika's changes in modules 2012-02-19 17:43:47 +08:00
Christophe Vilayphiou 1f7dae9bee Gemfile and bugs in js for orbit-bar 2012-02-15 00:34:22 +08:00
Christophe Vilayphiou 3f9a041d44 Gemfile and bugs in js for orbit-bar 2012-02-13 13:28:42 +08:00
Christophe Vilayphiou 5518ae362d Ray's modification before redesign 2012-01-24 11:57:27 +08:00
Christophe Vilayphiou 6ee1d71c64 Ray's modification before redesign 2012-01-24 11:38:53 +08:00
Christophe Vilayphiou 75c9851dbc Ray's back-end modifications for sub-roles 2011-12-28 20:57:18 +08:00
Christophe Vilayphiou fc591ee308 Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
Christophe Vilayphiou f774084e9a Back-end standardization 2011-12-10 18:03:32 +08:00
Christophe Vilayphiou c0fbb999e7 Modification of Gemfile for linux 2011-12-05 19:19:05 +08:00
chris 2f9dcf7791 set bson_ext version to 1.2.4 because of 1.3.0 bug install 2011-04-13 18:29:58 +08:00
chris 6db9727829 revert to mongoid 2.0.0 and remove reroute_middleware 2011-04-13 18:29:33 +08:00
chris 106db069fd update radius, modify routes to handle modules, add blog module 2011-04-13 18:28:24 +08:00
chris 0067ac48a5 include Mongoid::Timestamps 2011-04-13 18:22:52 +08:00
chris fa81b04eee fix bug: quotes in html tags 2011-04-13 18:22:52 +08:00
chris 25752b7065 tags: image and css - show ID in assets/index 2011-04-13 18:22:52 +08:00
chris 49e6509a51 update gems 2011-04-13 18:22:52 +08:00
chris 5151449bc9 radius parser for multilingual - dev.rake 2011-04-13 18:22:51 +08:00
chris fc98757772 base layout on id instead of name 2011-04-13 18:22:51 +08:00
chris 6e100d3499 add radius 2011-04-13 18:22:51 +08:00
chris 8d3e11cabe remove radius 2011-04-13 18:22:51 +08:00
chris a953793b15 add radius 2011-04-13 18:22:51 +08:00
chris 8b8eff6920 replace Liquid by Radius 2011-04-13 18:22:51 +08:00
chris 70347d4c34 add missing file 2011-04-13 18:22:51 +08:00
chris 4b4cdbfd31 admin status change 2011-04-13 18:22:50 +08:00
chris e360baadde delete /initializers/mongoid.rb 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 a06aa15721 add files 2011-04-13 18:22:50 +08:00
chris 2ccc2c9b39 add user_info 2011-04-13 18:22:50 +08:00
chris 73b75ec0b6 rescue [] user.active_attributes when nil 2011-04-13 18:22:50 +08:00
chris e6546fdc19 bundle update 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