scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-19 23:51:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
14675 commits 31 branches 181 tags 166 MiB
Commit graph

144 commits

Author SHA1 Message Date
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
Oleksii Kriuchykhin
8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +01:00
aignatov-bio
e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio
50714eb59d Disable inventories table initialization on turbolinks preview 2020-07-10 11:05:27 +02:00
aignatov-bio
3047af759f Add custom tinymce plugins to assets pipeline 2020-05-18 18:06:52 +02:00
Alex Kriuchykhin
92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state 
Refactor sidebar [SCI-4380]
 2020-03-30 09:56:51 +02:00
aignatov-bio
8b273acaca Update all sidebars 2020-02-28 14:03:08 +01:00
aignatov-bio
b664c88819 Remove clndr from package.json 2020-02-22 13:03:51 +01:00
aignatov-bio
01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
aignatov-bio
485597a9ef Add front-end part 2020-02-14 12:07:40 +01:00
Urban Rotnik
eea80f4a09 Remove JS call 2020-02-02 18:56:52 +01:00
Urban Rotnik
765a577669 Ellipsis with css for Sidebar 2020-01-29 13:22:35 +01:00
aignatov-bio
79d71f1e9b
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker 
Add new emoji picker [SCI-4268]
 2020-01-21 16:33:05 +01:00
Mojca Lorber
981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
Urban Rotnik
1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
aignatov-bio
6a67280f6a Add new emoji picker 2020-01-21 10:50:55 +01:00
Mojca Lorber
8b635ac38a Refactor flash alerts 2020-01-17 10:49:41 +01:00
Mojca Lorber
a342e3d31f Add emojionearea for status column type 2020-01-16 14:58:59 +01:00
Urban Rotnik
64c6159354 Update require JS 2019-12-06 10:39:21 +01:00
Urban Rotnik
3a76753b72 Add Edit renderer for ListColumnType 2019-11-29 12:52:27 +01:00
aignatov-bio
3474f72c41 Change JS load order 2019-11-29 10:19:49 +01:00
Urban Rotnik
6fbb99c8d2 Add List items partial and JS 2019-11-29 10:19:09 +01:00
Oleksii Kriuchykhin
338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
aignatov-bio
232e4d78be Add serializers to datatable values 2019-11-29 10:19:03 +01:00
aignatov-bio
a0f11116d2 Add render views for datatables 2019-11-29 10:18:59 +01:00
Mojca Lorber
9d4796cf90 refactor repository column javascript 2019-11-29 10:17:44 +01:00
aignatov-bio
56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
aignatov-bio
264493a322 Finish removing Select2 library 2019-11-18 13:59:55 +01:00
Anton Ignatov
7117b767f4 Fix commnets to PR 2019-11-18 13:59:54 +01:00
Oleksii Kriuchykhin
eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801) 
* Add croppie tool to avatar editing
 2019-05-31 15:44:27 +02:00
Anton Ignatov
baa9b94a63 Add new graph button to step 2019-04-26 20:33:20 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio
daaa6a367b
Adding custom scrollbar to global activities [SCI-3206] (#1623) 
* Adding custom scrollbar to global activities
 2019-04-02 09:56:50 +02:00
Oleksii Kriuchykhin
a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
aignatov-bio
b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) 
* Adding inline editing to experiment title, project title and task title
 2019-03-06 09:17:34 +01:00
Anton Ignatov
6971d1a55d Adding new Select2 library with customization 2019-02-22 16:40:33 +01:00
Miha Mencin
126a031498 SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded 2019-01-23 15:30:23 +01:00
Oleksii Kriuchykhin
3610960ee3 Fix ajax calls duplication [SCI-2916] 2018-12-17 20:59:22 +01:00
Oleksii Kriuchykhin
af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Luka Murn
b71c5d14c6 Fix bootstrap-select to work with turbolinks 5.x 
This was causing invite users modal, among other things, to not
function correctly after visiting another redirect within SciNote
using Turbolinks 5.x.

Closes SCI-2707.
 2018-08-24 17:11:59 +02:00
Oleksii Kriuchykhin
38c36ab798 Fix modals handling with Turbolinks [SCI-2253] 2018-08-02 11:25:14 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Zmago Devetak
c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331 
adds deface hook in support dropdown [fixes SCI-2331]
 2018-05-18 09:31:02 +02:00
