scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5270 commits 70 branches 179 tags 165 MiB
Commit graph

462 commits

Author SHA1 Message Date
Zanz2 00ac774fde Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result 2018-01-24 13:40:13 +01:00
Zanz2 7fe1c20ebe Finished the protocol reorder functions and implemented them 2018-01-24 09:31:43 +01:00
Zanz2 96253c1089 Made some functions to help solve reordering of the protocols io steps 2018-01-23 18:40:23 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Zanz2 b105920d4e
Merge pull request #901 from Zanz2/code_refactor 
Protocols.io code beautification and refactoring [SCI-1929]
 2018-01-12 12:34:00 +01:00
Zmago Devetak 0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866 
Wrong date at activity
 2018-01-08 14:20:26 +01:00
zmagod eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb 99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
Zanz2 7bad722553 Made small oversight and fixed it 2017-12-24 02:06:14 +01:00
Zanz2 83e1b04c7a Fixed pull request 2017-12-24 01:49:04 +01:00
Zanz2 53561ffd84 Refactored according to PR 2017-12-15 20:39:15 +01:00
mlorb 2936770c01 refactor can view team users ATWHO permission 2017-12-14 14:18:18 +01:00
mlorb 7c1ae6bc82 refactor manage repository permissions 2017-12-14 14:18:18 +01:00
mlorb 2918a9833d refactor manage repository column permissions 2017-12-14 14:18:18 +01:00
mlorb 3f5e9e60b7 refactor view repository permission 2017-12-14 14:18:18 +01:00
mlorb 079ac7a4d3 refactor manage repository row permissions 2017-12-14 14:18:18 +01:00
mlorb 740ecc674b refactor view repositories permission 2017-12-14 14:18:18 +01:00
mlorb 3ca51f097f refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions 2017-12-14 14:18:17 +01:00
mlorb 29f9414839 refactor create project permission 2017-12-14 14:18:17 +01:00
mlorb 72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb b09377cd8d refactor update sample permission 2017-12-14 14:18:17 +01:00
mlorb f801ed8eb6 refactor view/export samples permission 2017-12-14 14:18:16 +01:00
mlorb 0d37f9c85a refactor clone protocol permission 2017-12-14 14:18:16 +01:00
mlorb f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
mlorb 806fcbce36 refactor update protocol in repository permission 2017-12-14 14:18:16 +01:00
mlorb e0d1ae174e refactor read protocol in repository permission 2017-12-14 14:18:15 +01:00
mlorb ccc2451494 refactor create sample permissions 2017-12-14 14:18:15 +01:00
mlorb 43c01b74b1 refactor create protocol permission 2017-12-14 14:18:14 +01:00
mlorb a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +01:00
Zmago Devetak 00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step 
Fixes bug with embedded images [SCI-1624]
 2017-12-12 09:53:24 +01:00
Oleksii Kriuchykhin 6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +01:00
Zanz2 b0012ab936 Simplified repeating method calls 2017-12-03 16:50:06 +01:00
Zanz2 fcbd956d6e Finished code beautification 2017-12-03 01:17:49 +01:00
Zanz2 835ac6910f Code refactor part 1 2017-12-02 00:29:47 +01:00
Zmago Devetak 205d3b3d8f
Merge pull request #894 from ZmagoD/zd_SCI_1650 
Adds task to copy images [fixes SCI-1650]
 2017-12-01 17:32:09 +01:00
zmagod 7442684846 fix protocol preview, remove unneeded functions, fix copy paste tokens 2017-11-28 14:16:20 +01:00
zmagod e233fbe1d8 fix image removing from tinymce 2017-11-28 11:01:07 +01:00
zmagod e69e9f6794 remove unneeded comment and add tiny_mce_asset regex in a constant 2017-11-24 17:04:01 +01:00
zmagod 066c782cd2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step 2017-11-24 16:29:32 +01:00
Zanz2 0e574b2f15 removed un needed limits 2017-11-24 11:49:57 +01:00
Zanz2 e7e37939a9 quick fix to expected result losing html 2017-11-24 11:18:12 +01:00
Zanz2 dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
mlorb c46d630f0b
Merge pull request #891 from mlorb/ml-sci-1617 
Add copying of TinyMce assets when cloning the protocol [SCI-1617]
 2017-11-23 14:31:29 +01:00
