Fu Matthew
dc3966be81
fix cates and tags
2013-03-05 18:34:41 +08:00
Rueshyna
d5f1d13670
Merge remote-tracking branch 'origin/desktop_work' into desktop
...
* origin/desktop_work:
simple layout tinyscrollbar fixed
highlighting fixed…
fixed adding.
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
Conflicts:
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 17:34:28 +08:00
Rueshyna
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
devin
db2b371744
tinyscrollbar minor update
2013-03-05 17:22:53 +08:00
Fu Matthew
626b2a7bca
fix default failed when cate or tags set to empty
2013-03-05 11:48:20 +08:00
Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
Harry Bomrah
dc92ef9f42
simple layout tinyscrollbar fixed
2013-03-05 11:04:18 +08:00
devin
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
Fu Matthew
285119a5f3
fix for multi select cates and tags
2013-03-04 19:29:45 +08:00
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
Fu Matthew
15b9839b76
fix archive category
...
fix page adding failed
2013-03-04 14:40:29 +08:00
Harry Bomrah
e69679d3fe
tinyscrollbar_bug fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
2ead541733
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-04 12:37:29 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
0f12314213
some changes for gridster
2013-03-04 12:37:29 +08:00
Harry Bomrah
b8ee748723
Lot of changes in gridster
2013-03-04 12:37:29 +08:00
Rueshyna
ee4b94ace0
Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop
...
* 'desktop' of https://github.com/Rulingcom/orbit :
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
2013-03-04 12:17:14 +08:00
Rueshyna
8f1d7b55ab
authors auto-complete
2013-03-04 12:16:46 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
Harry Bomrah
9b8ab2a2c1
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-01 14:45:20 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
Harry Bomrah
7ef02d3108
Merge branch 'desktop' into desktop_work
2013-02-27 11:51:56 +08:00
Harry Bomrah
912080482b
some changes for gridster
2013-02-27 11:47:41 +08:00
chris
ca946fc881
Merge branch 'development' of github.com:Rulingcom/orbit into development
...
Conflicts:
lib/tasks/migrate.rake
2013-02-27 11:03:52 +08:00
Fu Matthew
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +08:00
Fu Matthew
071e8a349c
link to more
2013-02-27 10:50:50 +08:00
Fu Matthew
8a8bfcb8fb
fix default widget link
2013-02-27 10:50:47 +08:00
Fu Matthew
d7699e1a46
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
2013-02-27 10:49:51 +08:00
Fu Matthew
0e6599e9b9
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-27 10:49:51 +08:00
Fu Matthew
99e67c8719
first version of multi categories and tags
2013-02-27 10:49:48 +08:00
Rueshyna
fb931b0a4a
Merge remote-tracking branch 'origin/desktop' into desktop
...
* origin/desktop:
Remove Gemfile.lock
sort conference and type
add conferene list order function
css minor changes.
gridster, url code fixed, views removed.
Fix selection of sub_menu for widget (the value wasn't set)
Fix bug in widget selection
css minor changes.
Fix public_r_tag selection
gridster, url code fixed, views removed.
2013-02-26 17:02:01 +08:00
Rueshyna
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
Harry Bomrah
e9c0f443b7
Lot of changes in gridster
2013-02-26 11:47:39 +08:00
Fu Matthew
5f832a17d4
fix widget field reload
2013-02-25 12:49:06 +08:00
Harry Bomrah
edd2c1f522
css minor changes.
2013-02-25 11:08:57 +08:00
Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
chris
3572856486
Fix selection of sub_menu for widget (the value wasn't set)
2013-02-25 10:35:59 +08:00
Fu Matthew
0be1c45c81
link to more
2013-02-23 18:29:50 +08:00
chris
5b0b8e6c79
Fix bug in widget selection
2013-02-23 17:25:07 +08:00
chris
caac9191ce
Fix public_r_tag selection
2013-02-23 16:52:37 +08:00
Fu Matthew
73bca03b33
fix default widget link
2013-02-23 15:19:51 +08:00
Fu Matthew
8592015b1b
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
2013-02-23 15:19:04 +08:00
chris
ad9b91f792
Fix url with id in default widget
2013-02-23 12:20:45 +08:00
Fu Matthew
d6dd38744b
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-23 11:34:47 +08:00
Fu Matthew
9fec7beb47
Merge branch 'development' of github.com:Rulingcom/orbit into development
...
Conflicts:
app/controllers/default_widget_controller.rb
lib/tasks/migrate.rake
2013-02-22 17:53:49 +08:00
Fu Matthew
b315215bed
first version of multi categories and tags
2013-02-22 16:32:05 +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
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +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
39c6660c67
Remove useless code not removed in merge
...
Fix argument bug in link_to_field
2013-02-19 20:42:46 +08:00
chris
d19ba7b1c6
Change css mobile for 3 columns
2013-02-19 18:31:34 +08:00
chris
a9aa1dd150
Fix for path renaming
2013-02-19 18:09:55 +08:00
chris
9e9620c04a
Fix item looking for widget when no front end
2013-02-19 18:09:54 +08:00
chris
6d1f919bb7
Fix links in default widget
2013-02-19 18:09:50 +08:00
chris
6324233f58
Fix breadcrumb again
2013-02-19 17:50:46 +08:00
chris
3e79b787bb
Set default widget sort to created_at
...
Don't use page category when home
2013-02-19 17:49:23 +08:00
chris
ec9c68f039
Remove breadcrumb when home
2013-02-19 17:49:22 +08:00
chris
25d9a3d9b9
Add home to breadcrum
2013-02-19 17:49:22 +08:00
chris
324ab266af
Fix query in default widget for tags
2013-02-19 17:48:07 +08:00
chris
b049e16634
Create part and save pages when layout is edited
2013-02-19 17:48:06 +08:00
chris
c27141ff5a
Fix query for category in default widget
2013-02-19 17:48:04 +08:00
Fu Matthew
5a177f34a8
default widget query for category and tags
2013-02-19 17:45:24 +08:00
chris
a9fecec985
Add pagination to default widget for front end page
2013-02-19 17:41:01 +08:00
chris
c7cf587581
Fix web links html and index query
2013-02-19 17:39:43 +08:00
chris
1f11293fbe
Fix sitemap in page edit
2013-02-19 17:39:43 +08:00
chris
17ac564fbb
Fix sitemap nil
...
Fix namespace of role in subrole
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
chris
2a293734c7
Change breadcrumb html
2013-02-19 17:39:42 +08:00
Rueshyna
bfad8467c8
breadcrumb widget of front-end has done
...
Conflicts:
app/controllers/front_controller.rb
lib/parsers/parser_common.rb
2013-02-19 17:39:42 +08:00
chris
29b8fec89a
Temporary fix: show for default widget
...
- the task migrate:recreate_page_parts must be run
- "create_parts" in page.rb must be unprotected
2013-02-19 17:39:34 +08:00
Rueshyna
bca4478f68
front_end widget breadcrumb done
2013-02-19 17:24:23 +08:00
Rueshyna
2a61470f8b
back_end widget breadcrumb finish
2013-02-19 17:24:19 +08:00
Fu Matthew
0b88f7d1f8
deliver app config. fix wrong value cause error for default widget
2013-02-19 14:21:54 +08:00
Fu Matthew
572e512a1d
fix link for default widget
2013-02-19 14:21:54 +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
96455f31e1
deliver app config. fix wrong value cause error for default widget
2013-02-18 19:04:04 +08:00
Fu Matthew
3a13ab4634
fix link for default widget
2013-02-18 17:03:18 +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
chris
9771d42587
migrate for app config. fix panel style intro misplace
2013-02-04 18:10:39 +08:00
chris
981854870a
Changes for mobile copyright
2013-02-04 18:02:11 +08:00
chris
6eb5061237
Changes for mobile map
2013-02-04 18:02:11 +08:00
chris
e9f2983176
Fix page part kind being removed
2013-02-04 18:02:09 +08:00
chris
b1a11b4dad
Remove isotope
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
b2bc62dadd
fixed orbit bar that like nccu bar now, and add rails version in Gemfile
2013-02-04 18:01:03 +08:00
unknown
0b18cf48e3
member roles edit
2013-02-04 18:01:03 +08:00
unknown
18a51f070e
member roles edit
2013-02-04 18:01:03 +08:00
chris
87a89f81ce
Fix bug for mobile app routes
2013-02-04 18:01:03 +08:00
chris
c33a723a2a
Fix css bug when precompile
2013-02-04 18:01:00 +08:00
Fu Matthew
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +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
fea1726f6d
fix ajax error when edit new page
2013-01-24 13:39:08 +08:00
Fu Matthew
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
Fu Matthew
0cc616f988
page can use default widget
2013-01-21 16:56:37 +08:00
unknown
781a0ad96e
member roles edit
2013-01-18 11:25:11 +08:00
unknown
d0dcd71707
member roles edit
2013-01-18 11:25:11 +08:00
Fu Matthew
9630d0a841
Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface
2013-01-16 14:09:05 +08:00
Fu Matthew
9edf0dca54
ika re-redesign module widget
2013-01-16 14:07:09 +08:00
chris
91830f86aa
Fix bug for mobile app routes
2013-01-16 08:14:42 +08:00
chris
72e26fd92a
Fix css bug when precompile
2013-01-16 02:37:49 +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
ba75c02622
fix wrong behavior of new interface when a new page is newed
2013-01-15 12:02:13 +08:00
Fu Matthew
e1e003af6e
Complete new interface
2013-01-14 19:18:25 +08:00
Fu Matthew
16cfd27fe9
apply view
2013-01-14 19:18:25 +08:00
unknown
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
Fu Matthew
46b1d55ff6
Complete new interface
2013-01-14 18:49:23 +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
Rueshyna
284bf34fec
amend file value to correct format
2013-01-14 17:53:59 +08:00
chris
282604d1fa
Merge branch 'back' of github.com:Rulingcom/orbit into back
...
Conflicts:
app/assets/javascripts/mobile/orbit.mobile.js.erb
app/assets/stylesheets/mobile.css
app/assets/stylesheets/mobile/orbit-mobile.css.erb
app/controllers/application_controller.rb
app/controllers/mobile_controller.rb
app/views/layouts/mobile.mobile.erb
app/views/mobile/_footer.mobile.erb
app/views/mobile/_header.mobile.erb
app/views/mobile/_menu.mobile.erb
app/views/mobile/index.mobile.erb
config/routes.rb
2013-01-14 17:46:27 +08:00
chris
141eb7e723
Add mobile but remove news in it
2013-01-14 17:38:44 +08:00
chris
54d098baf2
Change translation
2013-01-14 17:02:51 +08:00
unknown
84e4a558be
member roles edit
2013-01-14 17:02:51 +08:00
chris
4e2cbac027
Remove bottom padding if no footer in mobile
...
Add a method in routes
Copy mobile routes under the scope 'app' for app usage
2013-01-11 19:14:48 +08:00
chris
91d1487a04
Fix mobile banner, icons, announcement css
2013-01-11 18:34:20 +08:00
chris
d00192f018
Fix for mobile icon and iphone5 fullscreen
2013-01-11 17:00:09 +08:00
chris
5a4f681cfc
Fix the tooltips overflow
2013-01-11 12:24:50 +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
a7d1cdbb75
Fix for link in ad banner
2013-01-11 11:28:13 +08:00
Fu Matthew
92f3be3200
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2013-01-10 18:18:02 +08:00
Fu Matthew
b950ad64c0
fix for fronted editing not responding for announcement.
2013-01-10 18:17:27 +08:00
Fu Matthew
ca51ebc08c
apply view
2013-01-10 18:00:58 +08:00
chris
e24f7a7880
Put back some field so ad_image can work
2013-01-10 11:08:57 +08:00
Rueshyna
08adb887c5
change *default* to *defulat*
2013-01-10 09:40:52 +08:00
chris
c36f3152f5
Changes in css for structure icon and sidebar padding
2013-01-09 21:35:54 +08:00
chris
1c1839fc00
Remove useless code in de_image.rb
2013-01-09 21:17:50 +08:00
chris
02e5e52159
Translation typo
...
Remove test values in ad_image form
Remove NeedReset
2013-01-09 21:17:50 +08:00
chris
48ce2278d0
Update disable time when separated picker new or reset date
2013-01-09 21:17:50 +08:00
chris
b49251afee
Date picker separated: reset time when reset date
2013-01-09 21:17:50 +08:00
chris
1d405c3ffe
Add "tag" icon to orbit bar
2013-01-09 21:17:50 +08:00
chris
d8f6ebb153
Fix icons
2013-01-09 21:17:50 +08:00
chris
7434d36e9b
Ray's changes for icon size
2013-01-09 21:17:50 +08:00
chris
933ac7b8fe
Ray's changes for icon css
2013-01-09 21:17:50 +08:00
chris
41dff814fb
Change icons
2013-01-09 21:17:50 +08:00
Fu Matthew
d0f474c2ab
fix wrong i18n
2013-01-09 17:13:25 +08:00
Fu Matthew
5ab4bbd367
add ad_banner inner page,pic title.
2013-01-09 16:54:33 +08:00
chris
1d80b39dcb
Fix no responding when trying to access front end page
2013-01-09 11:23:18 +08:00
chris
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
Fu Matthew
81d4481797
Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config
2013-01-08 14:18:04 +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
chris
5b13c53ed9
Ika's changes in default_widget.css
2013-01-08 12:50:28 +08:00
chris
e3d34263e3
Schedule job for tag_cloud
2013-01-08 12:36:50 +08:00
chris
423e2ac54e
Update bootstrap version 2.2.2
2013-01-07 17:25:32 +08:00
Fu Matthew
7594e1b9a6
fix member has no module_app
2013-01-07 17:20:37 +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
Rueshyna
a34da20e48
Merge branch 'master' into desktop
...
* master: (57 commits)
Add translations
Add mobile version in site settings
Add mobile but remove news in it
Remove mysql
Fix album widget options
Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
Add link to default widget (temporary)
Ika's fix for width
Ika's fix for width
Gallery i18n
Ika's changes for css default widgets
Ika's changes for css default widgets
change bulletin object to bulletin title
fixing default widget error when needs image
make default widget works without init
Fix order in structure
Fix old tags
correct pic file format
complete page error handler logic
change sub_menu to header in site setting
...
2013-01-07 16:44:05 +08:00
Rueshyna
35e0011111
Merge remote-tracking branch 'remotes/origin/publication' into desktop
...
* remotes/origin/publication:
new desktop framework updates
2013-01-07 12:44:30 +08:00
chris
6c6bda988d
Add mobile version in site settings
2013-01-07 03:57:36 +08:00
chris
37740adb24
Add mobile but remove news in it
2013-01-07 03:03:38 +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
736bda0679
Add link to default widget (temporary)
2013-01-04 12:33:37 +08:00
nccu
ac6da1340a
Ika's fix for width
2013-01-04 12:31:12 +08:00
nccu
ea2d38b23b
Ika's changes for css default widgets
2013-01-04 11:54:58 +08:00
Rueshyna
3e8b029c5f
change bulletin object to bulletin title
2013-01-04 10:50:08 +08:00
Fu Matthew
49e289e0fd
fixing default widget error when needs image
2013-01-03 20:07:05 +08:00
Fu Matthew
39f715319b
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
...
Conflicts:
lib/tasks/migrate.rake
2013-01-03 19:41:52 +08:00
Fu Matthew
a70110f787
make default widget works without init
2013-01-03 19:38:14 +08:00
chris
fa83dbf791
Fix order in structure
2013-01-03 19:15:08 +08:00
chris
5b289bc1d2
Fix old tags
2013-01-03 19:15:08 +08:00
Fu Matthew
1856d2395d
complete page error handler logic
2013-01-03 15:35:14 +08:00
Rueshyna
8e33313b13
Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu
...
* 'ntu' of https://github.com/Rulingcom/orbit :
show error message when trying to show a not existed page
2013-01-03 14:47:18 +08:00
Rueshyna
cb3a9ea98b
change sub_menu to header in site setting
2013-01-03 14:46:02 +08:00
Fu Matthew
6da528ef98
show error message when trying to show a not existed page
2013-01-03 13:50:27 +08:00
Fu Matthew
5d6279a9ea
fix calendar broken
2013-01-03 10:58:52 +08:00
Fu Matthew
2c632551e5
fix preview filed after ad_banner created.
2013-01-02 17:51:53 +08:00
Fu Matthew
32c6f17613
fix object auth. show error message if user try to do object auth in a wrong way.
2013-01-02 14:34:34 +08:00
Fu Matthew
ded1d9f44c
Add lost file for widget option
2012-12-28 17:58:35 +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
4d965d754b
Fix urls in tinymce source editor
2012-12-28 15:03:02 +08:00
chris
455a27437d
Changes for announcement widget style 2
2012-12-28 13:47:30 +08:00
chris
37309a452d
Fix site map and menu order
2012-12-28 11:37:37 +08:00
chris
17d93409b3
Remove extra double quote in sub_menu
...
Fix web link widget pagination
2012-12-28 11:10:33 +08:00
chris
bab8328029
Put back old tags (don't use the class ProtoTag)
2012-12-28 10:43:48 +08:00
chris
ec96a2e0e7
Add page counter
2012-12-28 10:36:18 +08:00
Rueshyna
1c07224694
fixed page_parts submit button
2012-12-28 10:12:17 +08:00
Harry Bomrah
37f8c1637a
new desktop framework updates
2012-12-27 18:25:54 +08:00
Rueshyna
a7cf6dd694
reverse structure order
2012-12-27 17:54:52 +08:00
chris
269e5b033f
Fix for page_part and widget back-end
2012-12-27 16:20:40 +08:00
Fu Matthew
2d6b70b97f
regenerate pageparts
2012-12-27 15:50:05 +08:00
Fu Matthew
2901b8e30c
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-27 15:06:19 +08:00
Fu Matthew
2dd0f9a9d2
fix disappear widget inter block
2012-12-27 15:06:01 +08:00
Rueshyna
9e07794cbc
soft structure order
2012-12-27 14:37:29 +08:00
Rueshyna
34ed8ae39c
Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu
...
* 'ntu' of https://github.com/Rulingcom/orbit :
Preventing site default design being deleted.
2012-12-27 12:22:19 +08:00
Rueshyna
177a409508
fixed search_bar placeholder
2012-12-27 12:20:42 +08:00
Rueshyna
81b0e3c38f
change ActiveSupport::SecureRandom to SecureRandom in orbit core
2012-12-27 12:19:42 +08:00
Fu Matthew
cfb65dd056
Preventing site default design being deleted.
2012-12-27 10:26:27 +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
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
507191426e
Fix submenu error
2012-12-21 14:56:12 +08:00
chris
e9815c3d9b
Fix css bug when precompiling assets
2012-12-20 14:34:02 +08:00
chris
7ac6958690
Fix css bug when precompiling assets
2012-12-20 14:32:06 +08:00
chris
fc076a28bd
Remove useless css
2012-12-20 13:53:28 +08:00
chris
30268ab3bc
Remove useless css
2012-12-20 13:52:23 +08:00
chris
3a9106c10d
Add mobile but remove news in it
2012-12-20 03:21:50 +08:00
chris
d827fbc852
Comment out desktop links
2012-12-19 21:32:55 +08:00
Rueshyna
b4633a2ccb
.not_guest_user
2012-12-19 19:48:13 +08:00
Rueshyna
3d39c2c3c3
hidden guest user
2012-12-19 19:48:13 +08:00
Rueshyna
ec1fad9729
fixed empty name of member list
2012-12-19 19:48:13 +08:00
chris
83fb5230a4
Changes for site map front end indentation
2012-12-19 17:26:38 +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
Harry Bomrah
607a4f5acf
fixed fileview in english mode
2012-12-07 12:38:23 +08:00
Harry Bomrah
9dde79414d
all sections and sections megerd
2012-12-07 12:38:23 +08:00
Matthew K. Fu JuYuan
e07fb7d434
Remove GPRS
2012-12-07 12:36:25 +08:00
chris
a1b1fc9d34
Remove test
2012-12-07 12:32:43 +08:00
chris
ff435a4af4
Change the design for the whole site form designs index
2012-12-07 12:14:31 +08:00
Harry Bomrah
ad8273d638
fixed fileview in english mode
2012-12-07 11:19:40 +08:00
Harry Bomrah
08b99011d0
all sections and sections megerd
2012-12-07 10:10:38 +08:00
chris
c74ead8318
Redirect to designs after buying template
...
Randomise buy counts
2012-12-07 09:07:49 +08:00
Rueshyna
a84cb560a0
make factory girl file clean
2012-12-07 04:21:26 +08:00
Harry Bomrah
59c4080f0c
stupid fix
2012-12-07 04:21:26 +08:00
Harry Bomrah
da3f0b58f5
section fixed and some other fixes
2012-12-07 04:21:26 +08:00
Rueshyna
e87526d7bb
try to fix problem
2012-12-07 04:21:26 +08:00
Harry Bomrah
3d382fec6b
scroll fixed...
2012-12-07 04:21:26 +08:00
Rueshyna
39b5959de7
fixed bug about co-author-relation
2012-12-07 04:21:26 +08:00
devin
89e25fe7a2
view update
2012-12-07 04:21:26 +08:00
chris
af381e75de
Add images to store
2012-12-07 02:37:05 +08:00
chris
6f1748d2b3
- template list/show is loaded from central server
...
- buy a template downloads and creates it in DB
- changes in designs index
2012-12-06 23:20:27 +08:00
OrbitServer
b1f2749000
Devin's changes to integrate the store
2012-12-06 23:11:23 +08:00
OrbitServer
fbed496034
Harry's changes in i18n
2012-12-06 23:08:13 +08:00
Rueshyna
633a68675a
make factory girl file clean
2012-12-06 22:37:42 +08:00
Harry Bomrah
c2285a34f6
stupid fix
2012-12-06 18:50:24 +08:00
Harry Bomrah
8094ddc967
section fixed and some other fixes
2012-12-06 17:43:19 +08:00
Rueshyna
7430a05782
try to fix problem
2012-12-06 16:24:40 +08:00
Harry Bomrah
df4a9a5dff
scroll fixed...
2012-12-06 15:44:16 +08:00
Rueshyna
54de86eeb4
fixed bug about co-author-relation
2012-12-06 15:20:06 +08:00
devin
6a47fc8d62
view update
2012-12-06 11:43:40 +08:00
devin
5d76600154
view update
2012-12-06 07:59:44 +08:00
devin
756bfa563b
view update
2012-12-06 07:59:44 +08:00
devin
22c0eabca5
view update
2012-12-06 07:59:44 +08:00
Harry Bomrah
3d1fb48489
edit coauthor relation done
2012-12-06 07:59:44 +08:00
Rueshyna
4681f0ee36
sort co_author name
2012-12-06 07:59:44 +08:00
Rueshyna
6d08ca996f
add back buton in relation page
2012-12-06 07:59:44 +08:00
Rueshyna
b4a99e58cf
sort author email
2012-12-06 07:59:44 +08:00
devin
59c0cdd761
view update
...
not finish all required pages yet
2012-12-06 07:59:43 +08:00
Rueshyna
b89e371393
can update co-author relation
2012-12-06 07:59:43 +08:00
devin
a0cce2ae0d
view update
2012-12-06 07:59:43 +08:00
Rueshyna
e7fdac1d23
make coauthor relation can be edit
2012-12-06 07:59:43 +08:00
devin
8d110cce91
view update
2012-12-06 07:59:43 +08:00
devin
d413f705a4
view update
2012-12-06 07:59:43 +08:00
devin
363ccdde4d
view update
2012-12-06 07:59:43 +08:00
Harry Bomrah
79dc99d431
br fixed
2012-12-06 07:59:43 +08:00
devin
936101358c
journal update
2012-12-06 07:59:43 +08:00
devin
2aa077bc85
journal list
2012-12-06 07:59:43 +08:00
devin
d03f5dc1ff
view update
2012-12-06 07:59:43 +08:00
Rueshyna
4ae7ac8388
clean route table about desktop
2012-12-06 07:59:42 +08:00
Rueshyna
6c33d353ba
make journal list easy to read
2012-12-06 07:59:42 +08:00
Rueshyna
05027afa63
make journal list easy to read
2012-12-06 07:59:42 +08:00
Rueshyna
4f31b1362b
fixed new co-author relation bug....
2012-12-06 07:59:42 +08:00
Rueshyna
1289ad9f9d
fixed co-author relation bug....
2012-12-06 07:59:42 +08:00
Rueshyna
afd8e7e380
when delete co-author relation, the co-author will be reset nil
2012-12-06 07:59:42 +08:00
Rueshyna
09c59c4e03
midify button type
2012-12-06 07:59:42 +08:00
Rueshyna
21b1432f7f
change settings table default display
2012-12-06 07:59:42 +08:00
Rueshyna
e0e1c30f68
delete onside widget in db
2012-12-06 07:59:42 +08:00
unknown
7d3c535e01
add info field
2012-12-06 07:58:39 +08:00
Matthew K. Fu JuYuan
99f28a0cba
sidebar rewrited
2012-12-05 18:35:58 +08:00
chris
e68c52bc00
Changes for store back-end
2012-12-05 13:46:10 +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
9a79e432dd
Fix typo
2012-12-04 01:12:15 +08:00
chris
2983b181e6
Fix some translations
2012-12-04 01:03:28 +08:00
Harry Bomrah
c6e0b56012
stupid bug fixed
2012-12-04 00:31:46 +08:00
Rueshyna
58e71c29b3
uniq relation
2012-12-04 00:31:46 +08:00
Rueshyna
9759a32394
can display relation between author
2012-12-04 00:31:46 +08:00
Rueshyna
f89a6194c4
add back button
2012-12-04 00:31:46 +08:00
Harry Bomrah
49d1ca6997
new type fixed
2012-12-04 00:31:46 +08:00
Rueshyna
5d6dd8cded
separate relation list from index page and render it
2012-12-04 00:31:46 +08:00
Rueshyna
e143f9a345
can select relection from relation db
2012-12-04 00:31:46 +08:00
Harry Bomrah
0e6c75e677
form for coauthor - fixed
2012-12-04 00:31:07 +08:00
Rueshyna
0affc73370
modify delete co-author message
2012-12-04 00:31:07 +08:00
Harry Bomrah
a6a50227eb
new type fixed
2012-12-04 00:31:07 +08:00
Harry Bomrah
f7f55850fe
coauthor edit and destroy fixed
2012-12-04 00:31:07 +08:00
Rueshyna
7822ffc33d
can add relation between co-author
2012-12-04 00:31:06 +08:00
Rueshyna
5dabfe9319
refine co-authro page
2012-12-04 00:31:06 +08:00
Rueshyna
5986817e16
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
2012-12-04 00:31:06 +08:00
Rueshyna
b1ddc9950a
adjust update password textfield position
2012-12-04 00:31:06 +08:00
Rueshyna
184f903b1c
correct user passwd and sent json to front-end
2012-12-04 00:31:06 +08:00
Rueshyna
8a7ae3f061
correct user passwd and sent json to front-end
2012-12-04 00:31:06 +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
Rueshyna
7f7b33f310
fixed journal update method
2012-12-04 00:31:06 +08:00
Harry Bomrah
ee830f148e
jumping menus updated..
2012-12-04 00:30:10 +08:00
Rueshyna
6426fb74d9
remove edit page cancel buttom
2012-12-04 00:25:58 +08:00
Harry Bomrah
d70ef4666b
delete fixed..
2012-12-04 00:25:58 +08:00
Harry Bomrah
43a9f231a6
multiple file fixed
2012-12-04 00:25:58 +08:00
Rueshyna
d806e8cf82
have done multiple file
2012-12-04 00:25:58 +08:00
Rueshyna
4a0cc61852
can add multiple file
2012-12-04 00:25:58 +08:00
Rueshyna
5a9d9151d9
add journal list template
2012-12-04 00:25:58 +08:00
chris
dc3be3c9a1
Translation changes
2012-12-03 23:00:04 +08:00
chris
9c6c622a49
Add missing icons and css for icons in layout
2012-12-03 22:31:00 +08:00
chris
9254b9960d
Add timeout to user
2012-12-03 21:45:00 +08:00
Matthew K. Fu JuYuan
4bc80f2bd3
default widgets and sidebar.
2012-12-03 18:52:36 +08:00
chris
4f9aa63045
Remove extra end
2012-12-03 18:45:32 +08:00
chris
5c7f1aa164
Fix saving of page_part after layout change
2012-12-03 18:42:50 +08:00
chris
2757044c32
Forgot to save the page_parts
2012-12-03 17:49:26 +08:00
chris
bdcfb46294
Fix previous commit
2012-12-03 17:38:55 +08:00
chris
6543491a53
Save pages to generate page_parts when a layout is updated
2012-12-03 17:25:27 +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
036d7bbb0e
Module store
2012-11-29 02:02:37 +08:00
chris
06335f9bd1
Joshua's html
2012-11-29 00:59:46 +08:00
chris
390da0e49a
Change icons
2012-11-29 00:49:53 +08:00
Rueshyna
9e2d6cfcdd
add quick link to change user password, but it's not work
2012-11-28 23:44:43 +08:00
Rueshyna
6ed1dd0cc6
change template
2012-11-28 23:43:39 +08:00
Rueshyna
7853aec886
Merge branch 'publication' into multiple_file_upload
...
* publication:
url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:19:06 +08:00
Rueshyna
6d159a3a9e
add templete
2012-11-28 18:12:37 +08:00
Rueshyna
254a81fa5d
add templete
2012-11-28 18:12:21 +08:00
Harry Bomrah
2f67a96532
url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:12:00 +08:00
Rueshyna
25324809bb
add account link
2012-11-28 14:42:15 +08:00
Harry Bomrah
9cc518b456
autocomplete done
2012-11-27 15:55:32 +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
Rueshyna
c9e3d5271a
remove '"' candidate list
2012-11-26 16:06:22 +08:00
Rueshyna
0125010a05
modified error msgs and cancle button, but those two have bug...
2012-11-26 15:45:51 +08:00
Rueshyna
065d38c797
add autocomplete js
2012-11-26 14:44:35 +08:00
unknown
8a79d7ff2e
member selects
2012-11-26 10:25:34 +08:00
Rueshyna
9061448c5f
add paper status textfield
2012-11-26 10:23:50 +08:00
Matthew K. Fu JuYuan
9a684f54b4
fix for showing subroles
2012-11-26 10:22:36 +08:00
chris
1e89c30150
Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
2012-11-26 05:02:58 +08:00
Harry Bomrah
3933c048b0
delete fixed
2012-11-23 13:22:01 +08:00
Rueshyna
8009c6aa34
fixed delete function
2012-11-23 12:28:36 +08:00
Rueshyna
e06495d4ad
Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
...
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit :
delete update
2012-11-23 10:50:10 +08:00
Harry Bomrah
f38f32ac8b
delete update
2012-11-23 10:46:42 +08:00
Rueshyna
996a69f595
add co-author json
2012-11-23 10:44:48 +08:00
Matthew K. Fu JuYuan
5b39d10ac6
user roles starts
2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
Rueshyna
f6d3b4a9e9
correct 'edit' button of journal list
2012-11-22 21:06:31 +08:00
Harry Bomrah
868d1c2201
fix for json and some other bugs
2012-11-22 21:06:30 +08:00
Rueshyna
e29583ed1f
add delete link
2012-11-22 21:06:30 +08:00
Rueshyna
78500e0661
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 21:06:30 +08:00
Rueshyna
c281ae9447
hidden file field, and fixed updated function
2012-11-22 21:06:30 +08:00
Rueshyna
9189ebffee
correct 'edit' button of journal list
2012-11-22 18:15:07 +08:00
Harry Bomrah
90fd9de5a8
fix for json and some other bugs
2012-11-22 16:31:52 +08:00
Rueshyna
e453cfce9c
add delete link
2012-11-22 15:21:43 +08:00
Rueshyna
c0ac69fc84
Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
...
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit :
calendar js minor update
Fix: - Widgets for announcement - Facebook link - AdBanner nav
visitor now can browse gallery
routes fixed
small fix for journal_pages desktop
new file created for journal pages
tmp
add co-author db and curd page, but it can't destory it...
add co-author page and new it, but can't destory it...
visitor now can browse gallery
done add journals function
fix and hide for visitors,except for album
album and gallery is now opened
fixed sutpid bug for calendar
back button fix for frontend
fix and hide for visitors,except for album
calendar js minor update
minor update for gallery and calendar backend
2012-11-22 10:51:30 +08:00
Rueshyna
9e400e6e6a
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 10:49:54 +08:00
chris
39adbb35c1
Remove before_filter for sub_manager in users
2012-11-22 09:37:31 +08:00
chris
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
Rueshyna
bb69a059e8
hidden file field, and fixed updated function
2012-11-22 02:37:56 +08:00
chris
2d0e8b37b2
Fix:
...
- Widgets for announcement
- Facebook link
- AdBanner nav
2012-11-21 18:42:14 +08:00
chris
6ca52226ba
Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
...
Conflicts:
app/views/desktop/journal_p.html.erb
2012-11-21 18:38:28 +08:00
Harry Bomrah
73e76f2477
routes fixed
2012-11-21 18:36:56 +08:00
Harry Bomrah
c53581c999
small fix for journal_pages desktop
2012-11-21 18:36:56 +08:00
Harry Bomrah
0b9af044ba
new file created for journal pages
2012-11-21 18:36:56 +08:00
Rueshyna
b47be52309
tmp
2012-11-21 18:36:56 +08:00
Rueshyna
d502f561ef
add co-author db and curd page, but it can't destory it...
2012-11-21 18:36:32 +08:00
Rueshyna
6a9426c9c8
add co-author page and new it, but can't destory it...
2012-11-21 18:36:32 +08:00
Rueshyna
5006cd2f61
done add journals function
2012-11-21 18:34:03 +08:00
Matthew K. Fu JuYuan
1279af0c11
fix and hide for visitors,except for album
2012-11-21 18:31:57 +08:00
Harry Bomrah
91005bb00a
routes fixed
2012-11-21 17:39:01 +08:00
Harry Bomrah
c94940214c
small fix for journal_pages desktop
2012-11-21 17:11:18 +08:00
Harry Bomrah
b571373c8f
new file created for journal pages
2012-11-21 15:35:23 +08:00
Rueshyna
5c0b137c6d
tmp
2012-11-21 14:52:26 +08:00
Rueshyna
da1b871481
merge
2012-11-21 10:46:33 +08:00
Harry Bomrah
8f65284932
Desktop updates various
2012-11-21 07:37:44 +08:00
Rueshyna
b359d5d566
some bugs
2012-11-21 07:37:44 +08:00
Rueshyna
703324063e
change journal list json link
2012-11-21 07:37:44 +08:00
Rueshyna
d7599f1ccf
add edit function
2012-11-21 07:37:43 +08:00
Rueshyna
a3edebce6a
midify checkbox value
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
Rueshyna
7e9b60a527
split form from add.html.erb
2012-11-21 07:37:43 +08:00
Rueshyna
fe373fad92
add.html convert to add.html.erb done
2012-11-21 07:37:43 +08:00
Rueshyna
ae10a2b8a2
convert html template to html.erb
2012-11-21 07:37:43 +08:00
Rueshyna
1c6badfb10
add more fake data
2012-11-21 07:37:43 +08:00
Rueshyna
b6004958c9
make it real
2012-11-21 07:37:43 +08:00
Rueshyna
bf4c75fcdc
add new function
2012-11-21 07:37:43 +08:00
Rueshyna
f93d019ba0
check file type
2012-11-21 07:37:42 +08:00
Rueshyna
61c0c4b542
modified file of view bug
2012-11-21 07:37:42 +08:00
Harry Bomrah
97ffb5ff18
file view update
2012-11-21 07:37:42 +08:00
Rueshyna
02643c12bf
modified getjournals format
2012-11-21 07:37:41 +08:00
Rueshyna
5643b0a528
delete demo db of journal and paper
2012-11-21 07:37:41 +08:00
Rueshyna
4ce10d2fd9
make a json format for view of journal_p
2012-11-21 07:37:41 +08:00
Rueshyna
95fc5676bf
add co-author db and curd page, but it can't destory it...
2012-11-21 01:56:30 +08:00
Rueshyna
ccfecb8243
add co-author page and new it, but can't destory it...
2012-11-21 01:54:06 +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
6273300c28
Fix for ad_image
2012-11-20 15:47:07 +08:00
Rueshyna
95a3831dce
done add journals function
2012-11-20 14:58:15 +08:00
chris
7416020161
Add force_order_for_user for ad_images
2012-11-20 14:24:49 +08:00
chris
c8bbb28d42
Fix wrong alias in design.rb for themes
2012-11-20 12:46:50 +08:00
chris
84c284fa71
Fix wrong naming in theme.rb
2012-11-20 12:42:53 +08:00
chris
dcd781b36b
Restore "force_order_for_user" for ad_banner
2012-11-20 12:38:35 +08:00
chris
d61621e198
Remove some pry and add address code
2012-11-20 10:05:38 +08:00
chris
6789d44431
Fix design edit
2012-11-20 10:04:50 +08:00
Matthew K. Fu JuYuan
2aa9a19deb
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan
17988f2fb2
address field and text field convert
2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan
a85e5fcc0d
address field. js and style is broken
2012-11-20 09:53:36 +08:00
Matthew K. Fu JuYuan
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
Rueshyna
398432d0fc
some bugs
2012-11-19 16:28:05 +08:00
Rueshyna
db3797694b
change journal list json link
2012-11-19 12:13:05 +08:00
Rueshyna
8abb20b4c8
add edit function
2012-11-19 12:07:24 +08:00
Rueshyna
9501bf2df3
midify checkbox value
2012-11-18 14:15:00 +08:00
Rueshyna
26436395f5
finished some method of list and journal
2012-11-18 03:07:50 +08:00
Rueshyna
024b331cf3
split form from add.html.erb
2012-11-16 16:02:17 +08:00
Matthew K. Fu JuYuan
b4a2737407
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/helpers/attribute_fields_helper.rb
app/views/admin/infos/_form.html.erb
config/locales/zh_tw.yml
2012-11-16 15:42:39 +08:00
Matthew K. Fu JuYuan
3034e53423
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-16 15:36:08 +08:00
Rueshyna
e60480a4be
add.html convert to add.html.erb done
2012-11-16 15:33:31 +08:00
Rueshyna
b51397d2e2
convert html template to html.erb
2012-11-16 12:54:21 +08:00
Rueshyna
c85b15e425
rm binding.pre ...
2012-11-16 09:44:57 +08:00
Rueshyna
34f0eea1ff
add more fake data
2012-11-16 09:13:51 +08:00
Rueshyna
b998b8f346
make it real
2012-11-16 01:54:10 +08:00
Rueshyna
bf5a48ef4c
add new function
2012-11-16 01:53:45 +08:00
Rueshyna
3144b84d10
check file type
2012-11-15 22:39:01 +08:00
chris
69bf552fa7
Fix: remove i18n_variable from reload_frontend_pages.js.erb
2012-11-15 18:11:01 +08:00
chris
fb74d74c72
Fix:
...
- page_part not including items_helper
- categories for bulletins front-end
2012-11-15 18:01:49 +08:00
Matthew K. Fu JuYuan
995bdbc86c
address field and text field convert
2012-11-15 17:23:39 +08:00
chris
9b1ada0af9
Fix these bugs:
...
1.結構部份
a.原選單,點選編輯,無動作反應
b.新增選單後,左邊灰色架構部份不會更新
2.檔案室
a.無法編輯分類
2012-11-15 15:51:44 +08:00
Rueshyna
c627376fbe
modified file of view bug
2012-11-15 11:18:55 +08:00
Harry Bomrah
351767cd98
file view update
2012-11-14 21:12:10 +08:00
Rueshyna
529e2110d7
modified getjournals format
2012-11-14 17:27:36 +08:00
Rueshyna
11b602a1bf
delete demo db of journal and paper
2012-11-13 17:22:25 +08:00
Rueshyna
bfdd155c1e
make a json format for view of journal_p
2012-11-13 17:21:23 +08:00
Harry Bomrah
e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
Harry Bomrah
a56d80698f
desktop api update..
2012-11-12 15:11:36 +08:00
Matthew K. Fu JuYuan
39612b879c
address field. js and style is broken
2012-11-12 10:41:41 +08:00
Matthew K. Fu JuYuan
dafe28ffb5
add_more ok
2012-11-08 18:59:19 +08:00
chris
43d969a72b
Fix attribute_field_helper and comment admin in I18n
2012-11-06 17:51:42 +08:00
chris
23e86bfe31
Fix bug due to change of structure for stylesheet
2012-11-06 12:33:00 +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
Harry Bomrah
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
Harry Bomrah
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
Harry Bomrah
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
chris
58d4554b0b
Fixing bugs
2012-11-05 11:30:15 +08:00
Matthew K. Fu JuYuan
e47465d4b7
add new member with role interface. add more not usable.
...
role management new attribute is ok. delete is ok.
2012-11-04 05:56:29 +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
chris
bc9082a858
Fix bug: Fix the bug due to not finding the ModuleApp
2012-10-30 17:10:59 +08:00
chris
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +08:00
Matthew K. Fu JuYuan
664c6d2f61
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.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/back_end/writing_patents/_form_file.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb
2012-10-30 10:11:51 +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
chris
9b5f4e4775
Fix bug: User cannot connect using the orbit button (Devise configuration)
2012-10-26 17:42:14 +08:00