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
Oleksii Kriuchykhin 84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
mlorb 288e3ddcbd
Merge pull request #877 from mlorb/ml-sci-1190 
Fix bug when removing all keywords in protocol [SCI-1190]
 2017-11-15 11:22:18 +01:00
Mojca Lorber c2a5b52767 fix bug when removing all keywords in protocol 2017-11-14 15:04:37 +01:00
Zanz2 6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2 f35ab78849 Added some code to make the two seperate jira issues work together (protocol info and scinote tables 2017-11-14 00:56:39 +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 b265beb386
Merge pull request #864 from Zanz2/move_desc 
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
 2017-11-13 10:07:01 +01:00
Zanz2 23d3ffa5a4 Fixed PR 2017-11-12 15:48:45 +01:00
Zanz2 e7384ac38d Code review fixes, made seperate helper file 2017-11-12 15:31:04 +01:00
Zanz2 fa2c0fe556 merging 2017-11-09 18:55:17 +01:00
Zanz2 812fa3f1d5 Hopefully this will resolve my merge problems 2017-11-09 17:42:17 +01:00
zmagod 9eac014f1a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
zmagod e2af987b80 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568 2017-11-09 08:35:39 +01:00
zmagod 54e360bb52 fixes team switch 2017-11-06 15:14:17 +01:00
mlorb 126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json 
Scinote protocols IO base branch
 2017-11-06 14:53:01 +01:00
Zanz2 aa03a889c7 Fixed PR review 2017-11-03 16:28:15 +01:00
zmagod 5bc38414d1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-03 09:56:44 +01:00
zmagod 2118b31762 adds about sciNote modal 2017-11-02 13:23:57 +01:00
Zanz2 de9a3a1d0d Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly 2017-10-28 23:57:29 +02:00
Zanz2 2413dc251a Added new preview tables code 2017-10-28 02:19:22 +02:00
okriuchykhin 2e0bf91467 Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675 
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
 2017-10-27 11:14:39 +02:00
Zanz2 a732c8afa7 Code for protocol repository scinote table elements view 2017-10-26 17:28:27 +02:00
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod d2ed415a25 Fixes per @okriuchykhin 's request 2017-10-26 10:42:18 +02:00
Zanz2 79e0a11054 Fixed before start and link not displaying in protocol description 2017-10-25 17:39:01 +02:00
zmagod 5e6a4bb69a adds environment variable that disables/enables the creation of new team when user sign up 2017-10-25 15:29:04 +02:00
zmagod c36fcb1fa4 fixes user invitation button [fixes SCI-1726] 2017-10-25 11:31:32 +02:00
Zanz2 19b9da2e83 deleted comment 2017-10-24 19:44:34 +02:00
Zanz2 49501b3d3d Finished review refactor 2017-10-24 19:24:53 +02:00
Luka Murn c026b60790 Update Profile page to use validation 2017-10-23 18:04:20 +02: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
okriuchykhin 44733fefda Merge pull request #839 from okriuchykhin/ok_SCI_1609 
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
 2017-10-19 16:26:36 +02:00
Oleksii Kriuchykhin 631b41cdaa Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551] 2017-10-19 11:38:23 +02:00
Zanz2 67b09adaeb Fixed last few rubocop errors 2017-10-17 19:43:46 +02:00
Zanz2 6cf775a4b1 Refactored code, made html render on preview too 2017-10-17 19:27:20 +02:00
okriuchykhin 8e90e041b9 Merge pull request #825 from okriuchykhin/ok_SCI_1665 
Optimize memory usage in samples/repositories import [SCI-1665]
 2017-10-17 17:26:00 +02:00
zmagod c554bc5c18 fixes accept invitation bug [fixes SCI-1684] 2017-10-17 16:00:26 +02:00
Oleksii Kriuchykhin cd0aba1896 Change any? to empty? [SCI-1665] 2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin c8d2ae70fa Move duplicated code to service [SCI-1665] 2017-10-17 14:46:16 +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
Zanz2 e72c1bebcb deleted comments 2017-10-12 19:18:22 +02:00
Zanz2 8d0d6f0502 refactored methods 2017-10-12 19:10:16 +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
Zanz2 21036a1081 Deleted unnecesarry if's 2017-10-12 17:22:02 +02:00
Zanz2 414a15872c Made seperate method for steps mapping 2017-10-12 17:15:43 +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
Oleksii Kriuchykhin 56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
Zanz2 5d667f146e Moved .js form reset and made a standalone description method 2017-10-11 17:59:09 +02:00
Luka Murn fe89b942e7 Add Add-ons page to User -> Settings -> Account 
Closes SCI-1675.
 2017-10-11 14:15:37 +02:00
