123
/
seminar
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40 Commits 2 Branches 0 Tags 74 MiB
Commit Graph

40 Commits

Author SHA1 Message Date
chiu 4734906e5f Merge branch 'master' into 'master' 
add auto send email feature



See merge request !3
 2020-03-11 12:05:07 +08:00
chiu 9203dbdb93 fix error for new in admin page 2020-03-11 12:01:52 +08:00
chiu 125a0879ec fix sort error 2020-01-22 21:52:32 +08:00
chiu e67cb911de remove puts 2020-01-12 14:59:32 +08:00
chiu c1866d5690 remove puts 2020-01-12 14:58:41 +08:00
chiu b0d1ae2951 remove puts 2020-01-12 14:57:33 +08:00
chiu 446da7bf3a add the auto send email feature 2020-01-12 14:39:32 +08:00
wmcheng 5acd0429fb Merge branch 'master' into 'master' 
Master



See merge request !2
 2019-12-31 01:42:43 +08:00
chiu 1c3f2e7ec8 fix style error for add_file 2019-12-30 15:49:59 +08:00
chiu 57167f9d08 fix new error 2019-12-30 13:11:46 +08:00
chiu 28b824f018 fix error 2019-11-28 12:39:36 +08:00
chiu 454723887d add some feature and fix some problem for using for convinient 2019-11-26 23:52:52 +08:00
chiu 6b1fa23265 fix the problem that file being deleted by js in orbit4-5 2019-11-19 17:35:00 +08:00
wmcheng 6cef729150 Merge branch 'master' into 'master' 
Master

fix error

See merge request !1
 2019-11-13 12:19:06 +08:00
chiu ccea066ecc fix errors 2019-11-13 12:07:16 +08:00
chiu 8efa1fc2c5 fix error 2019-11-13 11:40:24 +08:00
chiu fc737ec6a8 fix some error 2019-11-13 11:36:06 +08:00
chiu 51a6af8443 Update edit_file.html.erb 
add ckeditor for file_note
 2019-11-13 00:15:18 +08:00
EricTYL 45483f458f Merge branch 'master' into 'master' 
update sign up success locale message

update sign up success locale message

See merge request !4
 2019-11-11 14:30:48 +08:00
EricTYL 0bd8a87ca2 update sign up success locale message 2019-11-11 14:28:58 +08:00
EricTYL c2471503e9 Merge branch 'master' into 'master' 
add password message

add password message

See merge request !3
 2019-11-11 13:38:09 +08:00
EricTYL 13a8b92003 add password message 2019-11-11 13:36:56 +08:00
EricTYL a50500b8a4 Merge branch 'master' into 'master' 
add missing en locale config

add missing en locale config

See merge request !2
 2019-11-11 12:14:16 +08:00
EricTYL 3a3c62bd78 add missing en locale config 2019-11-11 12:13:21 +08:00
EricTYL b73ec97ede Merge branch 'master' into 'master' 
Update English locale config

Update English locale config # project_root/config/en.yml

See merge request !1
 2019-11-11 11:13:22 +08:00
EricTYL ec8c11e5ed remove unwanted spaces 2019-11-11 11:11:31 +08:00
EricTYL 2fdf97fcb9 update en locale config 2019-11-11 11:10:08 +08:00
chiu 606e438fb8 Update add_file.html.erb 
fix error
 2019-10-29 23:14:38 +08:00
chiu ad7bebecee Update con_upload.html.erb 
fix error
 2019-10-29 23:14:20 +08:00
chiu e7a0d13a38 Update seminars_controller.rb 
fix error
 2019-10-29 23:13:52 +08:00
chiu 8edb6de807 Update seminars_controller.rb 
fix error
 2019-10-29 22:45:42 +08:00
chiu 32b89b1dd7 Update show_data.html.erb 
fix error
 2019-10-29 22:01:05 +08:00
chiu 7814c23c92 Update seminars_controller.rb 
fix error
 2019-10-29 22:00:31 +08:00
chiu 60b15e4a4d Update seminars_controller.rb 
fix error
 2019-10-28 21:19:15 +08:00
chiu e8af319429 Update show_data.html.erb 
fix error
 2019-10-28 21:12:56 +08:00
chiu 41ca98636d add reviwer field in admin's form 2019-10-05 00:11:39 +08:00
Harry Bomrah 4d0ba23f55 form date fields fix 2016-08-04 16:33:25 +08:00
Harry Bomrah 18076d343d gotcha verification 2016-08-04 16:25:40 +08:00
Harry Bomrah df953bda4b lot of modifications made to make it work 2016-08-04 15:58:35 +08:00
IT 52d3581130 first commit for seminar 2016-06-29 14:57:45 +08:00