unknown
|
6f6e84b015
|
fix dashboard & announcement
|
2012-03-16 14:44:57 +08:00 |
Christophe Vilayphiou
|
b6d49df145
|
Change Obit to Orbit
|
2012-03-16 11:54:31 +08:00 |
Matt Fu
|
13b6892f87
|
code for new fact check
|
2012-03-16 11:09:44 +08:00 |
|
Christophe Vilayphiou
|
79c8b3861b
|
Fix link in widget
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
4dd9b7ffa4
|
Fix announcement pagination in front-end
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
0b1f83c042
|
Fix extra loaded js: the widgets only need to render layout when they need js.
|
2012-03-07 18:16:59 +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
|
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 |
|
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
|
b83a783a26
|
Add translation files for Announcement
|
2012-02-29 11:12:34 +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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
unknown
|
5da75161c4
|
announcemenet & web_resource widget
|
2012-02-16 17:52:49 +08:00 |
|
Matthew Kaito Juyuan Fu
|
d2689bc59c
|
fix bugs with token
|
2012-02-16 13:57:28 +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 |