saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,986 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

1986 Commits

Author SHA1 Message Date
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
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
chris 43d969a72b Fix attribute_field_helper and comment admin in I18n 2012-11-06 17:51:42 +08:00
chris 12f5d93e1a Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-11-06 12:35:34 +08:00
Harry Bomrah eaf465525a rake update 2012-11-06 12:35:15 +08:00
chris 23e86bfe31 Fix bug due to change of structure for stylesheet 2012-11-06 12:33:00 +08:00
Harry Bomrah 16e5473418 rake update 2012-11-06 12:21:09 +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 159e41639d Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-11-06 10:36:52 +08:00
Harry Bomrah da5e7f670e Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
chris 3c85f3ef00 Make the archive module work (it needs more details) 2012-11-06 10:35:11 +08:00
Harry Bomrah f68fe22cba Desktop Widgtes updates.. 2012-11-05 23:04:54 +08:00
chris 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
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 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
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 58d4554b0b Fixing bugs 2012-11-05 11:30:15 +08:00
Rueshyna 9f3c3f0d7e add link of title 2012-11-05 10:37:04 +08:00
Rueshyna 3d5274a6f9 add announcement plugin 2012-11-04 22:05:03 +08:00
Rueshyna 0e1f3d81d1 relpace tab with sapce 2012-11-04 22:04:13 +08:00
chris 6783844937 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-11-04 20:43:23 +08:00
Matthew K. Fu JuYuan beb843f75b add new member with role interface. add more not usable. 
role management new attribute is ok. delete is ok.
 2012-11-04 20:42:58 +08:00
chris fe0e49c3e9 Remove a folder in wich Chinese characters 2012-11-04 20:32:54 +08:00
chris be08682c6b Merge branch 'new' of github.com:Rulingcom/orbit into new 2012-11-04 20:25:05 +08:00
unknown bd17641d18 member plugin list add new 2012-11-04 20:24:36 +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
unknown 2f61b3e0c9 member plugin list add new 2012-11-02 18:28:23 +08:00
Rueshyna f61a81ab56 done journal 2012-11-02 16:31:41 +08:00
Harry Bomrah 28337c6b5b update for desktop widgets 2012-11-01 20:42:40 +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