1186 Commits

Author	SHA1	Message	Date
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
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
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
chris	9b1ada0af9	Fix these bugs: ... 1.結構部份 a.原選單，點選編輯，無動作反應 b.新增選單後，左邊灰色架構部份不會更新 2.檔案室 a.無法編輯分類	2012-11-15 15:51:44 +08:00