nccu
|
ea2d38b23b
|
Ika's changes for css default widgets
|
2013-01-04 11:54:58 +08:00 |
Fu Matthew
|
2c632551e5
|
fix preview filed after ad_banner created.
|
2013-01-02 17:51:53 +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 |
Harry Bomrah
|
37f8c1637a
|
new desktop framework updates
|
2012-12-27 18:25:54 +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
|
fcbba6660b
|
Only one parser for front end
Separate site map for i18n
|
2012-12-19 17:15:31 +08:00 |
chris
|
acaf707900
|
Merge branch 'publication' of github.com:Rulingcom/orbit into publication
|
2012-12-07 11:22:06 +08:00 |
Harry Bomrah
|
ad8273d638
|
fixed fileview in english mode
|
2012-12-07 11:19:40 +08:00 |
chris
|
4d07b0753c
|
Merge branch 'publication' of github.com:Rulingcom/orbit into publication
|
2012-12-07 10:13:41 +08:00 |
Harry Bomrah
|
08b99011d0
|
all sections and sections megerd
|
2012-12-07 10:10:38 +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 |
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 |
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 |
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 |
devin
|
59c0cdd761
|
view update
not finish all required pages yet
|
2012-12-06 07:59:43 +08:00 |
devin
|
a0cce2ae0d
|
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
|
d03f5dc1ff
|
view update
|
2012-12-06 07:59:43 +08:00 |
chris
|
e68c52bc00
|
Changes for store back-end
|
2012-12-05 13:46:10 +08:00 |
Harry Bomrah
|
c6e0b56012
|
stupid bug fixed
|
2012-12-04 00:31:46 +08:00 |
Harry Bomrah
|
49d1ca6997
|
new type fixed
|
2012-12-04 00:31:46 +08:00 |
Harry Bomrah
|
0e6c75e677
|
form for coauthor - fixed
|
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
|
5986817e16
|
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
|
2012-12-04 00:31:06 +08:00 |
Harry Bomrah
|
ee830f148e
|
jumping menus updated..
|
2012-12-04 00:30:10 +08:00 |
chris
|
9c6c622a49
|
Add missing icons and css for icons in layout
|
2012-12-03 22:31:00 +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 |
Harry Bomrah
|
2f67a96532
|
url fixed and edit form fixed for tinyscrollbar
|
2012-11-28 18:12:00 +08:00 |
Harry Bomrah
|
9cc518b456
|
autocomplete done
|
2012-11-27 15:55:32 +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 |
Harry Bomrah
|
f38f32ac8b
|
delete update
|
2012-11-23 10:46:42 +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
|
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
|
9e400e6e6a
|
fixed add journal and co-author curd problem, but have redirect problem...
|
2012-11-22 10:49:54 +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 |
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
|
6a9426c9c8
|
add co-author page and new it, but can't destory it...
|
2012-11-21 18:36:32 +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
|
703324063e
|
change journal list json link
|
2012-11-21 07:37:44 +08:00 |
Rueshyna
|
5eb8cc4063
|
finished some method of list and journal
|
2012-11-21 07:37:43 +08:00 |
Rueshyna
|
1c6badfb10
|
add more fake data
|
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
|
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
|
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 |
Rueshyna
|
db3797694b
|
change journal list json link
|
2012-11-19 12:13:05 +08:00 |
Rueshyna
|
26436395f5
|
finished some method of list and journal
|
2012-11-18 03:07:50 +08:00 |
Rueshyna
|
34f0eea1ff
|
add more fake data
|
2012-11-16 09:13:51 +08:00 |
Rueshyna
|
3144b84d10
|
check file type
|
2012-11-15 22:39:01 +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 |
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 |
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 |