scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5130 commits 70 branches 179 tags 165 MiB
Commit graph

90 commits

Author SHA1 Message Date
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 132f46b136 Improve error handling in task inventories dropdown [SCI-2776] 2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin 534866467b Add counters to task inventories dropdown [SCI-2776] 2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin d5c07fd22a Improve rendering speed of inventory table [SCI-2910] 2018-12-13 16:17:22 +01:00
mlorb 426fadc10a Fix due date can not be set 2018-12-11 10:31:13 +01:00
Oleksii Kriuchykhin 537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Luka Murn 84df2c81f9 Merge branch 'features/export-all' 
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
 2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin 8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Matej Zrimšek 18e52e2c6f Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin 84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Zanz2 b26530a02f Found a new, and more elegant fix inside controller with Luka 2018-08-28 14:48:23 +02:00
zmagod f769215468 fixes assign items flash message [fixes SCI-2487] 2018-06-08 10:02:57 +02:00
Oleksii Kriuchykhin 2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
zmagod 89046e9787 fixes items assign flash message [fixes SCI-2395] 2018-05-29 12:54:41 +02:00
zmagod 10351bbf83 fixes tast description/due-date modal [fixes SCI-2433] 2018-05-24 16:44:10 +02:00
Oleksii Kriuchykhin 1d0536b064 Fix task resore permissions [SCI-2385] 2018-05-15 11:51:53 +02:00
Zmago Devetak 0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261 
propagate assigned repository items in workflow [fixes SCI-2261]
 2018-05-10 09:57:49 +02:00
zmagod 0fe499d4a1 adds the update action to repository records last_modified_by field when downstreaming assigned records 2018-05-10 09:04:12 +02:00
zmagod 8dac887f10 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261 2018-04-26 14:18:41 +02:00
zmagod 24acd5c779 fixes per @duco 's request 2018-04-26 14:13:46 +02:00
mlorb 88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
mlorb 9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
zmagod 824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +02:00
mlorb 600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +02:00
Oleksii Kriuchykhin aa69624f9f Fix sample assign permissions [SCI-2249] 2018-03-25 20:10:32 +02:00
mlorb bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod 4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
zmagod 26883af386 fix assigned ordering 2018-03-08 17:36:10 +01:00
mz3944 bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011 
Wrapping up the permissions [SCI-2011]
 2018-03-06 07:10:40 +01:00
Matej Zrimšek c5b0a6525b Some additional permission calls fixes, minor refactoring. 2018-03-06 06:56:35 +01:00
Matej Zrimšek b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
mlorb d2dcb765b4 fix bug with load older activities button not working 2018-02-16 15:42:10 +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
mlorb 9797712561
Merge pull request #997 from mlorb/ml-sci-2045 
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
 2018-02-15 14:51:40 +01:00
Matej Zrimšek 6b1fee4d30 Added/joined repository record assignment to task with sample assignmment to task. 2018-02-14 14:39:10 +01:00
Matej Zrimšek 4c87fb4a55 Fixed permission error when restoring task. 2018-02-14 14:39:09 +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 0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek 7938c2e036 Minor code style changes. 2018-02-14 14:19:22 +01:00
Matej Zrimšek c5b798017e Minor Hound warning fixes. 2018-02-14 14:19:22 +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
Matej Zrimšek 854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
mlorb 8d0ac93c80 add check to start work on next task notification if recent changes notification is switched off 2018-02-13 11:01:45 +01:00
mlorb e151c963e1 fix error on task activity 2018-02-06 16:34:16 +01:00
mlorb ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491 
Add notification for previous task has been completed [SCI-1491]
 2018-01-25 11:35:19 +01:00
Mojca Lorber ac8b1769be add notification for previous task has been completed 2018-01-23 15:53:33 +01:00
mlorb 3f5e9e60b7 refactor view repository permission 2017-12-14 14:18:18 +01:00