34f0eea1ff
add more fake data
2012-11-16 09:13:51 +08:00
b998b8f346
make it real
2012-11-16 01:54:10 +08:00
bf5a48ef4c
add new function
2012-11-16 01:53:45 +08:00
27ed7c74dd
add fake data, execute by rake db:seed
2012-11-16 01:53:17 +08:00
3144b84d10
check file type
2012-11-15 22:39:01 +08:00
c627376fbe
modified file of view bug
2012-11-15 11:18:55 +08:00
e9f3b45ce8
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 :
file view update
2012-11-15 10:05:21 +08:00
351767cd98
file view update
2012-11-14 21:12:10 +08:00
529e2110d7
modified getjournals format
2012-11-14 17:27:36 +08:00
11b602a1bf
delete demo db of journal and paper
2012-11-13 17:22:25 +08:00
bfdd155c1e
make a json format for view of journal_p
2012-11-13 17:21:23 +08:00
1ecb8a0c8b
Merge branch 'master' of https://github.com/Rulingcom/orbit
...
* 'master' of https://github.com/Rulingcom/orbit :
desktopAPI update.
desktop api update..
calendar "edit calendar" update
change host with host_with_port
get_album_json function can get readable json
make json readable
make json readable
fixed get_bulletins_json of gprs bug
desktopAPI update.
desktop api update..
fixed language of announcement filter
add get_bulletins_json function
refine the location module done
Refine the location module, but it have some bugs about path ...
all of user can get json of gprs from outside
all of user can get json of gallery from outside
calendar "edit calendar" update
2012-11-12 15:24:24 +08:00
e8bd06307d
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-11-12 15:11:54 +08:00
e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
a56d80698f
desktop api update..
2012-11-12 15:11:36 +08:00
e5d31f50a0
calendar "edit calendar" update
2012-11-12 15:11:36 +08:00
295aef32ab
change host with host_with_port
2012-11-09 16:31:36 +08:00
275c6f4c8a
get_album_json function can get readable json
2012-11-09 16:25:11 +08:00
e4de229b22
make json readable
2012-11-09 16:24:37 +08:00
624d12de6d
make json readable
2012-11-09 16:24:23 +08:00
80abfc80bf
fixed get_bulletins_json of gprs bug
2012-11-09 10:41:49 +08:00
5fb32f3867
desktopAPI update.
2012-11-08 19:42:22 +08:00
b1d808cb86
Merge branch 'gallery_orbit' into desktop_devin
2012-11-08 17:05:49 +08:00
e45502cd68
desktop api update..
2012-11-08 17:02:10 +08:00
7595e20d0c
fixed language of announcement filter
2012-11-08 16:01:08 +08:00
800279ea69
add get_bulletins_json function
2012-11-08 15:56:14 +08:00
e6a9555dd8
refine the location module done
2012-11-08 12:34:26 +08:00
dbfc70e520
Refine the location module, but it have some bugs about path ...
2012-11-08 01:26:33 +08:00
11fefa100f
all of user can get json of gprs from outside
2012-11-08 01:24:37 +08:00
b4f5a0b04b
all of user can get json of gallery from outside
2012-11-08 01:24:01 +08:00
43d969a72b
Fix attribute_field_helper and comment admin in I18n
2012-11-06 17:51:42 +08:00
12f5d93e1a
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-11-06 12:35:34 +08:00
eaf465525a
rake update
2012-11-06 12:35:15 +08:00
23e86bfe31
Fix bug due to change of structure for stylesheet
2012-11-06 12:33:00 +08:00
16e5473418
rake update
2012-11-06 12:21:09 +08:00
b40d4702d5
Merge branch 'master' into various_bugs
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
159e41639d
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
2012-11-06 10:36:52 +08:00
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
3c85f3ef00
Make the archive module work (it needs more details)
2012-11-06 10:35:11 +08:00
f68fe22cba
Desktop Widgtes updates..
2012-11-05 23:04:54 +08:00
73fd9d1f97
Merge branch 'modified_show_plugin_profile' of github.com:Rulingcom/orbit into modified_show_plugin_profile
2012-11-05 11:43:00 +08:00
c314745545
add link of title
2012-11-05 11:42:50 +08:00
e4de1e34a2
add announcement plugin
2012-11-05 11:42:50 +08:00
9433d59c04
relpace tab with sapce
2012-11-05 11:42:49 +08:00
ed3644fb89
done journal
2012-11-05 11:42:49 +08:00
a5e2c3e0ce
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
2012-11-05 11:41:48 +08:00
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
228d43d0e2
calendar update
2012-11-05 11:40:11 +08:00
6dd9f441ef
Agenda View
2012-11-05 11:40:11 +08:00
Rueshyna
Harry Bomrah
chris
devin