scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-10-01 12:26:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
3303 commits 69 branches 179 tags 165 MiB
Commit graph

842 commits

Author SHA1 Message Date
Zanz2 3812b2e64b Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore 2017-09-20 08:58:00 +02:00
Zanz2 ea8f3e822d Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone 2017-09-20 08:38:34 +02:00
Luka Murn 44877a13a5 Refactor services on backend. New team page is now working 2017-09-19 16:32:21 +02:00
Luka Murn 80c05e50ec Semi-working version of create new team form 2017-09-19 16:30:26 +02:00
Zanz2 7aba782639 optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show 2017-09-19 15:02:16 +02:00
zmagod d1477179b2 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499 2017-09-18 15:10:52 +02:00
Zanz2 f861b1fc52 Configured the controller,the main task ahead is to figure out how to import all of the data i have available 2017-09-15 15:52:55 +02:00
zmagod 83647d81b4 adds edit team name modal 2017-09-15 14:00:48 +02:00
Zanz2 5d6cc341ed added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done 2017-09-14 14:42:04 +02:00
Toni Dezman d38f4343f2 Decupling redux part 1 2017-09-14 11:46:49 +02:00
Zanz2 29b9d50363 Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer 2017-09-14 11:30:53 +02:00
zmagod 705d07f60e adds remove team action 2017-09-13 17:11:51 +02:00
Zanz2 9fc91aac32 added protocols io upload preview modal 2017-09-13 16:04:16 +02:00
Zanz2 b7432b336a added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller 2017-09-13 15:15:08 +02:00
zmagod 1b3b3dfea9 adds team members update role functionality 2017-09-12 17:30:13 +02:00
Žan Žagar 706031dacb added model and controler, model should go to services while the controller should go to protocols controller 2017-09-12 15:25:22 +02:00
Toni Dezman 67d617deb5 adds hound_bot's and zmagos suggestions 2017-09-07 13:40:53 +02:00
Toni Dezman 185039bc99 adds suggestions from code review 2017-09-04 15:00:26 +02:00
zmagod 9c01ab414c refactor leave team 2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin a927c2832d Improve error logging [GIOT-31] 2017-09-01 16:36:45 +02:00
zmagod 91d2d8a935 adds team details view 2017-08-31 15:56:55 +02:00
Toni Dezman 4034400c42 Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-08-31 11:42:15 +02:00
Toni Dezman 8b61fe563c user preferences APIs 2017-08-31 11:23:44 +02:00
zmagod 1325732b0c adds specs for team controller actions 2017-08-30 16:18:21 +02:00
Toni Dezman 2e6a942152 api for timezone 2017-08-30 14:59:17 +02:00
Oleksii Kriuchykhin c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
zmagod ee054f91b8 adds bullet gem [fixes SCI-1578] 2017-08-30 09:29:45 +02:00
Toni Dezman c82dfa502a adds errors in client_api for users_controller 2017-08-29 13:14:52 +02:00
zmagod ec86691659 fixed tests 2017-08-29 12:04:00 +02:00
zmagod c54dd9473e adds controller spec for leave team [fixes SCI-1497] 2017-08-29 11:56:46 +02:00
zmagod 478bd491ff added pagination and sorting to team tables 2017-08-28 17:05:09 +02:00
zmagod 5ea464b675 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497 2017-08-28 09:36:29 +02:00
Toni Dezman ea9a195f09 email and password action/redusers work 2017-08-26 14:07:31 +02:00
zmagod db16da7bd6 adds custom query to fetch teams data 2017-08-25 16:07:37 +02:00
Toni Dezman ccd14f6b50 adds apis for full_name and initials input fields 2017-08-25 14:45:02 +02:00
Toni Dezman 989be6563f Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-08-25 09:06:38 +02:00
zmagod 782daabce1 first run 2017-08-25 08:54:32 +02:00
Toni Dezman e4a704d063 namespaces client_api/users/user_controller.rb 2017-08-25 08:21:52 +02:00
zmagod 685cb42aac fixes repository, protocols link, adds csfr token to request headers 2017-08-21 15:30:54 +02:00
zmagod c5e32c4ea0 Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch 2017-08-21 09:52:14 +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
Luka Murn c62002381b Add default settings migration and concern 2017-08-10 11:30:57 +02:00
zmagod bd352869a3 adds user account dropdown 2017-08-09 09:08:13 +02:00
zmagod 226458a3f0 adds recent notifications 2017-08-08 15:44:28 +02:00
zmagod be42cd2204 refactor 2017-08-07 13:51:22 +02:00
Luka Murn 13eae287bb Revert "Add core API using JWT authentication and tests for it [SCI-1507]" 2017-08-07 11:54:45 +02:00
Luka Murn c6448264d0 Revert "Td sci 1492" 2017-08-07 11:47:21 +02:00
Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
 2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin 35b643f34e Fix typo in config and code style improvements [SCI-1507] 2017-08-04 10:19:56 +02:00