Zanz2 764e5259d1 Fixed last review, and a bug i found 2017-11-22 23:38:22 +01:00
Mojca Lorber fe5828fa97 add copying of TinyMce assets when cloning the protocol 2017-11-22 16:47:21 +01:00
Zanz2 692ed62d6d made case statement nicer 2017-11-21 21:27:19 +01:00
Zanz2 f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
Zanz2 8226322e92 Fixed open html tags on truncate 2017-11-21 11:42:42 +01:00
Zanz2 529d988cc3 closing html tags 2017-11-21 11:15:09 +01:00
Zanz2 d8c809ffd0 Reviewed pull request 2017-11-20 23:19:34 +01:00
Zanz2 e943df9176 fixed small rubocop error 2017-11-20 01:02:02 +01:00
Zanz2 cf66d94d45 Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields 2017-11-20 00:59:32 +01:00
Zanz2 99b16f339d New maximums, functions reworked 2017-11-17 15:16:17 +01:00
Zanz2 fa25a6785b Made the propper files and functionality for the text truncation to function 2017-11-17 02:43:32 +01:00
Zanz2 c44465817d Added the functions and put in limitations from my validations files, changed controller name, added some locals 2017-11-16 20:03:44 +01:00
mlorb cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import 
Protocols io import
 2017-11-13 11:53:28 +01:00
Zanz2 e26adc2905 Quick formatting fix 2017-11-12 15:41:50 +01:00
Zanz2 e7384ac38d Code review fixes, made seperate helper file 2017-11-12 15:31:04 +01:00
Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-10-23 10:59:10 +02:00
Luka Murn 8254153bb9 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/connection.rb
	app/models/experiment.rb
	app/models/my_module.rb
 2017-10-23 08:57:57 +02:00
Luka Murn 4e06b5c397 Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"" 2017-10-17 13:17:49 +02:00
Luka Murn 4d8f2665d3 Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]" 2017-10-17 13:10:02 +02:00
Luka Murn 2fb2b90da3 Merge pull request #820 from Ducz0r/lm-sci-1675 
Add Add-ons page to User -> Settings -> Account [SCI-1675]
 2017-10-16 13:05:43 +02:00
okriuchykhin db9a031581 Merge pull request #813 from okriuchykhin/ok_SCI_1642 
Refactor canvas [SCI-1642]
 2017-10-12 17:45:34 +02:00
gazvoda 88f03a0706 Merge pull request #735 from gazvoda/lg-SCI-1249-v2 
Truncate checklist items in activity modal [fixes SCI-1249]
 2017-10-12 15:58:05 +02:00
Luka Murn fe89b942e7 Add Add-ons page to User -> Settings -> Account 
Closes SCI-1675.
 2017-10-11 14:15:37 +02:00
lenart de3c18509f Variable name changes, added comments to code [fixes SCI-1249] 2017-10-06 17:12:15 +02:00
Oleksii Kriuchykhin b26b963e54 Optimize update canvas SQL and remove module group name [SCI-1642] 2017-10-05 16:19:25 +02:00
zmagod ef1025e0ee fixes hound 2017-10-02 18:11:54 +02:00
zmagod 3dc3ed906f fixes bug with embedded images [fixes SCI.1624] 2017-10-02 18:06:42 +02:00
Luka Murn e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
zmagod 478bd491ff added pagination and sorting to team tables 2017-08-28 17:05:09 +02:00
Luka Murn 9227ea5854 Finish the user settings jsonb, also fix references throughout app 
Closes SCI-1475.
 2017-08-10 14:29:01 +02:00
lenart e781dfc6a6 Truncate activity taking smart annotations into account fixes [SCI-1249] 2017-08-02 15:51:32 +02:00
Matej Zrimšek 07fea16d26 Fix permissions for editing and deleting custom repository custom columns. [SCI-1524] 2017-07-28 12:01:11 +02:00
Luka Murn 3e80f761b8 Add "about" modal, prepare hooks, VERSION system for addons 
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
 2017-07-10 15:27:50 +02:00
