c314745545
add link of title
2012-11-05 11:42:50 +08:00
e4de1e34a2
add announcement plugin
2012-11-05 11:42:50 +08:00
9433d59c04
relpace tab with sapce
2012-11-05 11:42:49 +08:00
ed3644fb89
done journal
2012-11-05 11:42:49 +08:00
a5e2c3e0ce
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
2012-11-05 11:41:48 +08:00
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
228d43d0e2
calendar update
2012-11-05 11:40:11 +08:00
6dd9f441ef
Agenda View
2012-11-05 11:40:11 +08:00
d070c70512
calendar agenda view update
2012-11-05 11:40:11 +08:00
513671e498
lot of updates
2012-11-05 11:34:35 +08:00
fe0e49c3e9
Remove a folder in wich Chinese characters
2012-11-04 20:32:54 +08:00
bd17641d18
member plugin list add new
2012-11-04 20:24:36 +08:00
2f61b3e0c9
member plugin list add new
2012-11-02 18:28:23 +08:00
9bf812b8d9
calendar "edit calendar" update
2012-11-01 15:21:42 +08:00
d904163090
Merge branch 'gallery_orbit' into desktop_devin
2012-11-01 10:47:23 +08:00
a25199d33b
Calander view updated...
2012-11-01 10:45:22 +08:00
451d73897b
Fix bugs:
...
Page content: after edit and redirect to index, there's a gap between the headers and the first row
TinyMCE: the size of the textarea change depending on the language
2012-11-01 09:30:12 +08:00
167c993108
calendar update
2012-10-30 17:26:52 +08:00
63a57682e6
Fix bugs:
...
TinyMCE: the size of the textarea change depending on the language
Page content edit: no tab selected on first load
2012-10-30 17:09:00 +08:00
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +08:00
5da35ee65b
Agenda View
2012-10-29 19:52:34 +08:00
65ac6980c4
Merge branch 'various_bugs' into nccu_master
...
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.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/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
b73981b19a
Devin commit
2012-10-29 10:17:49 +08:00
12b7618cc7
calendar agenda view update
2012-10-27 00:11:26 +08:00
5e25cf5849
lot of updates
2012-10-26 19:04:51 +08:00
579c7b5e81
Add missing helper
2012-10-26 11:19:56 +08:00
cbfa659928
Changes for side_bar
2012-10-26 11:19:56 +08:00
a5722af315
Calendar updates for day view
2012-10-26 11:15:37 +08:00
8c6e5deb64
gallery update
...
please don't forget to add translation in other language
2012-10-26 11:15:37 +08:00
79e0b8e383
week view updates
2012-10-26 11:15:37 +08:00
98ef582e17
shit calendar update
2012-10-26 11:15:37 +08:00
c29955d9e3
external commit
2012-10-26 11:15:37 +08:00
d7e8663c1d
calendar updated for week
2012-10-26 11:15:36 +08:00
6b8255f8f8
Remove a folder in wich Chinese characters
2012-10-26 11:14:13 +08:00
974849b85a
Merge branch 'gallery_orbit' into desktop_devin
2012-10-24 19:11:12 +08:00
f4eb95881f
Calendar updates for day view
2012-10-24 18:55:06 +08:00
8c63be5c33
gallery update
...
please don't forget to add translation in other language
2012-10-24 09:47:09 +08:00
a810312da4
week view updates
2012-10-18 22:21:13 +08:00
976114cfa9
Add missing helper
2012-10-18 18:50:46 +08:00
47df69f8cf
shit calendar update
2012-10-17 17:35:30 +08:00
6113b9c46c
external commit
2012-10-16 21:52:10 +08:00
0971e00511
calendar updated for week
2012-10-16 21:51:06 +08:00
0babd5f302
Changes for side_bar
2012-10-15 15:30:48 +08:00
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
f76253f512
Week View changes
2012-10-09 06:42:00 +08:00
bb626470e7
week view updates
2012-10-09 06:42:00 +08:00
022d28e5e7
change in algo of event generation plus now multi week events enabled
2012-10-09 06:42:00 +08:00
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
a4c94c4404
demo site plugin
2012-10-08 16:20:21 +08:00
0663e43be7
fix for web_resource tool bar
2012-10-08 16:02:33 +08:00
ae48ab5cbd
clean commit
2012-10-04 15:53:42 +08:00
b0cdcbecca
fix preview bug only happen when production
2012-10-01 21:05:16 +08:00
b65d785834
harry's fix, announcement still broken
2012-10-01 17:21:23 +08:00
edcef5a8f7
make manager's news and announcement can be shown at once it be submitted.
2012-10-01 16:11:58 +08:00
dc8ca7e575
fix i18n.file upload failed
2012-09-27 13:34:40 +08:00
7a523281c3
fix announcement
2012-09-25 09:52:13 +08:00
5634e87144
fix announcement block
2012-09-24 18:43:43 +08:00
78a01f5d29
fix for 0924
2012-09-24 18:30:19 +08:00
5f63af4e77
fix for search news,needs to applied to announcement,also need to fix some translation
2012-09-24 18:10:48 +08:00
029c84328d
code that can not run on matt's air
2012-09-24 15:37:28 +08:00
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
e5fa86c24a
fix i18n for search field
2012-09-24 12:25:43 +08:00
7ca0d2a62b
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-09-24 12:20:59 +08:00
136fc68cdc
nccu data task
2012-09-24 12:18:40 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
b4ff5cea05
Merge branch 'yml' of github.com:Rulingcom/NCCU into yml
...
Conflicts:
app/helpers/admin/item_helper.rb
app/views/admin/ad_banners/_ad_banner_tab.html.erb
app/views/admin/assets/edit.html.erb
app/views/admin/assets/file_upload.html.erb
app/views/admin/assets/new.html.erb
app/views/admin/attributes/index.html.erb
app/views/admin/object_auths_new_interface/setting.html.erb
app/views/admin/page_parts/_edit.html.erb
app/views/layouts/_side_bar.html.erb
app/views/shared/_privilege_user.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/edit.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/new.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb
vendor/built_in_modules/news/config/locales/en.yml
vendor/built_in_modules/news/config/locales/zh_tw.yml
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
2012-09-24 09:19:19 +08:00
c846a102ff
Page by page changes for i18n yml
2012-09-24 09:06:44 +08:00
4fb35b00f2
Add missing translations
2012-09-24 09:02:46 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
a04e1fd10b
Hot or top for news home banner
2012-09-24 08:43:10 +08:00
88d562450a
Fix home banner for hot news
2012-09-21 15:34:18 +08:00
a32027b64b
ray's fix
2012-09-19 16:34:43 +08:00
8b68387199
fix share loading failed
2012-09-19 15:09:08 +08:00
c813a6143b
fb share for iNCCU
2012-09-18 17:31:51 +08:00
2321116597
Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config
2012-09-18 16:30:34 +08:00
6da3928626
change for NCCU ask
2012-09-18 15:49:05 +08:00
42c62ebca0
Fix preview for announcement (was retuning js instead of html)
2012-09-18 14:31:50 +08:00
ce47109d33
change link for rss
2012-09-18 12:04:45 +08:00
0ecb4eca46
change for NCCU entry site
2012-09-18 10:54:11 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
c5743a50bb
event bug fixed
2012-09-17 13:28:11 +08:00
221ffc08dd
Some calendar updates
2012-09-17 04:34:03 +08:00
9491945fd4
calendar month view update
2012-09-16 05:59:20 +08:00
b09b1cf2f5
commit for calendar
2012-09-14 21:59:20 +08:00
0cf2f1b9a1
final commit for calendar
2012-09-14 16:10:40 +08:00
619ae7e260
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
Gemfile.lock
vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb
2012-09-14 16:05:04 +08:00
af19f11668
calendar update
...
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
2012-09-14 15:57:44 +08:00
f1485556bd
calendar update
2012-09-14 15:55:57 +08:00
6b791539f5
final calendar change...
2012-09-14 15:35:12 +08:00
3d9fb548e1
calendar fixed
2012-09-14 15:20:01 +08:00
17768867a5
calendar update
...
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
2012-09-14 00:27:35 +08:00
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
73d5074037
minor shit updates
2012-09-13 23:57:48 +08:00
29ea95b4c6
event_calendar testing
2012-09-13 23:57:47 +08:00
f009a1c942
startup for config
2012-09-13 18:31:44 +08:00
3e3699c873
calendar update
2012-09-13 18:06:18 +08:00
90ae361dc3
Class change for filter button
2012-09-13 17:37:17 +08:00
2e9af5d1a8
fix commit bugs
2012-09-13 15:53:36 +08:00
8b2bc207de
Changes for i18n yml
2012-09-12 19:12:50 +08:00
45ccc315c7
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-09-12 17:53:47 +08:00
4dff15cffb
Add before_filter in gallery
2012-09-12 17:52:24 +08:00
5443aba43e
with gallery json
2012-09-12 16:50:59 +08:00
f88176ee1f
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
2012-09-12 16:48:33 +08:00
46177000e0
Merge branch 'visitor_dsahbroad' of github.com:Rulingcom/orbit into visitor_dsahbroad
...
Conflicts:
Gemfile.lock
app/controllers/application_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
2012-09-12 16:32:40 +08:00
98e8f5f607
complete visitor dashbroad
2012-09-12 16:20:15 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
17f3104c8d
Merge branch 'gallery_orbit' into desktop_devin
2012-09-12 16:18:13 +08:00
e96ebefe9c
calendar update
2012-09-12 16:16:01 +08:00
4ea0c0ec9c
minor fix for sidebar
2012-09-12 02:14:50 +08:00
8a71bd530f
page added...
2012-09-12 02:14:50 +08:00
8dd69a140f
frontend commits
2012-09-12 02:12:15 +08:00
3749e919cb
front ends updates
2012-09-12 02:12:15 +08:00
a42a651f90
frontend updates
2012-09-12 02:08:02 +08:00
199839a42a
frontend update
2012-09-12 02:08:02 +08:00
3fc07b9ff1
one more modification
2012-09-12 02:07:40 +08:00
2a66b89d33
Modifications in ruby
2012-09-12 02:07:40 +08:00
7ae1dcd8e0
Calendar Module
2012-09-12 02:06:22 +08:00
a05fff98ac
front update
2012-09-12 02:05:10 +08:00
4e662c744a
backend update
2012-09-12 02:05:10 +08:00
97923a4d31
resize thumbnails
2012-09-12 02:05:10 +08:00
7903d2ae36
ruby update for form and edit tagging
2012-09-12 02:05:10 +08:00
789c2df7fd
gallery frontend update
2012-09-12 02:05:10 +08:00
8259dee4a3
Ruby update
2012-09-12 02:05:10 +08:00
cc6986cb16
language fix
2012-09-12 02:05:10 +08:00
0be494c62b
front end added
2012-09-12 02:05:09 +08:00
6a23e29f33
Ruby structure implementation
2012-09-12 02:05:09 +08:00
26ff2af078
View only update
2012-09-12 02:04:36 +08:00
f62eba182e
Commit for view only
2012-09-12 02:04:36 +08:00
f4dde67344
frontend fixes
2012-09-12 02:04:36 +08:00
8caa798c08
frontend updates
2012-09-12 02:04:36 +08:00
29c5126455
gallery update
2012-09-12 02:04:36 +08:00
4b6eebba7c
gallery update
2012-09-12 02:04:08 +08:00
b6f10951b8
gallery update
...
especially upload panel
2012-09-12 02:04:07 +08:00
6e6d441b26
code merged … ui updated
2012-09-12 02:03:02 +08:00
2274df4111
gallery update
2012-09-12 02:02:29 +08:00
584d1eb0e0
gallery update
2012-09-12 02:02:01 +08:00
ede9727a18
gallery update
2012-09-12 02:02:00 +08:00
0e5a305f39
gallery update
2012-09-12 01:58:23 +08:00
0c624794d5
gallery update
2012-09-12 01:58:23 +08:00
887b2d528d
gallery update
...
especially upload panel
2012-09-12 01:58:23 +08:00
ad431b1d06
Minor update
2012-09-12 01:58:23 +08:00
91d45b64da
code merged … ui updated
2012-09-12 01:58:23 +08:00
17c4b9a1bf
gallery update
2012-09-12 01:58:22 +08:00
01eae75ad0
gallery update
2012-09-12 01:58:22 +08:00
a2ed9e3350
gallery update
2012-09-12 01:58:22 +08:00
a579e16109
Change rows for news textarea
2012-09-11 16:41:35 +08:00
73e48aebc6
Change news subtitle to textarea, no tinymce
2012-09-11 15:40:27 +08:00
e486ac5d25
complete visitor dashbroad
2012-09-11 11:30:58 +08:00
71021b8c69
Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
2012-09-11 00:41:52 +08:00
Rueshyna
chris
Harry Bomrah
devin
unknown
OrbitServer
Matthew K. Fu JuYuan
Matt
Fu Matthew