Oleksii Kriuchykhin e958410261 Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00
zmagod c314bae28d add team switch js/controller 2017-08-03 16:03:15 +02:00
zmagod 2e83322f76 fixes global activities 2017-08-03 11:17:09 +02:00
zmagod 6ef19725f1 adds redux 2017-08-02 17:27:05 +02:00
lenart e781dfc6a6 Truncate activity taking smart annotations into account fixes [SCI-1249] 2017-08-02 15:51:32 +02:00
zmagod caae1e2fe8 adds intl, router, bootstrap to npm modules 2017-07-31 10:42:40 +02:00
Toni Dezman f76512f364 adds hound recomendations for react/settings_controller.rb 2017-07-28 12:53:15 +02:00
Toni Dezman 1673d43993 adds react/settings controller and react/layout 2017-07-27 15:26:03 +02:00
Oleksii Kriuchykhin 6a43483a2f Fix adding and editing repository items [SCI-1519] 2017-07-26 11:22:26 +02:00
Matej Zrimšek ad0dce921b Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516] 2017-07-24 18:12:41 +02:00
Oleksii Kriuchykhin ece27b2652 Fix importing files with empty header cells and error messages improvements [SCI-1484] 2017-07-18 14:54:35 +02:00
Oleksii Kriuchykhin 036ee390ed Fix error messages in repository import and uploading files starting with hyphen[SCI-1484] 2017-07-14 16:19:03 +02:00
Mojca Lorber 739f8b5b4e remove redundant rollback call 2017-07-13 13:49:26 +02:00
Nbernot 2a3e830a3c Merge pull request #732 from biosistemika/business_users 
Business users [SCI-1428, SCI-1447]
 2017-07-11 13:34:56 +02:00
Luka Murn 16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
lenart 58e2575c75 Truncate checklist items in activity modal [fixes SCI-1249] 2017-07-07 15:56:16 +02:00
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
 2017-07-06 15:12:15 +02:00
Nejc Bernot d917cf3340 Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST 2017-07-05 11:52:36 +02:00
Nejc Bernot 803934e07d Changes the host for the download and redirect paths 2017-07-05 10:23:10 +02:00
okriuchykhin 75c887ce7d Merge pull request #721 from okriuchykhin/ok_SCI_1412 
Fix activities [SCI-1412]
 2017-07-04 10:59:08 +02:00
zmagod bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
Oleksii Kriuchykhin e474cda03a Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
Oleksii Kriuchykhin 21cce4baa0 Fix global search [SCI-1411] 2017-06-28 15:44:18 +02:00
okriuchykhin d126391940 Merge pull request #710 from okriuchykhin/ok_SCI_1356 
Add global search in custom repositories [SCI-1356]
 2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin 4060ba2ac3 Code style fixes [SCI-1356] 2017-06-27 13:23:51 +02:00
