Commit Graph

347 Commits

Author SHA1 Message Date
chiu d9d37e847b remove rm 2020-02-21 09:17:18 +08:00
chiu a870595a2f Merge branch 'master' into 'master'
fix nil error



See merge request !9
2020-02-10 19:43:05 +08:00
chiu 8414cee650 fix nil error 2020-02-10 19:42:44 +08:00
EricTYL 8da83ec1c0 Merge branch 'master' into 'master'
add form_to_start & form_to_end for import method

add form_to_start & form_to_end for import method

See merge request !8
2020-01-20 15:54:26 +08:00
EricTYL 605c0374c5 remove notice 2020-01-20 15:50:55 +08:00
EricTYL db8b0311a6 remove trailing space 2020-01-20 10:25:26 +08:00
EricTYL 7c36fc514d add form_to_start & form_to_end to import method 2020-01-20 10:22:42 +08:00
EricTYL 3fb13a59b2 Merge branch 'master' into 'master'
add link to member show page / add missing attributes for xlsx templates

* add link to member show page  
* add missing attributes for xlsx templates

See merge request !7
2020-01-17 18:02:22 +08:00
EricTYL 7ba8a128ff add link to member show page 2020-01-15 17:03:19 +08:00
EricTYL 4d62acaf8c add missing attributes for xlsx templates 2020-01-15 16:40:31 +08:00
wmcheng a7d031f0c6 Merge branch 'master' into 'master'
fix link error



See merge request !6
2019-11-18 15:33:40 +08:00
chiu 51007ebc63 fix link error 2019-11-16 13:55:17 +08:00
wmcheng 7be5334673 Merge branch 'master' into 'master'
fix showing author error for admin's index



See merge request !5
2019-11-13 13:36:55 +08:00
chiu 9cb1e1d736 Update _writing_journal.html.erb
fix showing author error
2019-11-13 13:13:11 +08:00
chiu c752928e49 Update journal_papers_helper.rb
add get_member_show method
2019-11-13 13:11:47 +08:00
wmcheng 76b8a4c08b Merge branch 'master' into 'master'
fix the problem of multiple creating data when multiple authors are add



See merge request !4
2019-11-05 23:51:55 +08:00
chiu 4a64893c59 Update journal_paper.rb
remove puts
2019-11-05 22:53:17 +08:00
chiu 0a179503d6 Update journal_papers_controller.rb 2019-11-05 21:59:31 +08:00
chiu 0f1f7c7b90 fix the problem of multiple creating data when multiple authors are add 2019-11-05 21:39:46 +08:00
wmcheng 295b6cbf0f Merge branch 'master' into 'master'
Update personal_journal.gemspec,add patchfile module

add patchfile module to built_in_extensions.rb

See merge request !3
2019-10-01 10:54:21 +08:00
chiu 8c2971f2e3 Update personal_journal.gemspec,add patchfile module 2019-10-01 00:26:14 +08:00
wmcheng 710b9e862c Merge branch 'master' into 'master'
Master

add update modules feature and fix error

See merge request !2
2019-08-21 23:59:14 +08:00
chiu e1293a4e7e Update personal_journal.gemspec 2019-08-21 17:22:22 +08:00
chiu a062bccc56 Update personal_journals_controller.rb 2019-08-21 17:09:53 +08:00
chiu ee2311c1ab Update personal_journals_controller.rb 2019-08-21 17:08:29 +08:00
chiu fbee8509c1 Update personal_journal.gemspec 2019-08-21 17:08:03 +08:00
chiu 201ad7fc0e Update personal_journal.gemspec 2019-08-21 14:55:40 +08:00
chiu 36bed2c915 Update personal_journal.gemspec
finish
2019-08-21 14:45:14 +08:00
chiu 87280ee392 Update personal_journal.gemspec 2019-08-21 14:41:43 +08:00
chiu 7a74e7f213 Update personal_journal.gemspec
fix
2019-08-21 14:39:32 +08:00
chiu 8388c34df4 Update personal_journal.gemspec 2019-08-21 14:37:26 +08:00
chiu 5c94d45efc Update personal_journal.gemspec 2019-08-21 14:36:05 +08:00
chiu 1117750c7f Update personal_journal.gemspec 2019-08-21 14:35:20 +08:00
chiu c32df91875 Update personal_journal.gemspec 2019-08-21 14:33:37 +08:00
chiu 29cce67895 Update personal_journal.gemspec 2019-08-21 14:31:48 +08:00
chiu 0114c0c7c8 Update personal_journal.gemspec 2019-08-21 14:30:40 +08:00
chiu e9e7616a04 Update personal_journal.gemspec
fix?
2019-08-21 14:28:13 +08:00
chiu 1466469da8 Update personal_journal.gemspec
fix
2019-08-21 14:24:49 +08:00
chiu daeaa7342b Update personal_journal.gemspec 2019-08-21 14:23:53 +08:00
chiu 5d733ba161 Update personal_journal.gemspec
fix
2019-08-21 14:21:35 +08:00
chiu 22f3e2d4b2 Update personal_journal.gemspec
fix
2019-08-21 14:20:31 +08:00
chiu 9be58cc7f3 Update personal_journal.gemspec 2019-08-21 14:19:11 +08:00
chiu 0213304a02 Update personal_journal.gemspec 2019-08-21 14:06:28 +08:00
chiu 862012a8c4 Update personal_journal.gemspec
add copy feature
2019-08-21 14:01:12 +08:00
chiu 1ed81c2fb7 Update personal_journal.gemspec 2019-08-21 13:51:18 +08:00
chiu d5a6fb612a Update personal_journal.gemspec 2019-08-21 13:49:08 +08:00
chiu 38030d09ab Update personal_journal.gemspec 2019-08-21 13:25:27 +08:00
chiu c1afc28c61 Update personal_journal.gemspec 2019-08-21 13:21:43 +08:00
chiu 5cd0622d88 Update personal_journal.gemspec 2019-08-21 13:20:02 +08:00
chiu 4c8d54f86c Update personal_journal.gemspec 2019-08-21 13:19:11 +08:00