scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 05:02:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
5488 commits 39 branches 184 tags 168 MiB
Commit graph

326 commits

Author SHA1 Message Date
aignatov-bio
687b53feb1
Add new tag activtiies [SCI-3341] (#1712) 
* Add new tag activtiies
 2019-04-30 10:23:09 +02:00
Oleksii Kriuchykhin
260782e233 Update tests for new rich text enabled fileds [SCI-3264] 2019-04-24 13:45:29 +02:00
Oleksii Kriuchykhin
7c91b4a255 Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266 2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin
c7a707f9db Fix task clonning with TinyMCE images [SCI-3266] 2019-04-23 15:16:40 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio
6ac620feb3
Migration for old tinymce assets [SCI-3176] (#1663) 
* adding rake task

* Addign test for update images

* Adding tests for tiny mce model
 2019-04-19 15:24:54 +02:00
aignatov-bio
a75c4c2f91
Update Result API for new tiny mce image format (#1674) 2019-04-19 14:44:16 +02:00
Oleksii Kriuchykhin
96cf7b4de2 Fix failing tests [SCI-3177] 2019-04-17 12:58:47 +02:00
Urban Rotnik
22af36dd2d Fix for exports_left, fix for some edge cases 2019-04-16 09:59:02 +02:00
Urban Rotnik
caccf8d9f0 Reset counter for export in last 24 hours 
Fix for check if user has avaiable exports, bit refactored increas_counter method.
 2019-04-10 10:56:33 +02:00
Anton Ignatov
94efd2e649 Fix tests 2019-04-02 16:04:50 +02:00
Urban Rotnik
86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Anton Ignatov
c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +02:00
Urban Rotnik
8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
aignatov-bio
e6102c72c7
Adding missed activities [SCI-3253] (#1614) 
* Adding missed activties

* Adding test for activities
 2019-04-02 11:50:37 +02:00
Urban Rotnik
b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163 
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
 2019-04-01 14:32:54 +02:00
Jure Grabnar
ebc2d8ee75 Fix experiment_spec test using the old variable 
Closes SCI-3244
 2019-04-01 12:50:35 +02:00
Mojca Lorber
f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Jure Grabnar
f3e6a35121 Update PermissionEval tests with team check 2019-03-21 10:45:21 +01:00
Mojca Lorber
c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Anton Ignatov
5d6f009ee8 fix error for delay deleting 2019-03-20 15:20:31 +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
Jure Grabnar
5de51f9c58 Prevent smart annotations accessing other teams when importing protocol 
Closes SCI-3163
 2019-03-20 12:58:22 +01:00
Mojca Lorber
4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Mojca Lorber
7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik
fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +01:00
Urban Rotnik
c65d1af18d Fix failing tests 2019-03-13 09:53:34 +01:00
Urban Rotnik
b6a8556601 Add activities for exporting Projects, Inventory items 2019-03-12 09:15:06 +01:00
Urban Rotnik
e7b57aa4f7 Add creating activities for Team actions 2019-03-12 09:15:06 +01:00
Urban Rotnik
3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik
cfe2888bea Repository columns actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
2a7bbac733 Repository actions logging 2019-03-12 09:11:00 +01:00
Urban Rotnik
976831e7d3 Edit and Archive experiment activity logging 2019-03-12 09:11:00 +01:00
Urban Rotnik
b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Urban Rotnik
9ed3313f0f Create project activity refactored 2019-03-11 08:36:15 +01:00
Urban Rotnik
117944117b Add service for activity creation 2019-03-11 08:36:15 +01:00
Miha Mencin
51b3aea49a added uniquness validator and index on user_projects and user_teams relations 
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
 2019-02-27 15:09:47 +01:00
Urban Rotnik
5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Urban Rotnik
5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
Miha Mencin
bcd0b433b6
Merge pull request #1514 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-21 16:38:58 +01:00