Matej Zrimšek f847b44067 Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
zmagod 7367435c6d refactor 2017-06-22 17:32:12 +02:00
zmagod 2dd9b6ff19 fix update repository_row 2017-06-22 17:29:17 +02:00
zmagod 590135b9b3 refactor 2017-06-22 17:26:11 +02:00
zmagod e7328c2e20 fixes row dupplication [fixes SCI-1385] 2017-06-22 16:01:37 +02:00
zmagod 28129ebb73 refactor 2017-06-21 17:39:20 +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
zmagod 18fd5b00ba fix hound 2017-06-21 15:01:55 +02:00
zmagod f66fb49b56 adds import records to repositories [fixes SCI-1336] 2017-06-21 14:45:50 +02:00
Matej Zrimšek d907819de5 Removed byebug calls. [SCI-1383] 2017-06-21 10:49:00 +02:00
zmagod f64e1ac713 fix locales 2017-06-21 09:31:39 +02:00
Matej Zrimšek 47407ef40c Removed empty first column of repository export file. [SCI-1383] 2017-06-20 18:40:41 +02:00
mlorb 7cbc8a2f95 Merge pull request #694 from mlorb/ml_sci_1347 
Fix flash when deleting samples of other users [SCI-1347]
 2017-06-19 14:19:57 +02:00
mlorb beaba6a92b Merge pull request #693 from mlorb/ml_sci_1351_v3 
Fix error msg when editing empty cell in repositories [SCI-1351]
 2017-06-19 14:19:27 +02:00
zmagod 70fa681519 split the import service 2017-06-19 14:05:37 +02:00
Mojca Lorber 9b941fe374 fix flash when deleting samples of other users 2017-06-16 17:12:04 +02:00
Mojca Lorber 1b683bc70e fix error msg when editing empty cell in repositories 2017-06-16 15:09:04 +02:00
Mojca Lorber ea455d3596 fix no repository name in activity bug 2017-06-15 09:43:10 +02:00
Mojca Lorber e6ec184dba fix multiple errors handling on fields in repositories tables 2017-06-14 13:09:23 +02:00
zmagod 2d3b5f4308 refactor 2017-06-14 10:55:24 +02:00
zmagod cee052fc19 added service object 2017-06-14 09:11:20 +02:00
Matej Zrimšek cea6d15d3e Fixed Hound warning. [SCI-1351] 2017-06-13 18:15:47 +02:00
Matej Zrimšek 1bc46fe0cb Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351] 2017-06-13 18:12:42 +02:00
Mojca Lorber 849b269d87 fix errors in repo table 2017-06-13 16:56:34 +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
zmagod a865253a2e first run 2017-06-13 08:10:10 +02:00
Matej Zrimšek e3db79b3cc Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275] 2017-06-12 17:49:42 +02:00
Mojca Lorber 9108102b42 fix permissions 2017-06-12 17:34:36 +02:00
Matej Zrimšek f46d8f6970 Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275] 2017-06-09 19:44:28 +02:00
Matej Zrimšek 773a55ffac Fixed CSV export of repository records. [SCI-1275] 2017-06-09 19:44:28 +02:00
rekonder 4df8e1ffe3 Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository 2017-06-09 19:44:28 +02:00
rekonder ede744849b Export repository [aj-SCI-1275] 2017-06-09 19:44:28 +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
Zmago Devetak 4873624cec Merge pull request #658 from ZmagoD/zd_SCI_1011 
Multiple file upload with drag & drop capability in steps and results
 2017-06-09 10:03:33 +02:00
Mojca Lorber be52af4e4f fix rename/delete/copy modals not working 2017-06-08 15:13:00 +02:00
Mojca Lorber 71c523c406 load tabs with javascript 2017-06-08 13:47:30 +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 61eb52f86f Implement GUI for copying repositories 
Closes SCI.1270.
 2017-06-07 19:11:25 +02:00
Luka Murn 0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Luka Murn 42f7b4f68d Hound is love, Hound is life 2017-06-07 18:22:15 +02:00
Luka Murn 02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +02:00
Luka Murn b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin c18bba9fbe Fix rebase errors [SCI-1274] 2017-06-07 15:50:22 +02:00
Oleksii Kriuchykhin ad8dd6d740 PR fixes [SCI-1274] 2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin 8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Zmago Devetak fcec42ae31 Merge pull request #645 from ZmagoD/zd_SCI_1278 
generates samples csv file in background job [fixes SCI-1278]
 2017-06-07 15:04:24 +02:00
