 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 |
|