4b3911e866
about route url link bug
2012-11-14 16:20:32 +08:00
d7d1b9e31b
widget update
2012-11-14 15:28:55 +08:00
96622b168f
modified gallery json format but it have some bugs...
2012-11-14 12:01:42 +08:00
ad429af58c
modified announcement json format but it have some bugs...
2012-11-14 12:01:18 +08:00
9095713769
Fix bugs in Json when missing files
2012-11-13 15:21:59 +08:00
e5d31f50a0
calendar "edit calendar" update
2012-11-12 15:11:36 +08:00
295aef32ab
change host with host_with_port
2012-11-09 16:31:36 +08:00
275c6f4c8a
get_album_json function can get readable json
2012-11-09 16:25:11 +08:00
e4de229b22
make json readable
2012-11-09 16:24:37 +08:00
624d12de6d
make json readable
2012-11-09 16:24:23 +08:00
80abfc80bf
fixed get_bulletins_json of gprs bug
2012-11-09 10:41:49 +08:00
b1d808cb86
Merge branch 'gallery_orbit' into desktop_devin
2012-11-08 17:05:49 +08:00
7595e20d0c
fixed language of announcement filter
2012-11-08 16:01:08 +08:00
800279ea69
add get_bulletins_json function
2012-11-08 15:56:14 +08:00
e6a9555dd8
refine the location module done
2012-11-08 12:34:26 +08:00
dbfc70e520
Refine the location module, but it have some bugs about path ...
2012-11-08 01:26:33 +08:00
11fefa100f
all of user can get json of gprs from outside
2012-11-08 01:24:37 +08:00
b4f5a0b04b
all of user can get json of gallery from outside
2012-11-08 01:24:01 +08:00
97d2380406
Merge branch 'new' of https://github.com/Rulingcom/orbit into new
2012-11-06 14:28:03 +08:00
b9c8d9d657
plugin edit
2012-11-06 14:26:37 +08:00
b40d4702d5
Merge branch 'master' into various_bugs
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
3c85f3ef00
Make the archive module work (it needs more details)
2012-11-06 10:35:11 +08:00
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
b110b22daa
Change 熱門 to 頭版 for news
2012-09-10 15:55:06 +08:00
4dfe3e7b3b
Change 熱門 to 頭版 for news
2012-09-10 15:19:29 +08:00
7bab8bf8ad
page added...
2012-09-10 14:44:21 +08:00
e12701b34b
preview for association object
2012-09-10 14:19:39 +08:00
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
8295286c6e
frontend commits
2012-09-05 19:08:48 +08:00
b726c10857
front ends updates
2012-09-04 21:30:17 +08:00
a080667615
frontend updates
2012-09-04 17:17:18 +08:00
671f86b612
First version of new preview. Only plain text
2012-09-04 12:31:27 +08:00
ae1595a008
view for preview
2012-09-04 09:24:12 +08:00
4a12c9d6fb
frontend update
2012-09-03 21:49:35 +08:00
202d736a5d
one more modification
2012-08-31 22:02:06 +08:00
4d6a9a8e87
Modifications in ruby
2012-08-31 22:01:19 +08:00
dcdd730a01
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
2012-08-31 14:31:54 +08:00
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
bc5235aa9f
archive checkbox
2012-08-30 14:49:31 +08:00
c739ab3984
new archive
2012-08-30 14:49:31 +08:00
2a4c737cdd
archive checkbox
2012-08-30 14:48:42 +08:00
eb7e73b393
new archive
2012-08-30 14:44:55 +08:00
c74ebb91b8
archive checkbox
2012-08-30 14:37:56 +08:00
8a5519073b
new archive
2012-08-30 14:32:32 +08:00
10d9253399
announcement edit to view file
2012-08-30 14:25:51 +08:00
29bcfa3139
archive checkbox
2012-08-30 14:19:51 +08:00
d5cc9961e3
new archive
2012-08-30 14:14:53 +08:00
9cd7aa81a6
Calendar Module
2012-08-29 20:13:41 +08:00
34764fb28d
front update
2012-08-29 17:54:18 +08:00
43294b2f49
backend update
2012-08-29 17:48:29 +08:00
4fc196fb71
resize thumbnails
2012-08-29 17:36:12 +08:00
a2da065ce6
Merge branch 'gallery_orbit' into desktop_devin
2012-08-29 17:19:04 +08:00
4e6703dae6
ruby update for form and edit tagging
2012-08-29 17:13:45 +08:00
e17bc400f1
gallery frontend update
2012-08-29 17:12:20 +08:00
a11d865dd1
Ruby update
2012-08-28 21:04:48 +08:00
833349bf6c
Merge branch 'gallery_orbit' into desktop_devin
2012-08-28 15:45:20 +08:00
86535874f7
language fix
2012-08-28 15:38:35 +08:00
d2733bde28
front end added
2012-08-28 15:23:55 +08:00
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
99096c4ac0
View only update
2012-08-23 21:30:37 +08:00
33bc430df5
Commit for view only
2012-08-23 19:25:56 +08:00
861f521da3
Merge branch 'gallery_orbit' into desktop_devin
2012-08-23 17:15:03 +08:00
e2c16e1931
frontend fixes
2012-08-23 17:13:33 +08:00
e4cc80248d
Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad
...
Conflicts:
config/mongoid.yml
2012-08-23 16:08:17 +08:00
01d278d688
guest user
2012-08-23 16:05:14 +08:00
4d9244005a
Code merge
2012-08-23 01:40:55 +08:00
1e4d534908
frontend updates
2012-08-23 01:36:56 +08:00
93da8520ed
gallery update
2012-08-23 01:36:56 +08:00
9430f66bee
gallery update
2012-08-23 01:36:56 +08:00
1a4097d1c0
gallery update
...
especially upload panel
2012-08-23 01:36:56 +08:00
4fe4dc35de
Minor update
2012-08-23 01:36:55 +08:00
0799fb4f87
code merged … ui updated
2012-08-23 01:36:55 +08:00
d6b24c6454
gallery update
2012-08-23 01:36:55 +08:00
a732910f35
gallery update
2012-08-23 01:36:55 +08:00
7b42adc9a0
gallery update
2012-08-23 01:36:55 +08:00
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
75b6c447fc
gallery update
2012-08-22 16:46:37 +08:00
e8a0015365
gallery update
2012-08-22 15:59:06 +08:00
1437d2dc14
gallery update
...
especially upload panel
2012-08-22 01:15:50 +08:00
4a53e5faea
Minor update
2012-08-21 20:26:07 +08:00
16b1e97685
code merged … ui updated
2012-08-21 20:15:17 +08:00
0ad0ea9acf
gallery update
2012-08-21 16:32:55 +08:00
cbef7cd368
gallery update
2012-08-21 14:31:25 +08:00
1a6ecf4d0f
gallery update
2012-08-21 13:56:50 +08:00
68aed18956
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/views/layouts/_side_bar.html.erb
config/mongoid.yml
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
2012-08-20 23:24:41 +08:00
3d607cfca4
updates for tagging and language fix
2012-08-20 23:20:20 +08:00
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
489231166f
gallery update
2012-08-20 23:17:32 +08:00
1731c4bcf7
gallery update
...
add "tag panel", not complete
2012-08-20 23:17:32 +08:00
4beedb1aa4
gallery update
2012-08-20 23:17:31 +08:00
0dd1c6eb51
encoding fixed
...
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-20 23:16:54 +08:00
263cf130e2
tp
2012-08-20 23:16:54 +08:00
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
8a9e724979
gallery update
2012-08-20 23:14:11 +08:00
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
e27c1b0175
gallery update
2012-08-20 23:14:11 +08:00
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
314af3c16f
Major updates for gallery
2012-08-20 23:14:11 +08:00
0333f97bf3
Gallery update..
2012-08-20 23:14:10 +08:00
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
9f3d22360e
gallery module update
2012-08-20 23:11:32 +08:00
6e90196b77
updates for tagging and language fix
2012-08-20 22:00:57 +08:00
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
edf9d8a159
Fix can_display
2012-08-16 18:55:34 +08:00
3c283d1a7a
Set default picture
...
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
2012-08-16 17:24:12 +08:00
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
c5b95e2e0f
Fix rss feed i18n
2012-08-15 16:17:28 +08:00
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
d9f6bb3b4e
can display scope
2012-08-15 11:34:19 +08:00
bcc13a47e6
Fix deadline was set to nil when update
2012-08-14 16:23:34 +08:00
efaed060d9
Change for date
2012-08-14 15:11:52 +08:00
fb53ad524a
Add time to announcement quick edit
...
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
2012-08-14 14:38:21 +08:00
77224bcc8f
check deadline for news
2012-08-14 13:49:24 +08:00
e57b429398
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 13:13:25 +08:00
5bb4aa95ee
fix for dept
2012-08-14 13:13:06 +08:00
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
83569fac82
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 18:36:04 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
e86d5ab338
tagging
2012-08-13 16:43:23 +08:00
4d676d9ee9
Merge
2012-08-13 16:17:23 +08:00
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
080974b563
Merge branch 'new_rss'
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
34e4928ee1
authorization
2012-08-11 17:28:49 +08:00
7fb6a1e86b
gallery update
2012-08-11 01:32:53 +08:00
9333503545
demo_site widget edit
2012-08-10 15:33:28 +08:00
bebb8a1c1e
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
d5cc470e5d
new archive
2012-08-10 15:23:56 +08:00
cdb8d6c755
announcement edit to view file
2012-08-10 15:20:17 +08:00
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
2bd132cef9
Pass category and tag to search to redirect to the right page
...
Ray's change for mouseover (take out the black background)
2012-08-09 19:16:26 +08:00
6059edad70
Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss
2012-08-09 18:36:31 +08:00
50baac2cb7
gallery update
...
add "tag panel", not complete
2012-08-09 18:09:36 +08:00
1e7bc9aadd
1.Rss feed but no entry for clicking now. wait for design.
...
2.Unit link is now fixed.
2012-08-09 17:04:37 +08:00
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
561d510aa8
rss branch end
2012-08-09 17:04:08 +08:00
2d2172752f
remove announcement category column in announcement
2012-08-09 16:14:05 +08:00
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
987e6fff2b
1.Rss feed but no entry for clicking now. wait for design.
...
2.Unit link is now fixed.
2012-08-09 02:20:10 +08:00
5fcc910723
Merge branch 'master' of github.com:Rulingcom/NCCU into new_rss
2012-08-09 00:32:09 +08:00
ee03bd5b65
code merge
2012-08-08 19:35:36 +08:00
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
Rueshyna
Harry Bomrah
chris
devin
unknown
OrbitServer
Matthew K. Fu JuYuan
Matt
Fu Matthew