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

1628 Commits

Author SHA1 Message Date
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
Matthew Kaito Juyuan Fu d2689bc59c fix bugs with token 2012-02-16 13:57:28 +08:00
Christophe Vilayphiou e61aa6b210 Modify dev.rake to create the ModuleApp object for web_recsource 2012-02-16 13:28:51 +08:00
Christophe Vilayphiou 4389f0cf28 Add new created files to previous commit 2012-02-16 13:09:09 +08:00
Christophe Vilayphiou e0accbecaa Changes into page_part edition. 
Can choose between 'text', 'public_r_tag' and 'widget'
 2012-02-16 13:09:09 +08:00
unknown 7ea1745f73 items error 2012-02-16 11:30:54 +08:00
Matthew Kaito Juyuan Fu 5640e07733 First version for App and Object auth.Taking Announcement as experiment 2012-02-15 18:20:44 +08:00
Christophe Vilayphiou 4d361857cb Fix tags in web_resource 2012-02-15 15:47:05 +08:00
unknown edf236c1c7 edit tags 2012-02-15 15:38:27 +08:00
Christophe Vilayphiou af3a2547e1 Change ModuleAppTag into "Module name"Tag. 2012-02-15 15:18:11 +08:00
Christophe Vilayphiou d0c2856a3a Fix relations error in tags 2012-02-15 11:42:19 +08:00
unknown 778a85ca2b add tags 2012-02-15 10:37:07 +08:00
Christophe Vilayphiou 6b551defce Remove therubyracer, it's already a dependency of execjs 2012-02-15 10:07:41 +08:00
Christophe Vilayphiou 1913f0aca8 Add tinymce 2012-02-15 10:02:05 +08:00
Christophe Vilayphiou a0f58b543b Remove ckeditor 2012-02-15 01:05:24 +08:00
Christophe Vilayphiou a2d2e7cc3f Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	app/assets/javascripts/orbit-1.0.js
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
 2012-02-15 00:42:29 +08:00
Christophe Vilayphiou 3e70634add Announcement modifications and tags 2012-02-15 00:34:22 +08:00
Christophe Vilayphiou f57e9f19f7 Changes for multiple i18n_variable in bulletin 2012-02-15 00:34:22 +08:00
Christophe Vilayphiou 1f7dae9bee Gemfile and bugs in js for orbit-bar 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 Kaito Juyuan Fu 8ef2d4b02e include ad_banner query code. cleaned up parser 2012-02-15 00:34:21 +08:00