lenart 58e2575c75 Truncate checklist items in activity modal [fixes SCI-1249] 2017-07-07 15:56:16 +02:00
zmagod 7b9410f02f fixes smart annotations bug in reports [fixes SCI-1328] 2017-06-27 11:26:32 +02:00
zmagod 2b2f513366 fixes export pdf error on production 2017-06-22 16:40:50 +02:00
zmagod bad52ceff1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336 2017-06-21 15:56:07 +02:00
Mojca Lorber 39dd6daabb small fixes 2017-06-19 15:30:38 +02:00
Mojca Lorber 107aa76e55 fix bug with audit trail - ajax error 2017-06-14 14:48:22 +02:00
okriuchykhin 97a94ff4a3 Merge pull request #679 from okriuchykhin/ok_SCI_1345 
Fix repository view permissions for team guests [SCI-1345]
 2017-06-13 15:47:44 +02:00
mlorb 074a47aae1 Merge pull request #675 from mlorb/ml_sci_1272 
Fix permissions [SCI-1272]
 2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin 2d693a3fb7 Fix repository view permissions for team guests [SCI-1345] 2017-06-13 10:33:08 +02:00
Luka Murn 2e2f07bf58 Merge pull request #668 from Ducz0r/lm-sci-1335 
Fix sidebar for repositories [SCI-1335]
 2017-06-13 09:37:33 +02:00
Luka Murn c3d289291f Fix case statement 
Closes SCI-1335.
 2017-06-13 09:09:07 +02:00
Zmago Devetak 6cdf37041f Merge pull request #663 from ZmagoD/zd_SCI_1328 
fixes bug with smart annotations in reports [fixes SCI-1328]
 2017-06-13 08:57:09 +02:00
zmagod a865253a2e first run 2017-06-13 08:10:10 +02:00
Mojca Lorber 9108102b42 fix permissions 2017-06-12 17:34:36 +02:00
Luka Murn e26337d5ee Merge pull request #671 from biosistemika/custom-repositories 
Merge custom-repositories into master
 2017-06-09 18:46:47 +02:00
Luka Murn 481a48c953 Hound is love, Hound is life 2017-06-09 12:51:33 +02:00
Luka Murn cfb734704e Fix sidebar for repositories 
Closes SCI-1335.
 2017-06-09 12:49:23 +02:00
zmagod e45c2ce560 fixes bug with smart annotations in reports [fixes SCI-1328] 2017-06-08 13:41:27 +02:00
Luka Murn 2ab31aba2f Merge pull request #660 from Ducz0r/lm-sci-1270 
Copy repository functionality [SCI-1270]
 2017-06-08 11:45:57 +02:00
Luka Murn 38361e4bb4 Setup initial GUI 2017-06-07 18:43:48 +02:00
Luka Murn 02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +02:00
Oleksii Kriuchykhin 8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Mojca Lorber 51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber dde714d78f fix hound 2017-06-06 13:33:57 +02:00
Mojca Lorber da98788031 small code fixes 2017-06-06 09:57:50 +02:00
Mojca Lorber 13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Luka Murn 62d97f6e64 Merge pull request #655 from Ducz0r/lm-sci-1321 
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
 2017-06-06 07:59:24 +02:00
Luka Murn f298ec54e7 Code beautification per @zmagod's request 
Closes SCI-1321.
 2017-06-06 07:58:46 +02:00
Luka Murn 8c7aebbb88 Fix bug with TinyMCE not working for steps with nil description 
Closes SCI-1321.
 2017-06-05 17:43:03 +02:00
Matej Zrimšek 419d638163 Renamed reposiotry edit and destroy permission helper. [fix 1269] 2017-06-05 17:36:26 +02:00
Mojca Lorber 27d3a5097b fix hound 2017-06-05 16:07:21 +02:00
Matej Zrimšek 5c9a453439 Added permissions for deleting and renaming of repositories. [SCI-1269] 2017-06-02 17:50:34 +02:00
Mojca Lorber 7c2b657b0e fix bug with special characters when truncating activities titles 2017-06-01 15:10:26 +02:00
Mojca Lorber d88b21fb5e truncate all titles in activities 2017-06-01 15:09:01 +02:00
Luka Murn fcc3995049 Merge pull request #647 from biosistemika/master 
Bring latest master changes into custom-repositories
 2017-05-30 14:18:14 +02:00
