d0b54a4d6c
done conferece seeds
2013-02-26 15:52:42 +08:00
81725ed942
split db/seeds.rb file to local plugin and done journal
2013-02-26 15:52:20 +08:00
c55f64f3c6
correct view permission of conference
2013-02-26 15:17:09 +08:00
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
6f599bb95d
sort conference and type
2013-02-25 12:01:59 +08:00
522e0481e1
add conferene list order function
2013-02-25 12:01:59 +08:00
8b0ffe747c
sort conference and type
2013-02-25 11:46:20 +08:00
6929d30b5d
add conferene list order function
2013-02-25 11:46:11 +08:00
Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
cd98f9c889
member plugin init add frontend
2013-02-22 18:21:11 +08:00
8704fb30d5
Fix init name/key
2013-02-22 14:46:22 +08:00
9a63adedde
Remove seminar from conference init
2013-02-22 11:57:10 +08:00
680d7908b9
member plugin init edit
2013-02-21 17:53:08 +08:00
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
79f0fc1a3b
add announcement header translation file
2013-02-21 14:10:42 +08:00
4ee85a8c09
add coauthor and coauthor relation function
2013-02-21 13:58:47 +08:00
13c757e8a9
clean add/edit page and add conference list page
2013-02-21 13:58:30 +08:00
16fda25ace
done personal conference add/edit page
2013-02-21 13:53:50 +08:00
6d65af0312
done personal conference list page, but it need to js.
2013-02-21 13:53:50 +08:00
2afbae7c08
make a fake data for personal conference plugin
2013-02-21 13:53:50 +08:00
1c4b696052
add add/edit form page and controller
2013-02-21 13:53:50 +08:00
54b12a193a
add translation configuration
2013-02-21 13:53:47 +08:00
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
f1db7be14e
remove test and change for personal journal
2013-02-21 13:51:37 +08:00
a61ec183c9
change add/edit url of personal_conference
2013-02-21 13:50:12 +08:00
f59da3ce81
member plugin init edit
2013-02-20 18:05:09 +08:00
bc44d38948
member plugin edit
2013-02-20 17:25:20 +08:00
a7bc19768e
member list edit
2013-02-20 11:12:08 +08:00
bc21840262
Comment out delete link for archive category
...
Modify the import:
- hot_news to announcement
- iso_zone of 20000 to 21100
2013-02-19 17:49:20 +08:00
c7cf587581
Fix web links html and index query
2013-02-19 17:39:43 +08:00
236f68ba84
Fix archive module back end pagination and front end html
2013-02-19 17:39:43 +08:00
61648d23e1
Change delete_all to destroy_all
2013-02-19 17:39:42 +08:00
3676de8a14
Change validation for url: can include IPs
2013-02-19 17:39:42 +08:00
f3bfe67e68
breadcrumb widget of back-end has done, front-end has bug...
...
Conflicts:
app/controllers/front_controller.rb
app/views/front/show_breadcrumb.html.erb
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
2013-02-19 17:39:41 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
b7d797f9dd
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-19 14:21:54 +08:00
fcb49723b4
fix sidebar icon for page.
...
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
2013-02-19 14:21:53 +08:00
a6f6dc271c
fix i18n,reload problems
2013-02-18 15:13:31 +08:00
29bb92f841
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-06 17:44:38 +08:00
8e7e601845
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
2013-02-04 18:19:47 +08:00
eed7a22dbe
fix sidebar icon for page.
...
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
2013-02-04 18:14:00 +08:00
2b3cbc50b3
Fix location namespace
2013-02-04 18:06:45 +08:00
3791046e5a
Add missing link to writing conference index
2013-02-04 18:01:42 +08:00
e244493b55
member plugin edit
2013-02-04 18:01:42 +08:00
8e98aa10bc
modularize factories
2013-02-04 18:01:42 +08:00
8f334f6948
modularize conference
2013-02-04 18:01:42 +08:00
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
e0fedb4454
change textfiled to bilingual for co_author
2013-02-04 18:01:03 +08:00
85ca196dec
add bilingual for personal journal
2013-02-04 18:01:03 +08:00
0b18cf48e3
member roles edit
2013-02-04 18:01:03 +08:00
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +08:00
8bf7d0f6f3
member plugin edit
2013-01-28 16:19:36 +08:00
bfaa22052f
Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
app/controllers/default_widget_controller.rb
app/uploaders/gprs_uploader.rb
app/uploaders/location_uploader.rb
app/views/admin/page_parts/_module_widget.html.erb
app/views/admin/page_parts/reload_widget_styles.js.erb
app/views/admin/page_parts/reload_widgets.js.erb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/README.rdoc
vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
vendor/built_in_modules/location/app/models/location.rb
vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
vendor/built_in_modules/location/config/routes.rb
vendor/built_in_modules/location/lib/location.rb
vendor/built_in_modules/location/location.gemspec
vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
2013-01-24 16:30:02 +08:00
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
781a0ad96e
member roles edit
2013-01-18 11:25:11 +08:00
dca4f5d0be
mv gallery_uploader
2013-01-16 01:35:38 +08:00
c44b4163e4
gprs byebye, location have two language, must have picture, long, lang have limit
2013-01-16 01:35:38 +08:00
91afad23ba
Merge branch 'new_widget_setting_interface'
2013-01-15 12:03:56 +08:00
8413e31048
add i18n
2013-01-15 10:25:55 +08:00
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
da283e136b
correct personal journal language, but now hava no language config
2013-01-14 17:54:53 +08:00
1b6bfdb80f
modularize personal journal and pull relational setting in desktop/index.rb
2013-01-14 17:54:52 +08:00
68e14a7898
move js file to relational module but have js require problem
2013-01-14 17:54:52 +08:00
919f951981
restore js,journal_pages.js,
2013-01-14 17:54:52 +08:00
a183ac6041
fixed journal type page
2013-01-14 17:54:52 +08:00
bf31d0c3dd
modularized personal journal
2013-01-14 17:54:52 +08:00
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
de39bce4ce
Fix the tooltips
2013-01-11 12:13:16 +08:00
b90e8efb1f
Fix filter not collapsing
...
Fix icon size for button
2013-01-11 11:37:11 +08:00
41dff814fb
Change icons
2013-01-09 21:17:50 +08:00
614b6fde71
fix wrong html structure for announcement frontend
2013-01-09 12:13:55 +08:00
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
76296ab29b
Merge branch 'sidebar_config' into ntu
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/controllers/orbit_backend_controller.rb
app/controllers/orbit_widget_controller.rb
app/models/module_app.rb
app/views/admin/page_parts/_module_widget.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
2013-01-08 14:17:21 +08:00
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
5793f0fe5d
default widget link.
...
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
be00cec4d7
Fix link for ad_banner
...
Add missing helper for web_link_category
Show design's js in front-end
2013-01-07 00:36:48 +08:00
7e045959b6
Gallery i18n
2013-01-04 12:01:32 +08:00
8815533075
correct pic file format
2013-01-03 18:32:32 +08:00
5d6279a9ea
fix calendar broken
2013-01-03 10:58:52 +08:00
f67664df29
custom icon for msoffice
2013-01-02 17:35:21 +08:00
5f7453c3fb
generalization file type
2013-01-02 16:58:48 +08:00
f4692182c0
when mouse move to button of announcement file : image => preview pic, file => type
2013-01-02 16:34:38 +08:00
8a6f92b87b
fixed announcement controller syntax error
2013-01-02 10:19:56 +08:00
9937b4ac9b
Fix deleting links and files in bulletin
2012-12-31 18:03:13 +08:00
2d8400d1cc
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:34:24 +08:00
61b0f94c04
Remove I18n.locale for announcement front-end
...
Fix counter in back-end edit
2012-12-28 15:34:04 +08:00
5587e83419
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:31:32 +08:00
baf1240b76
gallery options
2012-12-28 15:30:46 +08:00
e8e7c38221
Changes for announcement widget style 1 and categories
2012-12-28 14:01:04 +08:00
455a27437d
Changes for announcement widget style 2
2012-12-28 13:47:30 +08:00
17d93409b3
Remove extra double quote in sub_menu
...
Fix web link widget pagination
2012-12-28 11:10:33 +08:00
c219792a13
fixed delete function of archive file
2012-12-28 10:02:16 +08:00
751d3b1220
Announcement widget: remove I18n.locale
...
Add part_id in url
2012-12-27 16:52:58 +08:00
2dd2368378
remove merge marks
2012-12-25 11:26:23 +08:00
49e6c33b57
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/routes.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/archive/init.rb
vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
2012-12-25 11:01:36 +08:00
41bcbdd2f0
missing file?
2012-12-24 16:39:53 +08:00
062ebecae3
fix serval bugs on sidebar.
2012-12-24 16:39:53 +08:00
2c69590c36
rename of GPRS
...
now it's named location
2012-12-24 16:39:53 +08:00
397729d3a1
Remove GPRS
2012-12-24 16:39:53 +08:00
53afb6ea0c
sidebar rewrited
2012-12-24 16:39:53 +08:00
5f712622ad
default widgets and sidebar.
2012-12-24 16:38:35 +08:00
6995bb1622
put module app json into init,making orbit app work with module app.
2012-12-24 16:23:16 +08:00
36f6a6fdd6
first version of confined sidebar render
2012-12-24 16:17:00 +08:00
e9815c3d9b
Fix css bug when precompiling assets
2012-12-20 14:34:02 +08:00
b4633a2ccb
.not_guest_user
2012-12-19 19:48:13 +08:00
fcbba6660b
Only one parser for front end
...
Separate site map for i18n
2012-12-19 17:15:31 +08:00
858e942da2
fix serval bugs on sidebar.
2012-12-07 12:40:47 +08:00
bd743a0ca5
rename of GPRS
...
now it's named location
2012-12-07 12:40:21 +08:00
e07fb7d434
Remove GPRS
2012-12-07 12:36:25 +08:00
fbed496034
Harry's changes in i18n
2012-12-06 23:08:13 +08:00
4a8878132e
add content for announcement rss
2012-12-06 07:59:42 +08:00
99f28a0cba
sidebar rewrited
2012-12-05 18:35:58 +08:00
ca290f3519
Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
...
Conflicts:
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
2012-12-05 11:36:32 +08:00
2983b181e6
Fix some translations
2012-12-04 01:03:28 +08:00
eb97d417bd
if coauthor not in coauthor db then it will be add in db
2012-12-04 00:31:06 +08:00
dc3be3c9a1
Translation changes
2012-12-03 23:00:04 +08:00
4bc80f2bd3
default widgets and sidebar.
2012-12-03 18:52:36 +08:00
f9bcb27efc
put module app json into init,making orbit app work with module app.
2012-11-29 14:21:46 +08:00
390da0e49a
Change icons
2012-11-29 00:49:53 +08:00
114ca5493a
replace rss format with json in announcement
2012-11-28 13:43:48 +08:00
3d573680b2
Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config
...
Conflicts:
app/models/user/attribute_value.rb
app/views/layouts/_side_bar_content.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-11-26 17:55:53 +08:00
6a12aec67c
Fix album images display
2012-11-22 20:01:10 +08:00
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
25a9987f13
calendar js minor update
2012-11-21 19:02:54 +08:00
2d0e8b37b2
Fix:
...
- Widgets for announcement
- Facebook link
- AdBanner nav
2012-11-21 18:42:14 +08:00
ec0ec46303
visitor now can browse gallery
2012-11-21 18:39:28 +08:00
0aaadbc82d
Merge branch 'openness' of github.com:Rulingcom/orbit into openness
...
Conflicts:
vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
2012-11-21 18:33:04 +08:00
1279af0c11
fix and hide for visitors,except for album
2012-11-21 18:31:57 +08:00
1f8f58e930
album and gallery is now opened
2012-11-21 17:52:25 +08:00
ef3fddd863
fixed sutpid bug for calendar
2012-11-21 16:55:18 +08:00
9fc8ec8e16
back button fix for frontend
2012-11-21 15:00:07 +08:00
fda7c43efc
Merge branch 'master' of github.com:Rulingcom/orbit into openness
2012-11-21 11:46:44 +08:00
ee053cd8ac
fix and hide for visitors,except for album
2012-11-21 11:46:06 +08:00
b359d5d566
some bugs
2012-11-21 07:37:44 +08:00
d7599f1ccf
add edit function
2012-11-21 07:37:43 +08:00
5eb8cc4063
finished some method of list and journal
2012-11-21 07:37:43 +08:00
f2e76d27b8
minor update for gallery and calendar backend
2012-11-21 07:36:59 +08:00
96fe482d50
for openness
2012-11-20 20:20:59 +08:00
c6894be962
first version of confined sidebar render
2012-11-20 15:56:52 +08:00
df58d4c5f3
Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format
...
Conflicts:
vendor/built_in_modules/gallery/config/routes.rb
2012-11-20 12:14:53 +08:00
47075944e7
make gallery json format to two layer
2012-11-20 12:13:18 +08:00
81f67fc08a
make announcement json format to two layer
2012-11-20 12:11:35 +08:00
bfef1a8e7c
tmp
2012-11-20 12:11:35 +08:00
bd7518093f
about route url link bug
2012-11-20 12:11:35 +08:00
310d7523bd
modified gallery json format but it have some bugs...
2012-11-20 12:11:35 +08:00
36b4cb1ec1
modified announcement json format but it have some bugs...
2012-11-20 12:09:58 +08:00
747b0d4620
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
vendor/built_in_modules/gallery/config/routes.rb
2012-11-20 10:11:59 +08:00
1a76d5d3cb
Merge branch 'new' of github.com:Rulingcom/orbit into new
2012-11-20 10:10:16 +08:00
609c932cca
Fix some gallery routes
2012-11-20 10:05:56 +08:00
04469ff845
Minor update for gallery frontend
2012-11-19 18:18:46 +08:00
fb74d74c72
Fix:
...
- page_part not including items_helper
- categories for bulletins front-end
2012-11-15 18:01:49 +08:00
112f7000a0
Fix announcement front-end bug
2012-11-15 17:23:24 +08:00
9b1ada0af9
Fix these bugs:
...
1.結構部份
a.原選單，點選編輯，無動作反應
b.新增選單後，左邊灰色架構部份不會更新
2.檔案室
a.無法編輯分類
2012-11-15 15:51:44 +08:00
4a7b5a1bf6
make gallery json format to two layer
2012-11-15 12:11:58 +08:00
97c2366221
make announcement json format to two layer
2012-11-15 11:49:00 +08:00
ba4bc67e0e
tmp
2012-11-15 11:06:33 +08:00
46f80ade6a
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
...
Conflicts:
vendor/built_in_modules/gallery/config/routes.rb
2012-11-14 16:25:02 +08:00
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
Rueshyna
Harry Bomrah
spen
chris
unknown
Fu Matthew
Matthew K. Fu JuYuan
OrbitServer
devin
Harry Bomrah
Matt