scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-08 07:55:14 +08:00
Code Issues Projects Releases Packages Wiki Activity
2069 commits 43 branches 185 tags 169 MiB
Commit graph

652 commits

Author SHA1 Message Date
zmagod
0096f9dc14 refactor 2017-03-29 09:32:23 +02:00
okriuchykhin
05a49e5a82 Merge pull request #528 from okriuchykhin/ok_SCI_1133 
Fix secondary navigation on Mac [SCI-1133]
 2017-03-29 09:30:34 +02:00
Oleksii Kriuchykhin
391c5af267 Fix secondary navigation on Mac [SCI-1133] 2017-03-28 14:36:52 +02:00
zmagod
7039420f99 add hook to canvas module actions 2017-03-28 10:43:39 +02:00
zmagod
0996c14449 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765 2017-03-27 10:41:58 +02:00
zmagod
2235fd3fb7 adds view if download expires 2017-03-27 10:38:28 +02:00
mlorb
3beb179f87 Merge pull request #514 from biosistemika/ml_sci_1089 
Add error messages to sample group/type edit/delete actions [SCI-1089]
 2017-03-27 09:57:32 +02:00
zmagod
4635a3320d Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-24 16:09:28 +01:00
Zmago Devetak
804fb2fec9 Merge pull request #519 from ZmagoD/zd_SCI_1092_v2 
adds hooks in team switch [fixes SCI-1092]
 2017-03-24 12:56:52 +01:00
zmagod
023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
Mojca Lorber
83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod
c244e69e81 fixed report comments bug [fixes SCI-1100] 2017-03-17 16:59:40 +01:00
zmagod
70f17a924e adds hooks in team switch [fixes SCI-1092] 2017-03-17 16:10:22 +01:00
Mojca Lorber
7a4e3201e7 add error messages to sample group/type edit/delete actions 2017-03-14 17:32:25 +01:00
zmagod
5d372851d3 fixes reports comment bug [fixes SCI-1100] 2017-03-14 16:24:02 +01:00
zmagod
856a4611c6 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-14 15:58:08 +01:00
zmagod
7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +01:00
zmagod
0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
okriuchykhin
2a33391f4b Merge pull request #511 from okriuchykhin/ok_SCI_1090 
Refactoring of the comments using STI [SCI-1090]
 2017-03-10 10:50:43 +01:00
Luka Murn
1e3a697a91 Merge pull request #508 from biosistemika/lm-sci-838-fix 
Open edit/view Office files in new browser tab/window [SCI-838]
 2017-03-09 10:39:16 +01:00
Luka Murn
0e8f5f8e99 Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix 
Conflicts:
	app/views/my_modules/_state_buttons.html.erb
 2017-03-09 08:44:09 +01:00
zmagod
5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Luka Murn
800df7a26b Also make button icons work when rendering them via JS 
Closes SCI-1073.
 2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin
0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Luka Murn
7c9aa2e476 Hide complete&uncomplete task buttons if user cannot do it 
Closes SCI-1091.
 2017-03-06 16:01:04 +01:00
Luka Murn
86a800a84e Open edit/view Office files in new browser tab/window 
Closes SCI-838.
 2017-03-06 14:12:18 +01:00
Luka Murn
473487faec Add HTML <head><title> to edit, view file pages 
Closes SCI-1049.
 2017-03-06 13:55:07 +01:00
Luka Murn
4ddb139911 Fix padding of state buttons 
Closes SCI-1073.
 2017-03-03 16:36:52 +01:00
Luka Murn
3d7f09bde6 Fix protocol state buttons a bit 
Closes SCI-1073.
 2017-02-28 14:35:12 +01:00
Luka Murn
fecfc9e41d Merge pull request #498 from biosistemika/release-1.8.1 
Release 1.8.1
 2017-02-23 14:57:30 +01:00
Luka Murn
dc89c160be Fix a bug with team page not working from user task modal 2017-02-23 14:45:00 +01:00
mlorb
a72a072fac Merge pull request #495 from mlorb/ml_sci_948 
Fix report - checklist items are in separate row than checkboxes [SCI-948]
 2017-02-23 10:50:48 +01:00