Matej Zrimšek 19ffd77d32 Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305] 2017-05-26 18:14:15 +02:00
Oleksii Kriuchykhin 157b1630b9 Add missing include for sinitize_input [SCI-1309] 2017-05-25 16:28:06 +02:00
mlorb 58ac457d38 fix merge bug 2017-05-23 11:32:02 +02:00
mlorb 872f712be8 Merge branch 'custom-repositories' into ml_sci_1266_v2 2017-05-23 11:05:25 +02:00
Mojca Lorber 9ae615264d add global repositories screen - tab control 2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
Oleksii Kriuchykhin ad39d09a53 Disable turbolinks on search links to fix JS errors [SCI-452] 2017-05-12 13:23:29 +02:00
Zmago Devetak 9911c0d148 Merge pull request #613 from ZmagoD/zd_SCI_1241_v3 
replace all ActionController::Base.helpers.sanitize calls with custom…
 2017-05-11 14:30:26 +02:00
zmagod 80a0af8c9f replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241] 2017-05-11 11:36:47 +02:00
okriuchykhin f239238064 Merge pull request #611 from okriuchykhin/ok_SCI_1252 
Fix root_url method unavailable in application_helper [SCI-1252]
 2017-05-11 11:15:00 +02:00
Oleksii Kriuchykhin 229693ec61 Fix root_url method unavailable in application_helper [SCI-1252] 2017-05-10 18:15:08 +02:00
zmagod 511f39e093 add constants 2017-05-10 15:33:33 +02:00
zmagod 10db322307 fixes input sanitize method [fixes SCI-1248] 2017-05-10 14:57:11 +02:00
Zmago Devetak 13570ba5cb Merge pull request #602 from ZmagoD/zd_SCI_1247 
fixes pdf export and image size [fixes SCI-1247]
 2017-05-10 09:31:55 +02:00
Zmago Devetak cd503580b2 Merge pull request #599 from ZmagoD/zd_SCI_1241 
fix samples bug [SCI-1241]
 2017-05-09 15:55:43 +02:00
Mojca Lorber 7ca62a16bb fix hound 2017-05-09 14:55:23 +02:00
Mojca Lorber e1475fbfef fix bug with avatar in system log 2017-05-09 14:40:02 +02:00
zmagod 2d69896897 fixes pdf export and image size [fixes SCI-1247] 2017-05-09 13:59:59 +02:00
zmagod df13478186 fix samples bug [SCI-1241] 2017-05-09 11:25:00 +02:00
Zmago Devetak 4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
zmagod d6f303581f refactor 2017-05-08 12:56:33 +02:00
Zmago Devetak e47bf8f013 Merge pull request #582 from ZmagoD/zd_SCI_1051 
fix reports pdf for user annotation [SCI-1051]
 2017-05-08 10:24:40 +02:00
zmagod b22350136f adds label to step in report [fixes SCI-488] 2017-05-05 09:45:18 +02:00
zmagod 289a148332 refactor 2017-05-03 15:33:23 +02:00
zmagod 5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
zmagod 1b618e88e5 fix reports pdf for user annotation [SCI-1051] 2017-05-03 10:50:43 +02:00
osboxes.org 21a39fc704 Code indentation corrected [fixes SCI-1214] 2017-04-28 10:31:14 +01:00
osboxes.org f72802f9f2 Tab Teams is highlighted when in Audit trails [fixes SCI-1214] 2017-04-26 16:31:44 +01:00
zmagod 1fefeee3d1 adds team space related methods 2017-04-25 13:44:31 +02:00
zmagod 66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod 55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
zmagod c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
okriuchykhin 0fe84c4e24 Merge pull request #550 from okriuchykhin/ok_SCI_1157 
Improve speed of search [SCI-1157]
 2017-04-12 13:11:26 +02:00
Oleksii Kriuchykhin 07d658ab82 Improve speed of search [SCI-1157] 2017-04-11 14:55:44 +02:00
Zmago Devetak 91793c295a Merge pull request #542 from ZmagoD/zd_SCI_825 
Smart annotations and Notifications
 2017-04-10 15:10:17 +02:00
