scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 10:06:53 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/assets/javascripts
History
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
..
experiments Merge pull request #85 from ZmagoD/zd_SCI_360 2016-08-23 16:24:22 +02:00
my_modules Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
projects Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
protocols Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
reports Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
results Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
samples fixes notifications appearance and disappearance and content adjustment 2016-08-19 10:48:43 +02:00
sitewide Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
users Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
application.js Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
assets.js set ajax for workflow img 2016-08-19 15:36:12 +02:00
comments.js Display "no comments" if you delete the last comment 2016-08-25 17:01:30 +02:00
custom_fields.js Initial commit. 2016-02-12 16:52:43 +01:00
direct-upload.js Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
my_modules.js Revert 2 files that contained no changes 2016-08-25 13:51:30 +02:00
navigation.js Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
organizations.js Initial commit. 2016-02-12 16:52:43 +01:00
project_activities.js Initial commit. 2016-02-12 16:52:43 +01:00
sidebar.js Initial commit. 2016-02-12 16:52:43 +01:00
step_comments.js Initial commit. 2016-02-12 16:52:43 +01:00
user_my_modules.js Initial commit. 2016-02-12 16:52:43 +01:00