Christophe Vilayphiou
|
5f5871d1c2
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
|
2012-04-05 15:24:39 +08:00 |
unknown
|
d45725cf3b
|
fix announcement & add lang tab
|
2012-04-05 15:23:20 +08:00 |
|
unknown
|
9382ef6ae8
|
Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
|
2012-04-05 15:16:33 +08:00 |
|
Christophe Vilayphiou
|
1259d62249
|
Fix mainTablePosition in js -> remove the notable class
|
2012-04-05 14:55:41 +08:00 |
|
unknown
|
ccb0110b77
|
fix announcement & add lang tab
|
2012-04-05 14:48:31 +08:00 |
Christophe Vilayphiou
|
7bf50d6c52
|
Move the audit block to the bottom
|
2012-04-05 14:08:03 +08:00 |
|
Christophe Vilayphiou
|
9c1c70b598
|
Fix sorting in annoucement
|
2012-04-02 02:55:36 +08:00 |
|
Christophe Vilayphiou
|
503f71e554
|
Ray's changes in tags, css and js
|
2012-04-02 02:55:36 +08:00 |
|
Christophe Vilayphiou
|
6c50aa5243
|
Add pagination to bulletin index and remove ajax to make it simple
|
2012-04-02 02:55:36 +08:00 |
|
Christophe Vilayphiou
|
c645c1b5df
|
Remove extra code in bulletin form
|
2012-03-28 10:51:14 +08:00 |
|
Christophe Vilayphiou
|
172d3d7847
|
Remove bad references to NewBlog
|
2012-03-27 19:42:07 +08:00 |
|
Christophe Vilayphiou
|
212730fd8a
|
Add missing end tag in bulletin _form
|
2012-03-27 19:37:47 +08:00 |
|
Christophe Vilayphiou
|
b587b7ca6b
|
Remove limit(1) to bulletins index action
|
2012-03-27 19:22:50 +08:00 |
|
Christophe Vilayphiou
|
50be40f7b3
|
Ray's changes in announcenment back-end
|
2012-03-27 19:10:35 +08:00 |
Matt Fu
|
1e60acaa11
|
Fact check program completed,Lin checked
|
2012-03-27 19:06:28 +08:00 |
|
Christophe Vilayphiou
|
cf297fc424
|
Changed inherited controller in module_apps to OrbitBackendController
|
2012-03-27 18:58:04 +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 |
|
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +08:00 |
|
Christophe Vilayphiou
|
f9c5ee5d18
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
vendor/built_in_modules/announcement/config/routes.rb
|
2012-03-27 18:37:14 +08:00 |
|
unknown
|
e8d1352890
|
fix announcement
|
2012-03-27 14:29:11 +08:00 |
|
Christophe Vilayphiou
|
33955b4554
|
Delete files with Chinese characters in name
|
2012-03-27 14:21:32 +08:00 |
|
Christophe Vilayphiou
|
c4299245de
|
Delete files with Chinese characters in name
|
2012-03-27 14:19:58 +08:00 |
|
unknown
|
a30bc499c7
|
fix announcement & links
|
2012-03-27 14:19:58 +08:00 |
|
Christophe Vilayphiou
|
7765f0d2e1
|
Delete files with Chinese characters in name
|
2012-03-27 14:17:48 +08:00 |
|
Christophe Vilayphiou
|
74636fb16d
|
Delete file with Chinese character in the name
|
2012-03-27 14:16:04 +08:00 |
|
Christophe Vilayphiou
|
f37eb5bf43
|
Add missing file
|
2012-03-23 18:27:41 +08:00 |
|
unknown
|
42519d9f78
|
fix announcement & links
|
2012-03-23 18:04:11 +08:00 |
|
Christophe Vilayphiou
|
61698f3f2c
|
Remove quick_edit on bulletin index load
|
2012-03-23 17:32:59 +08:00 |
|
Christophe Vilayphiou
|
0e8f8b3424
|
Add missing category when redirect to front-end for bulletin back-end index
|
2012-03-21 12:58:13 +08:00 |
|
Christophe Vilayphiou
|
3aa7c5120d
|
Put tinymce in its own js file.
To use on a text area just add the class "tinymce_textarea".
|
2012-03-21 12:41:32 +08:00 |
|
Christophe Vilayphiou
|
5d7202af8b
|
Modify bulletin back-end index to show announcement in front-end
|
2012-03-21 12:37:52 +08:00 |
|
Christophe Vilayphiou
|
c4d541d3b9
|
Remove code from back_end/bulletins/show
|
2012-03-21 12:36:52 +08:00 |
|
Matt Fu
|
6700114955
|
after merge
|
2012-03-19 10:55:58 +08:00 |
|
Matt Fu
|
9c8b0235b0
|
add new files
|
2012-03-19 10:55:58 +08:00 |
|
unknown
|
a755eb184b
|
fix announcement links & files
|
2012-03-16 16:49:25 +08:00 |
|
unknown
|
7d553acaec
|
fix announcement link & files
|
2012-03-16 15:53:57 +08:00 |
|
Christophe Vilayphiou
|
785ead5209
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
|
2012-03-16 14:55:21 +08:00 |
|
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 |
|
unknown
|
00ab773942
|
fix dashboard & announcement
|
2012-03-14 20:05:03 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
Matthew Kaito Juyuan Fu
|
5640e07733
|
First version for App and Object auth.Taking Announcement as experiment
|
2012-02-15 18:20:44 +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
|
1913f0aca8
|
Add tinymce
|
2012-02-15 10:02:05 +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
|
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
|
17caa7cb1b
|
Exp with object_auth
|
2012-02-13 17:33:48 +08:00 |
|
unknown
|
70c97bc065
|
edit announcement widget
|
2012-02-13 17:09:38 +08:00 |
|
Christophe Vilayphiou
|
088bbe1853
|
Change announcement route
|
2012-02-13 17:09:37 +08:00 |
|
unknown
|
964d7b6054
|
announcement path error
|
2012-02-13 17:09:37 +08:00 |
|
Christophe Vilayphiou
|
e638c1c7c3
|
Change announcement route
|
2012-02-09 15:07:43 +08:00 |
|
unknown
|
338d18e909
|
announcement path error
|
2012-02-09 14:58:59 +08:00 |
|
Christophe Vilayphiou
|
8f885e8bb7
|
Use key not title for module_app in parser.
Modify announcement routes.
|
2012-02-06 16:58:19 +08:00 |
|
unknown
|
f097f83f2b
|
announcement_category edit
|
2012-02-06 16:20:51 +08:00 |
|
Matthew Fu
|
3287b68354
|
Basic function for ad_banner
|
2012-02-01 14:27:51 +08:00 |
|
Christophe Vilayphiou
|
762c2f5e8a
|
Add key in module_app.rb to use instead of title for authorization
|
2012-01-30 18:12:18 +08:00 |
|
unknown
|
68ad208777
|
announcement widget page
|
2012-01-20 16:36:25 +08:00 |
|
unknown
|
2c8940e350
|
announcement widget page
|
2012-01-20 14:04:52 +08:00 |
|
unknown
|
4cfae9c107
|
announcement widget query
|
2012-01-18 21:34:26 +08:00 |
|
unknown
|
7e7fc69a37
|
add announcemet search & set top
|
2012-01-13 19:15:03 +08:00 |
|
unknown
|
4b838b5ef5
|
edit announcement upload & show
|
2012-01-12 18:38:50 +08:00 |
|
unknown
|
ec235bcaa3
|
merge with master
|
2012-01-11 20:31:52 +08:00 |