Anton Ignatov
|
65521533b4
|
change js.erb to js
|
2019-03-22 13:35:11 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
Anton Ignatov
|
bc58f0aecd
|
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
|
2019-03-21 11:48:51 +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 |
|
Oleksii Kriuchykhin
|
0c2b7959b6
|
Fix smart annotations in RTE [SCI-3111]
|
2019-03-20 11:41:36 +01:00 |
|
Oleksii Kriuchykhin
|
a822227383
|
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +01:00 |
|
Oleksii Kriuchykhin
|
645930b8d7
|
Merge branch 'master' into features/note-section
|
2019-03-14 16:25:51 +01:00 |
|
aignatov-bio
|
125d2a3b9b
|
New inline tags editing in task [SCI 3093] (#1529)
* Adding inline tags selection
|
2019-03-06 09:18:45 +01:00 |
|
aignatov-bio
|
b1df8c9aa7
|
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
|
2019-03-06 09:17:34 +01:00 |
|
Miha Mencin
|
9807c80286
|
move the create action to the tope section of controller
|
2019-03-05 10:49:36 +01:00 |
|
Miha Mencin
|
67fe486874
|
put the scheduling logic into session create action
|
2019-03-05 10:43:39 +01:00 |
|
Miha Mencin
|
fa7bba9de7
|
scheduling creation of demo project at the sign in time
remove wrong schema, fix comment, add migration
|
2019-03-04 18:26:15 +01:00 |
|
Miha Mencin
|
844303ae7c
|
SCI-3119 schedule the creaton of template
|
2019-03-01 17:47:04 +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 |
|
aignatov-bio
|
5f78d83f9c
|
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
|
2019-02-21 16:15:13 +01:00 |
|
aignatov-bio
|
fcdb4e7a92
|
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-19 13:51:18 +01:00 |
|
aignatov-bio
|
8e905b67b2
|
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
|
2019-02-19 11:08:59 +01:00 |
|
aignatov-bio
|
c598541e09
|
System notification modal window [SCI-2957 and SCI-2958] (#1484)
* Added new system notification modal
* Adding loading system notification on sign in
|
2019-02-15 13:07:29 +01:00 |
|
mlorb
|
71e4cc4dbd
|
Merge branch 'master' into ml-sci-2940
|
2019-02-13 14:35:03 +01:00 |
|
aignatov-bio
|
5c85595ab4
|
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482)
* System notification view and notification partial (SCI 2956 and SCI 3001)
|
2019-02-13 13:06:14 +01:00 |
|
Oleksii Kriuchykhin
|
3376fd012c
|
Improve error loggin in protocol import [SCI-3023]
|
2019-02-07 14:00:24 +01:00 |
|
Urban Rotnik
|
6f7fcb0831
|
Refactor method clone_experiment_as_template into service object
[SCI-2925]
|
2019-01-31 07:13:40 +01:00 |
|
mz3944
|
2ae56eb13f
|
Merge pull request #1448 from mz3944/mz-SCI-2929
Can not switch team [SCI-2929]
|
2019-01-31 04:43:39 +01:00 |
|
Urban Rotnik
|
4cf12d12d1
|
Refactor 'move_experiment' method into service object
Jira Ticket: SCI-2926
|
2019-01-28 11:45:36 +01:00 |
|
Urban Rotnik
|
16e9a56874
|
Add recaptcha to invitation modal
SCI-2935
|
2019-01-25 11:27:01 +01:00 |
|
Urban Rotnik
|
247bae8a9f
|
Refactor export_all_counter increasing/reseting logic
- Remove daily task
- Add method to user Model
|
2019-01-25 11:16:31 +01:00 |
|
Mojca Lorber
|
fa1dff6352
|
refactor Demo project generation
|
2019-01-24 13:40:53 +01:00 |
|
mz3944
|
f6c8af105d
|
Merge pull request #1434 from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
|
2019-01-21 09:50:34 +01:00 |
|
Miha Mencin
|
0766ee96a7
|
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-16 12:44:50 +01:00 |
|
Oleksii Kriuchykhin
|
3a4b992f4e
|
Code style fixies []SCI-2875]
|
2019-01-14 16:31:23 +01:00 |
|
Matej Zrimšek
|
a5c1cf4450
|
Switch user's team if he's no longer a member of the currently selected one
|
2019-01-12 23:39:31 +01:00 |
|
Oleksii Kriuchykhin
|
89240659a7
|
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-11 17:20:39 +01:00 |
|
Alex Kriuchykhin
|
b530cea771
|
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-11 16:27:22 +01:00 |
|
Oleksii Kriuchykhin
|
132f46b136
|
Improve error handling in task inventories dropdown [SCI-2776]
|
2019-01-10 21:11:20 +01:00 |
|
Matej Zrimšek
|
8070b7f8b5
|
Fix Date and Time display formats on JS side
|
2019-01-08 08:07:24 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Alex Kriuchykhin
|
8a348b8504
|
Merge pull request #1422 from okriuchykhin/ok_SCI_2910
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-16 19:45:29 +01:00 |
|
Oleksii Kriuchykhin
|
d5c07fd22a
|
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-13 16:17:22 +01:00 |
|
Oleksii Kriuchykhin
|
311189a2e9
|
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-13 11:18:09 +01:00 |
|
Alex Kriuchykhin
|
4e416fe81b
|
Merge pull request #1404 from okriuchykhin/ok_SCI_2822
Return task inputs/outputs as references [SCI-2822]
|
2018-12-12 11:36:39 +01:00 |
|
mlorb
|
3f79cc5f93
|
Merge pull request #1418 from mlorb/ml-sci-2905
Fix due date can not be set [SCI-2905]
|
2018-12-12 11:27:57 +01:00 |
|
mlorb
|
426fadc10a
|
Fix due date can not be set
|
2018-12-11 10:31:13 +01:00 |
|
mlorb
|
4040b31143
|
Fix behavior when user has no teams
|
2018-12-10 15:42:05 +01:00 |
|
Alex Kriuchykhin
|
37db41e18e
|
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-12-10 14:11:34 +01:00 |
|
Oleksii Kriuchykhin
|
2c96f08b98
|
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-11-29 14:20:20 +01:00 |
|
Oleksii Kriuchykhin
|
5b566b48ae
|
Improve error messages and fix task users/items endpoints [SCI-2886]
|
2018-11-28 14:14:45 +01:00 |
|
Oleksii Kriuchykhin
|
b3a377f949
|
Return task inputs/outputs as references [SCI-2822]
|
2018-11-28 11:33:00 +01:00 |
|
Alex Kriuchykhin
|
20e2cbf0ca
|
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
Fix smart annotations rendering issues [SCI-2880]
|
2018-11-28 09:47:20 +01:00 |
|