zmagod 90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod 9bb1bb3f9b refactor [fixes SCI-825] 2017-04-06 15:08:03 +02:00
zmagod d331911ffe completed step annotations 2017-04-06 08:42:16 +02:00
Mojca Lorber a0fe47a05d change helper method for user info popover 2017-04-04 15:22:41 +02:00
zmagod 99c116f257 first run 2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin 2faa137f67 Add user popover method for users [SCI-1127] 2017-04-03 15:10:00 +02:00
zmagod 239a44c26b change send to public_send 2017-03-24 16:25:50 +01: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
zmagod 5cc6cd094e refactor 2017-03-17 16:47:58 +01:00
zmagod 95a0f596b7 adds file link 2017-03-17 16:40:57 +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 b821fff4a5 adds non breaking space between file name and buttons 2017-03-13 14:14:44 +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
mlorb 39e1ac4b26 Merge pull request #512 from biosistemika/ml_sci_1074 
Fix permissions for experiment actions [SCI-1074]
 2017-03-10 11:44:27 +01:00
Mojca Lorber 1ba5f1748f fix permissions for experiment actions 2017-03-09 17:45:34 +01:00
zmagod 1d42d46c02 fixes bug with step comments 2017-03-09 16:02:52 +01:00
zmagod 9939d8df06 refactor 2017-03-09 10:51:54 +01:00
zmagod f78ef8c82a fixes hound 2017-03-08 14:41:42 +01:00
zmagod 5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Oleksii Kriuchykhin 0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Mojca Lorber f84611f558 fix report - checklist items are in separate row than checkboxes 2017-02-22 15:51:26 +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
Oleksii Kriuchykhin 218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
Luka Murn 164bd787e9 Merge pull request #481 from Ducz0r/lm-sci-958-fix 
Team administrators are Viewers of all Projects in Team [SCI-958]
 2017-02-15 10:40:52 +01:00
Nbernot 97584aabb3 Updated the lists of office online file extensions 
Extended the list of file extensions that receive office online icons and 'open in' text.
 2017-02-14 16:44:03 +01:00
Luka Murn c6ed73bc82 Allow team admins to see all projects, even hidden ones 2017-02-13 13:42:53 +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
Mojca Lorber d3e0eca44e redesign individual team page 2017-02-01 14:44:47 +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 3bf447b0f4 Fix bug where reCaptcha form wasn't working 2017-01-26 16:06:29 +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
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
Oleksii Kriuchykhin 5fe9261595 Fix error when referencing deleted sample in SA [SCI-949] 2017-01-25 15:54:12 +01:00
zmagod a507bb4d1f hound 2017-01-25 15:40:35 +01:00
zmagod f04a2f663a renamed organizations in config/ 2017-01-25 12:30:11 +01:00
zmagod 9ae799d52c rename organization/org/Organization to Team in datatables 2017-01-25 09:48:49 +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
Zmago Devetak 40bf293ec7 Merge pull request #441 from ZmagoD/zd_SCI_924 
adds smart annotation in task comments, refactor smart_annotation_par…
 2017-01-24 11:18:41 +01:00
okriuchykhin 7fa1f3d966 Merge pull request #438 from okriuchykhin/ok_SCI_921 
Remove unneeded HTML scrubber in protocol importer [SCI-921]
 2017-01-24 11:02:43 +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 2434c73a0c Remove unneeded HTML scrabber in protocol importer [SCI-921] 2017-01-24 09:52:38 +01:00
zmagod 20cde2654b fixed user without permissions bug [fixes SCI-922] 2017-01-23 10:53:42 +01:00
zmagod 9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +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 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
Zmago Devetak 1b9f7db385 Merge pull request #405 from ZmagoD/zd_SCI_832 
Visualization of User smart annotation after saving the field
 2017-01-18 09:36:42 +01:00
okriuchykhin 781a68e0d5 Merge pull request #415 from okriuchykhin/ok_SCI_888 
Add missed space in the string [SCI-888]
 2017-01-18 09:34:51 +01:00