zmagod 353c27da15 rename method 2017-06-07 13:51:16 +02:00
zmagod c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +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 39dda1ad5d refactoring 2017-06-06 13:18:44 +02:00
Mojca Lorber acdea2198d code changes after rebasing 2017-06-06 11:10:55 +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
Matej Zrimšek afce3010ef After repository deletion, the next selected repository is the first one. [SCI-1269] 2017-06-05 17:56:09 +02:00
Matej Zrimšek 419d638163 Renamed reposiotry edit and destroy permission helper. [fix 1269] 2017-06-05 17:36:26 +02:00
Matej Zrimšek f012779780 Renamed before_action for repository edit and destroy action. [fix 1269] 2017-06-05 10:02:16 +02:00
Matej Zrimšek d8d54232c3 After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269] 2017-06-02 19:08:51 +02:00
Matej Zrimšek 73aaef0949 Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269] 2017-06-02 17:52:04 +02:00
Matej Zrimšek 5c9a453439 Added permissions for deleting and renaming of repositories. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek 21a72da84f Added rename logic and improved remove logic. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek cdaac6a01b Added remove repository modal logic. [SCI-1269] 2017-06-02 17:50:33 +02:00
Matej Zrimšek 791bb934ca Remove repository modal logic (WIP). [SCI-1269] 2017-06-02 17:50:33 +02:00
zmagod 1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +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
zmagod b527afd12b generates samples csv file in background job [fixes SCI-1278] 2017-05-29 14:42:55 +02:00
mz3944 d83dcac894 Merge pull request #642 from mz3944/mz-SCI-1291 
Fixed permission error while cloning workflows. [fixes SCI-1291]
 2017-05-29 09:53:33 +02:00
Matej Zrimšek 853096634d Fixed permission error while cloning workflows. [fixes SCI-1291] 2017-05-26 11:14:50 +02:00
Mojca Lorber 8540f88b7e small fix - renaming of ids and hrefs 2017-05-25 10:06:48 +02:00
Oleksii Kriuchykhin 7310763184 Add missing include [SCI-1306] 2017-05-25 08:57:50 +02:00
mlorb 872f712be8 Merge branch 'custom-repositories' into ml_sci_1266_v2 2017-05-23 11:05:25 +02:00
mz3944 6b8c8deb16 Merge pull request #634 from mz3944/mz-SCI-414 
Uncompleted steps not added to Reports
 2017-05-23 09:58:05 +02:00
mz3944 9fe3b717c8 Merge pull request #626 from mz3944/mz-SCI-487 
Simplify "Add contents to report" popup
 2017-05-23 09:57:39 +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
Matej Zrimšek 20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +02:00
Matej Zrimšek f78c80b148 Added possibility to add uncompleted steps to report. [closes SCI-414] 2017-05-17 13:25:21 +02:00
Oleksii Kriuchykhin f28df506f9 Fix bug in counting search results for assets [SCI-1284] 2017-05-17 09:08:40 +02:00
Matej Zrimšek ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Zmago Devetak 39203a16f4 Merge pull request #622 from ZmagoD/zd_SCI_1261 
fixes remove user action on project [fixes SCI-1261]
 2017-05-15 15:28:39 +02:00
