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

3249 Commits

Author SHA1 Message Date
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
Christophe Vilayphiou 1146506063 Fix bug when no bulletins or web_links 2012-02-20 15:56:17 +08:00
Christophe Vilayphiou c304819d6b Commented out code for Windows 2012-02-20 08:55:21 +08:00
Christophe Vilayphiou f43646c9b6 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/assets/stylesheets/bootstrap.css.erb
	app/controllers/admin/pages_controller.rb
 2012-02-20 08:52:36 +08:00
Christophe Vilayphiou cf038183b9 Ika's changes in modules 2012-02-20 08:48:27 +08:00
Christophe Vilayphiou 7d57b50e46 Widget for announcement and web_link with ajax reload and pagination 2012-02-20 08:34:36 +08:00
Christophe Vilayphiou 2989366fa4 Merge branches 'new_announcement_dev' and 'new_announcement_dev' of github.com:Rulingcom/orbit into new_announcement_dev 2012-02-20 03:25:36 +08:00
unknown 78a139ff38 update announcement & web_resource widget 2012-02-20 03:24:47 +08:00
Christophe Vilayphiou a3f152b200 Changes for jquery 1.7 (.live -> .on), create module_layout 2012-02-20 03:24:05 +08:00
Christophe Vilayphiou 3ff2e7867e Fix bug when editing home 2012-02-20 03:22:53 +08:00
Christophe Vilayphiou 434e464f17 Ika's changes in modules 2012-02-19 17:43:47 +08:00
Christophe Vilayphiou 44a346ffe9 Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
unknown daebaa43f8 update announcement & web_resource widget 2012-02-17 19:45:48 +08:00
Matt Fu 26cd6951db 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-17 17:50:23 +08:00
Christophe Vilayphiou 0b71714d44 Improve code in items, pages, links 2012-02-17 14:54:11 +08:00
Christophe Vilayphiou cf4a6c0b35 Remove useless destroy methods 2012-02-17 12:26:03 +08:00
Christophe Vilayphiou cbe3ccc6fe Merge branches 'master' and 'design_team' into dashboard 2012-02-17 11:00:29 +08:00
Christophe Vilayphiou 9cd3cbc478 Modifications for design, pages, page_parts… 
Move orbit_bar out of kernel.js
 2012-02-17 02:09:32 +08:00
unknown 5da75161c4 announcemenet & web_resource widget 2012-02-16 17:52:49 +08:00
Matthew Kaito Juyuan Fu 9305c2045c add "all_user" for app&object auth 2012-02-16 14:59:26 +08:00