scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 14:46:00 +08:00
Code Issues Projects Releases Packages Wiki Activity
5925 commits 31 branches 181 tags 167 MiB
Commit graph

70 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
aignatov-bio
59e824ef9e
Fix nil handling in different places [SCI-2840] (#1777) 
* Fix nil handling in different places
 2019-05-21 15:53:34 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Jure Grabnar
f00f4d39af Refactor step activities using position_plus_one 
Closes SCI-3273
 2019-04-03 13:10:45 +02:00
Jure Grabnar
26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Mojca Lorber
3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
Mojca Lorber
f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Anton Ignatov
4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
Mojca Lorber
c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Anton Ignatov
55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov
07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Mojca Lorber
cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Urban Rotnik
7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Zanz2
ab3b15e13e Found the bug and fixed it 2018-08-21 13:26:16 +02:00
Matej Zrimšek
ff9dff5c10 Fixed reports permissions check calls. Fixed Hound warnings. 2018-02-22 13:51:22 +01:00
Matej Zrimšek
6ba226d514 Added missing '?' to the canaid permission calls that were missing it. 2018-02-16 11:12:30 +01:00
Matej Zrimšek
5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
Matej Zrimšek
09c5e23adf Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes. 2018-02-14 14:39:10 +01:00
Matej Zrimšek
d7108f5a35 Fixed Hound warnings. 2018-02-14 14:39:07 +01:00
Matej Zrimšek
8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
Matej Zrimšek
d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00
zmagod
2ad4eb3488 fix bug with checklists 2018-02-06 16:15:10 +01:00
zmagod
b48fa3f231 fixes bug with step table update [fixes SCI-2026] 2018-02-05 17:32:38 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +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
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
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
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
zmagod
3dc3ed906f fixes bug with embedded images [fixes SCI.1624] 2017-10-02 18:06:42 +02:00
lenart
e781dfc6a6 Truncate activity taking smart annotations into account fixes [SCI-1249] 2017-08-02 15:51:32 +02:00
lenart
58e2575c75 Truncate checklist items in activity modal [fixes SCI-1249] 2017-07-07 15:56:16 +02:00
zmagod
1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +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
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
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
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
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
Mojca Lorber
b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
zmagod
90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod
f16607579f refactor steps annotation 2017-04-06 13:03:13 +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
2edebb282a Add team_id field to assets and tables [SCI-1046] 2017-03-23 10:36:55 +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
Oleksii Kriuchykhin
f97c20e9b5 Fix hound warnings [SCI-999] 2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin
cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00