Mojca Lorber
f84611f558 fix report - checklist items are in separate row than checkboxes 2017-02-22 15:51:26 +01:00
Zmago Devetak
58f97fdb5b Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook 
adds hook for lock task action
 2017-02-22 14:24:01 +01:00
mlorb
42e6a99911 Merge pull request #487 from mlorb/ml_sci_1032 
Fix visual bug in edit avatar mode [SCI-1032]
 2017-02-22 10:59:18 +01:00
mlorb
8c111db31a Merge pull request #486 from mlorb/ml_sci_1033 
Fix user has no teams view [SCI-1033]
 2017-02-22 10:58:39 +01:00
zmagod
151dc79a81 adds hook for lock task action 2017-02-21 16:25:50 +01:00
Mojca Lorber
ac0988ef32 add data-hooks for remove manage teams button 2017-02-21 15:39:08 +01:00
Mojca Lorber
0fd41e8a6d remove changes on user has no teams view 2017-02-21 15:12:58 +01:00
mlorb
ea1711be83 Merge pull request #485 from mlorb/ml_sci_1001 
Add data-hook for E-signature manifestation/display [SCI-1001]
 2017-02-21 14:25:08 +01:00
mlorb
01d9f306a5 change div to span 2017-02-21 14:22:28 +01:00
Mojca Lorber
6b30f097f0 fix visual bug in edit avatar mode 2017-02-21 14:02:42 +01:00
Mojca Lorber
90864a45a0 fix user has no teams view 2017-02-21 13:08:06 +01:00
Luka Murn
6f1c19ae2d Fix _user_dropdown.html.erb 2017-02-21 09:27:42 +01:00
Mojca Lorber
cb2127ee7f add data-hook for E-signature manifestation/display 2017-02-20 18:03:55 +01:00
okriuchykhin
8e18ff44a6 Merge pull request #479 from okriuchykhin/ok_SCI_999 
Add task complete/uncomplete functionality [SCI-999]
 2017-02-20 15:19:00 +01:00
Luka Murn
ce617894c5 Fix manage project users modal bug 
Closes SCI-1026.
 2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin
218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
Luka Murn
d097f0dd15 Merge pull request #477 from Ducz0r/lm-sci-928 
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
 2017-02-13 16:42:57 +01:00
Luka Murn
f93cc89624 Fix system notification email links not working bug 
Closes SCI-964.
 2017-02-10 15:13:33 +01:00
Oleksii Kriuchykhin
cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00
Luka Murn
f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0 Move user profile to settings 2017-02-09 11:34:52 +01:00
Luka Murn
5cb3eb5e09 Refactor preferences -> move them to subcontroller, subroute 2017-02-09 11:07:16 +01:00
okriuchykhin
c2a69982aa Merge pull request #471 from okriuchykhin/ok_SCI_936 
Adds datatable to all teams page [SCI-936]
 2017-02-07 10:33:33 +01:00
zmagod
c99a540eb3 adds hook to team name in the invitation template [fixes SCI-930] 2017-02-03 16:53:42 +01:00
Oleksii Kriuchykhin
62535a01bd Move teams datatable js code into separate file [SCI-936] 2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin
8b105aa030 Add override hooks [SCI-936] 2017-02-02 23:35:47 +01:00
Zmago Devetak
65bbd81497 Merge pull request #469 from ZmagoD/zd_SCI_929 
Adds hook in user settings navigation
 2017-02-02 15:01:37 +01:00
mlorb
970d99e6e3 Merge pull request #465 from mlorb/ml_sci_937 
Redesign of individual team page [SCI-937]
 2017-02-02 11:15:55 +01:00
