Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
spen
cd98f9c889
member plugin init add frontend
2013-02-22 18:21:11 +08:00
chris
8704fb30d5
Fix init name/key
2013-02-22 14:46:22 +08:00
chris
9a63adedde
Remove seminar from conference init
2013-02-22 11:57:10 +08:00
chris
680d7908b9
member plugin init edit
2013-02-21 17:53:08 +08:00
unknown
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
Rueshyna
79f0fc1a3b
add announcement header translation file
2013-02-21 14:10:42 +08:00
Rueshyna
4ee85a8c09
add coauthor and coauthor relation function
2013-02-21 13:58:47 +08:00
Rueshyna
13c757e8a9
clean add/edit page and add conference list page
2013-02-21 13:58:30 +08:00
Rueshyna
16fda25ace
done personal conference add/edit page
2013-02-21 13:53:50 +08:00
Rueshyna
6d65af0312
done personal conference list page, but it need to js.
2013-02-21 13:53:50 +08:00
Rueshyna
2afbae7c08
make a fake data for personal conference plugin
2013-02-21 13:53:50 +08:00
Rueshyna
1c4b696052
add add/edit form page and controller
2013-02-21 13:53:50 +08:00
Rueshyna
54b12a193a
add translation configuration
2013-02-21 13:53:47 +08:00
Rueshyna
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
Rueshyna
f1db7be14e
remove test and change for personal journal
2013-02-21 13:51:37 +08:00
Rueshyna
a61ec183c9
change add/edit url of personal_conference
2013-02-21 13:50:12 +08:00
unknown
f59da3ce81
member plugin init edit
2013-02-20 18:05:09 +08:00
unknown
bc44d38948
member plugin edit
2013-02-20 17:25:20 +08:00
unknown
a7bc19768e
member list edit
2013-02-20 11:12:08 +08:00
chris
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
chris
c7cf587581
Fix web links html and index query
2013-02-19 17:39:43 +08:00
chris
236f68ba84
Fix archive module back end pagination and front end html
2013-02-19 17:39:43 +08:00
chris
61648d23e1
Change delete_all to destroy_all
2013-02-19 17:39:42 +08:00
chris
3676de8a14
Change validation for url: can include IPs
2013-02-19 17:39:42 +08:00
Rueshyna
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
Fu Matthew
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
Fu Matthew
b7d797f9dd
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-19 14:21:54 +08:00
Fu Matthew
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
Fu Matthew
a6f6dc271c
fix i18n,reload problems
2013-02-18 15:13:31 +08:00
Fu Matthew
29bb92f841
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-06 17:44:38 +08:00
Fu Matthew
8e7e601845
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
2013-02-04 18:19:47 +08:00
Fu Matthew
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
chris
2b3cbc50b3
Fix location namespace
2013-02-04 18:06:45 +08:00
chris
3791046e5a
Add missing link to writing conference index
2013-02-04 18:01:42 +08:00
unknown
e244493b55
member plugin edit
2013-02-04 18:01:42 +08:00
Rueshyna
8e98aa10bc
modularize factories
2013-02-04 18:01:42 +08:00
Rueshyna
8f334f6948
modularize conference
2013-02-04 18:01:42 +08:00
Rueshyna
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
Rueshyna
e0fedb4454
change textfiled to bilingual for co_author
2013-02-04 18:01:03 +08:00
Rueshyna
85ca196dec
add bilingual for personal journal
2013-02-04 18:01:03 +08:00
unknown
0b18cf48e3
member roles edit
2013-02-04 18:01:03 +08:00
Fu Matthew
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +08:00
unknown
8bf7d0f6f3
member plugin edit
2013-01-28 16:19:36 +08:00
Fu Matthew
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
Fu Matthew
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
unknown
781a0ad96e
member roles edit
2013-01-18 11:25:11 +08:00
Rueshyna
dca4f5d0be
mv gallery_uploader
2013-01-16 01:35:38 +08:00
Rueshyna
c44b4163e4
gprs byebye, location have two language, must have picture, long, lang have limit
2013-01-16 01:35:38 +08:00
Fu Matthew
91afad23ba
Merge branch 'new_widget_setting_interface'
2013-01-15 12:03:56 +08:00
Fu Matthew
8413e31048
add i18n
2013-01-15 10:25:55 +08:00
unknown
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
Rueshyna
da283e136b
correct personal journal language, but now hava no language config
2013-01-14 17:54:53 +08:00
Rueshyna
1b6bfdb80f
modularize personal journal and pull relational setting in desktop/index.rb
2013-01-14 17:54:52 +08:00
Rueshyna
68e14a7898
move js file to relational module but have js require problem
2013-01-14 17:54:52 +08:00
Rueshyna
919f951981
restore js,journal_pages.js,
2013-01-14 17:54:52 +08:00
Rueshyna
a183ac6041
fixed journal type page
2013-01-14 17:54:52 +08:00
Rueshyna
bf31d0c3dd
modularized personal journal
2013-01-14 17:54:52 +08:00
Rueshyna
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
chris
de39bce4ce
Fix the tooltips
2013-01-11 12:13:16 +08:00
chris
b90e8efb1f
Fix filter not collapsing
...
Fix icon size for button
2013-01-11 11:37:11 +08:00
chris
41dff814fb
Change icons
2013-01-09 21:17:50 +08:00
Fu Matthew
614b6fde71
fix wrong html structure for announcement frontend
2013-01-09 12:13:55 +08:00
chris
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
Fu Matthew
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
Fu Matthew
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
Fu Matthew
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
chris
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
chris
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
chris
7e045959b6
Gallery i18n
2013-01-04 12:01:32 +08:00
Rueshyna
8815533075
correct pic file format
2013-01-03 18:32:32 +08:00
Fu Matthew
5d6279a9ea
fix calendar broken
2013-01-03 10:58:52 +08:00
Rueshyna
f67664df29
custom icon for msoffice
2013-01-02 17:35:21 +08:00
Rueshyna
5f7453c3fb
generalization file type
2013-01-02 16:58:48 +08:00
Rueshyna
f4692182c0
when mouse move to button of announcement file : image => preview pic, file => type
2013-01-02 16:34:38 +08:00
Rueshyna
8a6f92b87b
fixed announcement controller syntax error
2013-01-02 10:19:56 +08:00
chris
9937b4ac9b
Fix deleting links and files in bulletin
2012-12-31 18:03:13 +08:00
chris
2d8400d1cc
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:34:24 +08:00
chris
61b0f94c04
Remove I18n.locale for announcement front-end
...
Fix counter in back-end edit
2012-12-28 15:34:04 +08:00
Fu Matthew
5587e83419
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:31:32 +08:00
Fu Matthew
baf1240b76
gallery options
2012-12-28 15:30:46 +08:00
chris
e8e7c38221
Changes for announcement widget style 1 and categories
2012-12-28 14:01:04 +08:00
chris
455a27437d
Changes for announcement widget style 2
2012-12-28 13:47:30 +08:00
chris
17d93409b3
Remove extra double quote in sub_menu
...
Fix web link widget pagination
2012-12-28 11:10:33 +08:00
Rueshyna
c219792a13
fixed delete function of archive file
2012-12-28 10:02:16 +08:00
chris
751d3b1220
Announcement widget: remove I18n.locale
...
Add part_id in url
2012-12-27 16:52:58 +08:00
Matthew K. Fu JuYuan
2dd2368378
remove merge marks
2012-12-25 11:26:23 +08:00
Matthew K. Fu JuYuan
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
Matthew K. Fu JuYuan
41bcbdd2f0
missing file?
2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan
062ebecae3
fix serval bugs on sidebar.
2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan
2c69590c36
rename of GPRS
...
now it's named location
2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan
397729d3a1
Remove GPRS
2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan
53afb6ea0c
sidebar rewrited
2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan
5f712622ad
default widgets and sidebar.
2012-12-24 16:38:35 +08:00
Matthew K. Fu JuYuan
6995bb1622
put module app json into init,making orbit app work with module app.
2012-12-24 16:23:16 +08:00
Matthew K. Fu JuYuan
36f6a6fdd6
first version of confined sidebar render
2012-12-24 16:17:00 +08:00
chris
e9815c3d9b
Fix css bug when precompiling assets
2012-12-20 14:34:02 +08:00
Rueshyna
b4633a2ccb
.not_guest_user
2012-12-19 19:48:13 +08:00
chris
fcbba6660b
Only one parser for front end
...
Separate site map for i18n
2012-12-19 17:15:31 +08:00
Matthew K. Fu JuYuan
858e942da2
fix serval bugs on sidebar.
2012-12-07 12:40:47 +08:00
Matthew K. Fu JuYuan
bd743a0ca5
rename of GPRS
...
now it's named location
2012-12-07 12:40:21 +08:00
Matthew K. Fu JuYuan
e07fb7d434
Remove GPRS
2012-12-07 12:36:25 +08:00
OrbitServer
fbed496034
Harry's changes in i18n
2012-12-06 23:08:13 +08:00
Rueshyna
4a8878132e
add content for announcement rss
2012-12-06 07:59:42 +08:00
Matthew K. Fu JuYuan
99f28a0cba
sidebar rewrited
2012-12-05 18:35:58 +08:00
Matthew K. Fu JuYuan
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
chris
2983b181e6
Fix some translations
2012-12-04 01:03:28 +08:00
Rueshyna
eb97d417bd
if coauthor not in coauthor db then it will be add in db
2012-12-04 00:31:06 +08:00
chris
dc3be3c9a1
Translation changes
2012-12-03 23:00:04 +08:00
Matthew K. Fu JuYuan
4bc80f2bd3
default widgets and sidebar.
2012-12-03 18:52:36 +08:00
Matthew K. Fu JuYuan
f9bcb27efc
put module app json into init,making orbit app work with module app.
2012-11-29 14:21:46 +08:00
chris
390da0e49a
Change icons
2012-11-29 00:49:53 +08:00
Rueshyna
114ca5493a
replace rss format with json in announcement
2012-11-28 13:43:48 +08:00
Matthew K. Fu JuYuan
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
chris
6a12aec67c
Fix album images display
2012-11-22 20:01:10 +08:00
chris
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
devin
25a9987f13
calendar js minor update
2012-11-21 19:02:54 +08:00
chris
2d0e8b37b2
Fix:
...
- Widgets for announcement
- Facebook link
- AdBanner nav
2012-11-21 18:42:14 +08:00
Matthew K. Fu JuYuan
ec0ec46303
visitor now can browse gallery
2012-11-21 18:39:28 +08:00
chris
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
Matthew K. Fu JuYuan
1279af0c11
fix and hide for visitors,except for album
2012-11-21 18:31:57 +08:00
Matthew K. Fu JuYuan
1f8f58e930
album and gallery is now opened
2012-11-21 17:52:25 +08:00
Harry Bomrah
ef3fddd863
fixed sutpid bug for calendar
2012-11-21 16:55:18 +08:00
Harry Bomrah
9fc8ec8e16
back button fix for frontend
2012-11-21 15:00:07 +08:00
Matthew K. Fu JuYuan
fda7c43efc
Merge branch 'master' of github.com:Rulingcom/orbit into openness
2012-11-21 11:46:44 +08:00
Matthew K. Fu JuYuan
ee053cd8ac
fix and hide for visitors,except for album
2012-11-21 11:46:06 +08:00
Rueshyna
b359d5d566
some bugs
2012-11-21 07:37:44 +08:00
Rueshyna
d7599f1ccf
add edit function
2012-11-21 07:37:43 +08:00
Rueshyna
5eb8cc4063
finished some method of list and journal
2012-11-21 07:37:43 +08:00
devin
f2e76d27b8
minor update for gallery and calendar backend
2012-11-21 07:36:59 +08:00
Matthew K. Fu JuYuan
96fe482d50
for openness
2012-11-20 20:20:59 +08:00
Matthew K. Fu JuYuan
c6894be962
first version of confined sidebar render
2012-11-20 15:56:52 +08:00
chris
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
Rueshyna
47075944e7
make gallery json format to two layer
2012-11-20 12:13:18 +08:00
Rueshyna
81f67fc08a
make announcement json format to two layer
2012-11-20 12:11:35 +08:00
Rueshyna
bfef1a8e7c
tmp
2012-11-20 12:11:35 +08:00
Rueshyna
bd7518093f
about route url link bug
2012-11-20 12:11:35 +08:00
Rueshyna
310d7523bd
modified gallery json format but it have some bugs...
2012-11-20 12:11:35 +08:00
Rueshyna
36b4cb1ec1
modified announcement json format but it have some bugs...
2012-11-20 12:09:58 +08:00
chris
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
chris
1a76d5d3cb
Merge branch 'new' of github.com:Rulingcom/orbit into new
2012-11-20 10:10:16 +08:00
chris
609c932cca
Fix some gallery routes
2012-11-20 10:05:56 +08:00
Harry Bomrah
04469ff845
Minor update for gallery frontend
2012-11-19 18:18:46 +08:00
chris
fb74d74c72
Fix:
...
- page_part not including items_helper
- categories for bulletins front-end
2012-11-15 18:01:49 +08:00
chris
112f7000a0
Fix announcement front-end bug
2012-11-15 17:23:24 +08:00
chris
9b1ada0af9
Fix these bugs:
...
1.結構部份
a.原選單,點選編輯,無動作反應
b.新增選單後,左邊灰色架構部份不會更新
2.檔案室
a.無法編輯分類
2012-11-15 15:51:44 +08:00
Rueshyna
4a7b5a1bf6
make gallery json format to two layer
2012-11-15 12:11:58 +08:00
Rueshyna
97c2366221
make announcement json format to two layer
2012-11-15 11:49:00 +08:00
Rueshyna
ba4bc67e0e
tmp
2012-11-15 11:06:33 +08:00
Harry Bomrah
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
Rueshyna
4b3911e866
about route url link bug
2012-11-14 16:20:32 +08:00
Harry Bomrah
d7d1b9e31b
widget update
2012-11-14 15:28:55 +08:00
Rueshyna
96622b168f
modified gallery json format but it have some bugs...
2012-11-14 12:01:42 +08:00
Rueshyna
ad429af58c
modified announcement json format but it have some bugs...
2012-11-14 12:01:18 +08:00
chris
9095713769
Fix bugs in Json when missing files
2012-11-13 15:21:59 +08:00
devin
e5d31f50a0
calendar "edit calendar" update
2012-11-12 15:11:36 +08:00
Rueshyna
295aef32ab
change host with host_with_port
2012-11-09 16:31:36 +08:00
Rueshyna
275c6f4c8a
get_album_json function can get readable json
2012-11-09 16:25:11 +08:00
Rueshyna
e4de229b22
make json readable
2012-11-09 16:24:37 +08:00
Rueshyna
624d12de6d
make json readable
2012-11-09 16:24:23 +08:00
Rueshyna
80abfc80bf
fixed get_bulletins_json of gprs bug
2012-11-09 10:41:49 +08:00
Harry Bomrah
b1d808cb86
Merge branch 'gallery_orbit' into desktop_devin
2012-11-08 17:05:49 +08:00
Rueshyna
7595e20d0c
fixed language of announcement filter
2012-11-08 16:01:08 +08:00
Rueshyna
800279ea69
add get_bulletins_json function
2012-11-08 15:56:14 +08:00
Rueshyna
e6a9555dd8
refine the location module done
2012-11-08 12:34:26 +08:00
Rueshyna
dbfc70e520
Refine the location module, but it have some bugs about path ...
2012-11-08 01:26:33 +08:00
Rueshyna
11fefa100f
all of user can get json of gprs from outside
2012-11-08 01:24:37 +08:00
Rueshyna
b4f5a0b04b
all of user can get json of gallery from outside
2012-11-08 01:24:01 +08:00
unknown
97d2380406
Merge branch 'new' of https://github.com/Rulingcom/orbit into new
2012-11-06 14:28:03 +08:00
unknown
b9c8d9d657
plugin edit
2012-11-06 14:26:37 +08:00
chris
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
chris
3c85f3ef00
Make the archive module work (it needs more details)
2012-11-06 10:35:11 +08:00
Rueshyna
c314745545
add link of title
2012-11-05 11:42:50 +08:00
Rueshyna
e4de1e34a2
add announcement plugin
2012-11-05 11:42:50 +08:00
Rueshyna
9433d59c04
relpace tab with sapce
2012-11-05 11:42:49 +08:00
Rueshyna
ed3644fb89
done journal
2012-11-05 11:42:49 +08:00
chris
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
Harry Bomrah
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
devin
228d43d0e2
calendar update
2012-11-05 11:40:11 +08:00
Harry Bomrah
6dd9f441ef
Agenda View
2012-11-05 11:40:11 +08:00
devin
d070c70512
calendar agenda view update
2012-11-05 11:40:11 +08:00
Harry Bomrah
513671e498
lot of updates
2012-11-05 11:34:35 +08:00
chris
fe0e49c3e9
Remove a folder in wich Chinese characters
2012-11-04 20:32:54 +08:00
unknown
bd17641d18
member plugin list add new
2012-11-04 20:24:36 +08:00
unknown
2f61b3e0c9
member plugin list add new
2012-11-02 18:28:23 +08:00
devin
9bf812b8d9
calendar "edit calendar" update
2012-11-01 15:21:42 +08:00
Harry Bomrah
d904163090
Merge branch 'gallery_orbit' into desktop_devin
2012-11-01 10:47:23 +08:00
Harry Bomrah
a25199d33b
Calander view updated...
2012-11-01 10:45:22 +08:00
chris
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
devin
167c993108
calendar update
2012-10-30 17:26:52 +08:00
chris
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
chris
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +08:00
Harry Bomrah
5da35ee65b
Agenda View
2012-10-29 19:52:34 +08:00
chris
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
Harry Bomrah
b73981b19a
Devin commit
2012-10-29 10:17:49 +08:00
devin
12b7618cc7
calendar agenda view update
2012-10-27 00:11:26 +08:00
Harry Bomrah
5e25cf5849
lot of updates
2012-10-26 19:04:51 +08:00
chris
579c7b5e81
Add missing helper
2012-10-26 11:19:56 +08:00
chris
cbfa659928
Changes for side_bar
2012-10-26 11:19:56 +08:00
Harry Bomrah
a5722af315
Calendar updates for day view
2012-10-26 11:15:37 +08:00