Oleksii Kriuchykhin f8334b3d5b Add editable field to task in tasks tree API call [GIOT-44] 2017-10-09 14:38:33 +02:00
zmagod d85233cb2c Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566 2017-10-09 09:30:06 +02:00
zmagod 2a64d23a6e Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567 2017-10-09 09:14:58 +02:00
Zanz2 8720222ac2 Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper) 2017-10-07 22:45:01 +02:00
Zanz2 183c93d21b Refactoring to git review specifications 2017-10-07 22:13:31 +02:00
Zanz2 9655c98566 Github review refactor 2017-10-07 20:47:05 +02:00
Zanz2 f5b2ad0d34 Refactor github code review 2017-10-07 16:07:04 +02:00
Zanz2 66e5004e60 Changed import text to be inside en.yml, as said in the code review, deleted some blank lines 2017-10-07 15:56:43 +02:00
Oleksii Kriuchykhin 6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
zmagod 5a31df7204 adds @Ducz0r suggestions 2017-10-06 10:45:22 +02:00
zmagod dea69014d0 fixes bug with password confirmation 2017-10-06 09:54:17 +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 a020e23286 follow suggestions of @Ducz0r 2017-10-05 13:56:56 +02:00
zmagod 754627efe7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564 2017-10-05 11:08:31 +02:00
zmagod 524e8bffbf fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567] 2017-10-05 10:07:50 +02:00
zmagod 3dc3ed906f fixes bug with embedded images [fixes SCI.1624] 2017-10-02 18:06:42 +02:00
zmagod edf4443995 added notification alert [fixes SCI-1566] 2017-10-02 14:51:54 +02:00
Oleksii Kriuchykhin 6824f9a8bc Improve memory utulization in PDF report generator [SCI-1482] 2017-10-02 11:29:22 +02:00
zmagod cb4bacc372 refactor preferences page [fixes SCI-1564] 2017-09-28 16:53:51 +02:00
zmagod c8c8afdd1d update react-bootstrap 2017-09-28 15:00:54 +02:00
mlorb c358f8fa0c write unit tests for invite users 2017-09-28 14:49:33 +02:00
zmagod 26b526d61b adds getter and setters for user settings 2017-09-27 14:38:52 +02:00
zmagod 66269d68ff fixed image upload 2017-09-27 09:17:09 +02:00
zmagod e2aa0d7515 fixes user profile 2017-09-26 17:29:11 +02:00
Zanz2 b23ca33e73 Deleted todo-list comments :D 2017-09-26 16:46:17 +02:00
Zanz2 c72cf6320a Finished rubocop refactoring 2017-09-26 16:19:09 +02:00
Zanz2 8d961c934a Rubocop refactored part of the controller code 2017-09-26 13:17:00 +02:00
Zanz2 2bfe8f0b95 Testing why rubocop gives errors 2017-09-25 15:27:24 +02:00
Zanz2 292c1e3c31 Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first 2017-09-25 14:14:27 +02:00
Zanz2 11b2ef3112 Made code nicer, hopefully not unintentionally breaking something 2017-09-25 13:53:32 +02:00
zmagod 1a7f8fc857 added frontend validations 2017-09-22 16:59:38 +02:00
Zanz2 dd4d4072e8 Made code more aesthetic 2017-09-22 16:02:56 +02:00
Zanz2 6ebdea5dce Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code) 2017-09-22 15:12:29 +02:00
Zanz2 4051c0b06b Deleted old unused files i spotted on github 2017-09-22 13:28:38 +02:00
Zanz2 deef790951 added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions 2017-09-22 11:56:50 +02:00
mlorb 9d96bf668a fix error handeling, refactoring 2017-09-21 16:42:56 +02:00
Zanz2 1dbb03e22d Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer 2017-09-21 16:05:33 +02:00
zmagod 39025769ec Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564 2017-09-21 13:45:27 +02:00
zmagod ed2beefc08 fixed profile info inputs 2017-09-21 13:42:49 +02:00
mlorb 55772a80ab fix hound and refactor 2017-09-21 10:45:36 +02:00
mlorb 48c8922604 adds invite users modal 2017-09-21 10:45:35 +02:00
Zanz2 f48833c47a added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload(); 2017-09-21 08:40:05 +02:00
Luka Murn e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
Luka Murn 5429f6bbbd Fix @ZmagoD's remarks 2017-09-21 08:06:11 +02:00
Zanz2 d59234a1e3 minor changes, working on refresh after submit 2017-09-20 16:04:52 +02:00
Zanz2 72c707ae88 protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit 2017-09-20 15:31:10 +02:00
Luka Murn 416ccf905d Minor fix 2017-09-20 10:53:38 +02:00
Zanz2 7b85d74a23 added jquery code to reset file selector selected file after it is canceled in the preview modal 2017-09-20 09:32:31 +02:00
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