mlorb
5510fa7751 rename data-hooks in team view 2017-02-02 10:36:23 +01:00
Oleksii Kriuchykhin
db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
zmagod
bb42bd04a5 adds hook in user settings navigation 2017-02-01 17:10:22 +01:00
Mojca Lorber
86351ce17d add data-hooks for billing 2017-02-01 15:01:54 +01:00
Mojca Lorber
d3e0eca44e redesign individual team page 2017-02-01 14:44:47 +01:00
Oleksii Kriuchykhin
031741d122 Disable protocols link if user has no teams [SCI-934] 2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin
c119b7c014 Make sciNote work for users without any teams [SCI_934] 2017-02-01 14:16:26 +01:00
Zmago Devetak
5c9954bb89 Merge pull request #450 from ZmagoD/zd_SCI_939 
Refactor "organizations" to "teams"
 2017-02-01 13:12:02 +01:00
okriuchykhin
067b9452a4 Merge pull request #464 from okriuchykhin/ok_SCI_935 
Add config option to enable/disable users registration [SCI-935]
 2017-02-01 09:36:36 +01:00
Luka Murn
db75231617 Update URLs to sciNote support pages 
Closes SCI-978.
 2017-01-31 15:48:56 +01:00
Oleksii Kriuchykhin
d1e69438de Add config option to enable/disable users registration [SCI-935] 2017-01-30 15:04:02 +01:00
zmagod
e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Luka Murn
0baaf12de3 Re-display images & checkboxes in PDF reports 
Closes SCI-953.
 2017-01-26 10:46:58 +01:00
Luka Murn
8c5a52417c Merge pull request #445 from okriuchykhin/ok_SCI_940 
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
 2017-01-25 17:49:38 +01:00
okriuchykhin
648d256dff Merge pull request #448 from okriuchykhin/ok_SCI_945 
Fix openning of protocol preview with images [SCI-945]
 2017-01-25 17:27:01 +01:00
Oleksii Kriuchykhin
c55f3cb99c Add flag to disable simple_format in custom_auto_link [SCI-940] 2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
310d8c1920 Refactor smart annotation/auto_link/simple_format rendering [SCI-940] 2017-01-25 17:18:19 +01:00
zmagod
afd8328e9c rename ortanizations -> teams 2017-01-25 14:22:06 +01:00
Mojca Lorber
6905fc8c08 remove letter f 2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin
90e4b26c69 Fix openning of protocol preview with images [SCI-945] 2017-01-25 13:06:12 +01:00
zmagod
72e13beee3 renamed organizations in views 2017-01-25 12:01:23 +01:00
Mojca Lorber
2277af534c fix table titles 2017-01-25 11:01:35 +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
6e7fa21dd3 adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924] 2017-01-24 10:51:12 +01:00
Oleksii Kriuchykhin
d555ba7905 Add export to protocol management page and code style improvements [SCI-742] 2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
14a6705b55 Implemented protocol export through Zip::OutputStream [SCI-742] 2017-01-23 17:43:48 +01:00
Mojca Lorber
8e02c2e025 add locale - fix 2017-01-20 13:37:07 +01:00
mlorb
9a3c56de97 Merge pull request #421 from mlorb/ml_sci_540 
Protocol steps/results - adding titles for tables [SCI-540]
 2017-01-20 11:41:49 +01:00
Mojca Lorber
6653f0d4c1 small fixes 2017-01-19 16:42:14 +01:00
Mojca Lorber
4ea154410a add to fields with rich text formatting 2017-01-19 15:27:24 +01:00
Mojca Lorber
44de927cf4 display smart annotations in reports - without rich text fields 2017-01-19 14:22:54 +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
27d3868f37 fix bugs 2017-01-19 09:40:39 +01:00
zmagod
65fa631b1c adding tinyMce first run 2017-01-18 22:40:08 +01:00
Mojca Lorber
dde9854bf1 update protocol import/export and clone 2017-01-18 14:22:19 +01:00
Mojca Lorber
3b92ab9f36 add names to tables from protocol steps in reports 2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582 add table name in protocol step 2017-01-18 14:22:18 +01:00
Oleksii Kriuchykhin
a490a12fb1 Add truncation of image description in the preview [SCI-873] 2017-01-18 13:28:56 +01:00
Luka Murn
cf72da5635 Merge branch 'improved-files-handling' into 'master' 
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
 2017-01-18 11:29:40 +01:00