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
2586 commits 70 branches 179 tags 165 MiB
Commit graph

860 commits

Author SHA1 Message Date
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
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
Zanz2 bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 
Fixed validations lengths and added workarounds for bugs [SCI-1833]
 2017-11-24 17:55:20 +01:00
Zmago Devetak 027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651 
export and import RTE images
 2017-11-24 16:28:28 +01:00
zmagod d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
Zanz2 dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
Zanz2 764e5259d1 Fixed last review, and a bug i found 2017-11-22 23:38:22 +01:00
zmagod afbeafb137 adds RTE images import, disables turbolinks on edit step actions 2017-11-22 16:28:14 +01:00
Zanz2 f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
Zanz2 d8c809ffd0 Reviewed pull request 2017-11-20 23:19:34 +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 a6009806c4 Fixed some oversights 2017-11-17 02:56:16 +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
Zanz2 4d65ad59fe
Merge pull request #878 from Zanz2/protocol_description_fix 
Found a bug; i forot to include protocol description in new preview modal
 2017-11-16 01:11:52 +01:00
mlorb 47784e09a8
Merge pull request #867 from mlorb/ml-sci-1434 
Add explanation when copying custom repositories [SCI-1434]
 2017-11-15 11:34:02 +01:00
Zanz2 c3f6c2b34a Found a bug where i forot to include protocol description in preview modal and fixed it 2017-11-14 19:46:51 +01:00
Zanz2 bc00c4a28b
Merge pull request #874 from Zanz2/supported_file_1794 
Made button green and added .json to supported file [SCI-1794]
 2017-11-14 19:12:45 +01:00
Zanz2 6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2 7ec8d7c2b2 Made button green and added .json to supported file 2017-11-14 11:46:19 +01:00
Mojca Lorber be74338d9f add explanation when copying custom repositories 2017-11-13 16:30:42 +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 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
Zanz2 a40a63ae50 Made code more aesthetic 2017-11-09 15:38:06 +01:00
Zanz2 518eb09110 Deleted un needed error flash 2017-11-09 10:49:44 +01:00
Zanz2 4b837dbe9d Forgot flash fail messagges, now added them for file too big and general error 2017-11-09 10:49:44 +01:00
Zanz2 feb686b4ac Fixed alignement 2017-11-09 10:49:44 +01:00
Zanz2 8b247770ef Added the success flash alert 2017-11-09 10:49:44 +01:00
Zanz2 9086cd8b6b Jira branch code 2017-11-09 10:49:44 +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
Zanz2 096ee00e07 removed unnecessary html 2017-11-03 01:28:20 +01:00
Zanz2 6a4c38bbee Fixed table elements render bugs, now renders after shown event 2017-11-03 01:04:50 +01:00
Zanz2 6fc1afe4c1 Trying to fix this messy table preview 2017-10-30 01:57:42 +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 a167db11da Scinote table elements code 2017-10-28 20:20:19 +02:00
Zanz2 c291caaae3 Debbuging preive hot tables 2017-10-28 16:59:36 +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
Zanz2 a645bcb32d fixed oversight;Changed double quote to single 2017-10-25 17:21:05 +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
Zanz2 49501b3d3d Finished review refactor 2017-10-24 19:24:53 +02:00
Zanz2 03e40017e4 Updated local 2017-10-19 19:58:18 +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