zmagod
8a99d35a8d removes datatables.noSearchHidden plugin 2018-05-18 09:24:36 +02:00
zmagod
b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
zmagod
4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
mlorb
dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
zmagod
60e5aa8716 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2 2018-05-03 14:49:06 +02:00
Luka Murn
cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
zmagod
4d6e995481 add dismiss buttons back 2018-04-25 10:43:16 +02:00
zmagod
c026044322 fixes flash message [fixes SCI-2142] 2018-04-25 07:32:49 +02:00
Luka Murn
9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
zmagod
0c05c60ebf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-04 16:06:38 +02:00
Zanz2
7f36ab3e5e deleted require and gemfile entry for remotipart 2018-04-04 11:12:39 +02:00
Zanz2
1606982966 found a hackish fix by doing a manual ajax call and some other things with jquery 2018-04-02 19:56:25 +02:00
zmagod
7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +02:00
okriuchykhin
145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin
83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
zmagod
3be3c00574 adds manage columns page [fixes SCI-2218] 2018-03-22 09:35:36 +01:00
Zmago Devetak
75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068 
Write server-side endpoints for custom repositories [SCI-2068]
 2018-03-20 14:30:47 +01:00
Oleksii Kriuchykhin
a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod
d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
zmagod
a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin
c4fe2b1c11 Fix jsPlumb library loading [SCI-1839] 2017-12-01 10:48:07 +01:00
Zanz2
f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
Oleksii Kriuchykhin
5c39b90b2d Fix activities button misbehaviour with turbolinks [SCI-1412] 2017-06-30 16:33:52 +02:00
Oleksii Kriuchykhin
e474cda03a Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
zmagod
75507107fd migrate to 4.2.9 2017-06-23 08:50:12 +02:00
Matej Zrimšek
2c6ad4aa05 Refactored modal popups for repositories to make them general. [fix 1269] 2017-06-05 14:13:24 +02:00
mlorb
317739af1e Merge pull request #530 from biosistemika/ml_sci_1044 
Add data-hook and yadcf-filter plug-in [SCI-1044]
 2017-03-31 14:00:23 +02:00
Mojca Lorber
9458f391e5 add data-hook and yadcf-filter plug-in 2017-03-29 15:59:51 +02:00
zmagod
9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +02:00
Oleksii Kriuchykhin
c715902058 Move flash message creation JS code to helper method [SCI-1087] 2017-03-17 17:58:53 +01:00
Luka Murn
53699193a2 Merge branch 'smart-annotations' 
Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb
 2017-01-24 14:33:23 +01:00
zmagod
9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
zmagod
2cbb8ba41a removed unneeded comments 2017-01-19 12:54:48 +01:00
zmagod
f2d5066dc7 fix some bugs 2017-01-19 11:37:59 +01:00
zmagod
65fa631b1c adding tinyMce first run 2017-01-18 22:40:08 +01:00
Luka Murn
a2935c6620 Add sample info modal popup to sample smart annotations 
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').

Closes SCI-892.
 2017-01-16 15:52:02 +01:00
Oleksii Kriuchykhin
773b00933a Improve multiple messages handling in samples [SCI-853] 2017-01-09 13:55:50 +01:00
Luka Murn
eb64162633 Remove Gem dependency, add atwho as regular vendor/js 2017-01-05 12:06:59 +01:00
Luka Murn
23e60e0d01 Add Gems for smart annotations (atwho) 2017-01-04 10:51:55 +01:00
Oleksii Kriuchykhin
e156dbc987 Implement flash message hiding through module pattern [SCI-816] 2016-12-28 14:52:03 +01:00
Luka Murn
26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +01:00
zmagod
59f7bdb54e hide flash after 5 sec [fixes SCI-660] 2016-11-11 12:30:48 +01:00
Luka Murn
55f9633d1d Add jQuery.autosize plugin 2016-11-11 09:09:41 +01:00
Mojca Lorber
ab0879e8d6 Integrate library with default settings 2016-11-09 13:09:53 +01:00
Matej Zrimšek
ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Renamed from app/assets/javascripts/application.js (Browse further)