Zmago Devetak a151bbdd7d Merge pull request #623 from ZmagoD/zd_SCI_974 
adds persistence to experiments order in project overview [fixes SCI-…
 2017-05-15 15:28:18 +02:00
okriuchykhin 16325db1c6 Merge pull request #621 from okriuchykhin/ok_SCI_1263 
Fix sorting in reports [SCI-1263]
 2017-05-15 09:57:35 +02:00
zmagod c35e2a4860 adds persistence to experiments order in project overview [fixes SCI-974] 2017-05-15 09:54:37 +02:00
okriuchykhin 8e523782d9 Merge pull request #619 from okriuchykhin/ok_SCI_617 
Fixes error when cloning experiments with long names [SCI-617]
 2017-05-12 16:53:38 +02:00
okriuchykhin a8bbc3c3ba Merge pull request #615 from okriuchykhin/ok_SCI_1008 
Fix task and step ordering in reports [SCI-1008]
 2017-05-12 16:44:57 +02:00
zmagod b6367981c7 fixes remove user action on project [fixes SCI-1261] 2017-05-12 16:18:53 +02:00
Oleksii Kriuchykhin 5a2d618b1d Fix sorting in reports [SCI-1263] 2017-05-12 16:04:19 +02:00
Oleksii Kriuchykhin 79efb34191 Fixes error when clonning experiments with long names [SCI-617] 2017-05-12 11:07:11 +02:00
Zmago Devetak 0dc4addd6c fix typo 2017-05-12 10:10:50 +02:00
Oleksii Kriuchykhin bb8c7c342c Add additional info to samples info modal [SCI-960] 2017-05-11 22:20:06 +02:00
Oleksii Kriuchykhin 0ef9c7eff6 Fix task ordering in reports [SCI-1008] 2017-05-11 15:30:19 +02:00
okriuchykhin ab0d882be1 Merge pull request #614 from okriuchykhin/ok_SCI_1254 
Fix step actions in reports [SCI-1254]
 2017-05-11 14:44:36 +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
Oleksii Kriuchykhin fe134419a3 Fix step actions in reports [SCI-1254] 2017-05-11 13:51:43 +02:00
okriuchykhin 328c9292b1 Merge pull request #606 from okriuchykhin/ok_SCI_1235 
Fix error messages display during file upload in steps and results [SCI-1235]
 2017-05-11 13:00:36 +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
zmagod 2081e0a94b Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1 2017-05-10 15:14:17 +02:00
Zmago Devetak ff0f85fce8 Merge pull request #592 from ZmagoD/zd_SCI_160 
removes TempFile after 7 days [fixes SCI-160]
 2017-05-10 09:32:18 +02:00
Oleksii Kriuchykhin 52ad5ecdc2 Fix error messages display during file upload in steps and results [SCI-1235] 2017-05-09 17:13:47 +02:00
zmagod 04ee24d553 refactor 2017-05-09 14:05:21 +02:00
okriuchykhin ccc640f2bc Merge pull request #593 from okriuchykhin/ok_SCI_1158 
Add advanced search options [SCI-1158]
 2017-05-09 10:23:34 +02:00
okriuchykhin bd0b930382 Merge pull request #598 from okriuchykhin/ok_SCI_152 
Add counters for users and comments on canvas [SCI-152]
 2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin 7a61f5813c Add comments to the code [SCI-152] 2017-05-09 10:22:01 +02:00
Oleksii Kriuchykhin bd5a48b9c8 Improve code style [SCI-1158] 2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin 344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +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
ajugo 2973ead765 Missing files, comments, checklist in steps [fixes SCI-1224] (#591) 
* Missing files, comments, checklist in steps [fixes SCI-1224]

* Code fixes
 2017-05-08 10:44:15 +02:00
Oleksii Kriuchykhin 0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
zmagod f079a097c5 removes TempFile after 7 days [fixes SCI-160] 2017-05-05 14:54:22 +02:00
Zmago Devetak f3415abe3e Merge pull request #587 from ZmagoD/zd_SCI_1233 
fixes bug with empty checklist item [fixes SCI-1233]
 2017-05-05 10:11:52 +02:00
zmagod f784844472 fixes bug with empty checklist item [fixes SCI-1233] 2017-05-04 16:15:00 +02:00
zmagod 8d0c22327b adds asc order to checklists [fixes SCI-1228] 2017-05-04 15:17:34 +02:00
zmagod acc5594f1b add popup for approval to complete the Task [fixes SCI-1200] 2017-05-04 12:41:22 +02:00
zmagod 5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
Zmago Devetak cc6c2942c2 Merge pull request #574 from ZmagoD/zd_SCI_1194_v2 
prevent to get nil as a param in checklist_item_annotation method [fi…
 2017-05-03 10:56:21 +02:00
zmagod d5abb52909 refactor 2017-05-03 10:55:11 +02:00
Oleksii Kriuchykhin cf7d0ea248 Fix dowloand of export zip files from local storage [SCI-1128] 2017-04-26 13:23:30 +02:00
zmagod 0456393317 prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194] 2017-04-25 16:22:10 +02:00
zmagod ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02: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
mlorb 54f1c7b3e8 Merge pull request #566 from mlorb/ml_sci_365 
New experiment redirection [SCI-365]
 2017-04-24 08:55:55 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +02:00
Mojca Lorber 0bae4657f6 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
Mojca Lorber b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
zmagod 0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00
mz3944 a0b5a94d67 Merge pull request #564 from mz3944/mz-SCI-856 
Case insensitive email invitation
 2017-04-19 09:36:46 +02:00
zmagod 37be04c09c add tiny_mce controller 2017-04-19 09:13:16 +02:00
Matej Zrimšek bafdbf4082 Email is now case insensitive when inviting users by it. [fixes SCI-856] 2017-04-18 18:01:29 +02:00
mz3944 0ebf294844 Merge pull request #562 from mz3944/mz-SCI-1187 
Added general locale for cases when a name is optional and is not spe…
 2017-04-18 15:26:35 +02:00
Matej Zrimšek a889174938 Name of result tables should be nil, as it can't be specified. [fixes SCI-1187] 2017-04-18 15:08:13 +02:00
Zmago Devetak e1a30cc17c Merge pull request #558 from ZmagoD/zd_SCI_1192 
fixes broken users search method for smart annotation [fixes SCI-1192]
 2017-04-14 15:38:33 +02:00
zmagod 8af3858209 fix hound 2017-04-14 11:13:58 +02:00
zmagod 9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Mojca Lorber 27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
zmagod 90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod e77df92017 fix samples_controller 2017-04-06 15:26:24 +02:00
zmagod 9bb1bb3f9b refactor [fixes SCI-825] 2017-04-06 15:08:03 +02:00
zmagod 439cd0cd89 add notification to experiments 2017-04-06 14:55:18 +02:00
zmagod 046b608018 add notification for my_module/project comments 2017-04-06 14:07:22 +02:00
zmagod b398bb7516 add step annotations methods in steps_action concerns 2017-04-06 13:06:20 +02:00
zmagod f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
zmagod bb437bd8c5 adds notification to results annotation 2017-04-06 09:33:49 +02:00
zmagod d331911ffe completed step annotations 2017-04-06 08:42:16 +02:00
zmagod 99c116f257 first run 2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin 42ccefe2ce Remove logs table and old unused logging code [SCI-1127] 2017-03-30 11:47:57 +02:00
Zmago Devetak 2b35b34eb8 Merge pull request #529 from ZmagoD/zd_SCI_1135 
fixes alert messages in samples [fixes SCI-1135]
 2017-03-29 14:57:11 +02:00
zmagod 0096f9dc14 refactor 2017-03-29 09:32:23 +02:00
zmagod 9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +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
zmagod 023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
zmagod 94732c6d18 adds delayed zip generator 2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin 2edebb282a Add team_id field to assets and tables [SCI-1046] 2017-03-23 10:36:55 +01:00
zmagod 4385c68f5f adds zip_export utility first run 2017-03-21 16:15:11 +01:00
zmagod d8955d1a78 fixes breadcrumbs in office file [fixes SCI-1111] 2017-03-20 13:48:45 +01:00
Mojca Lorber 83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod 5cc6cd094e refactor 2017-03-17 16:47:58 +01:00
zmagod 307fef17d8 fixes owner id if empty 2017-03-15 18:01:15 +01:00
Zmago Devetak 1afb4c9a42 Merge pull request #515 from ZmagoD/file_owner_id_bug 
fixes bug with wopi contorller
 2017-03-15 17:40:07 +01:00
zmagod c5156f5ca3 fixes bug with wopi contorller 2017-03-15 17:33:36 +01:00
Mojca Lorber 4792bd87b9 fix error message when editing custom column on locked task 2017-03-15 14:09:44 +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 15b1712a3d fixes bug with organization 2017-03-14 13:29:59 +01:00
zmagod df2abe5d17 fixed typo 2017-03-13 13:51:31 +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
Oleksii Kriuchykhin 456934464a Remove unneeded validation calls [SCI-1090] 2017-03-09 17:20:27 +01:00