scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
2376 commits 31 branches 181 tags 166 MiB
Commit graph

63 commits

Author SHA1 Message Date
Matej Zrimšek
07fea16d26 Fix permissions for editing and deleting custom repository custom columns. [SCI-1524] 2017-07-28 12:01:11 +02:00
zmagod
bad52ceff1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336 2017-06-21 15:56:07 +02:00
okriuchykhin
97a94ff4a3 Merge pull request #679 from okriuchykhin/ok_SCI_1345 
Fix repository view permissions for team guests [SCI-1345]
 2017-06-13 15:47:44 +02:00
Oleksii Kriuchykhin
2d693a3fb7 Fix repository view permissions for team guests [SCI-1345] 2017-06-13 10:33:08 +02:00
zmagod
a865253a2e first run 2017-06-13 08:10:10 +02:00
Mojca Lorber
9108102b42 fix permissions 2017-06-12 17:34:36 +02:00
Luka Murn
38361e4bb4 Setup initial GUI 2017-06-07 18:43:48 +02:00
Oleksii Kriuchykhin
8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Mojca Lorber
51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber
dde714d78f fix hound 2017-06-06 13:33:57 +02:00
Mojca Lorber
da98788031 small code fixes 2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Matej Zrimšek
419d638163 Renamed reposiotry edit and destroy permission helper. [fix 1269] 2017-06-05 17:36:26 +02:00
Matej Zrimšek
5c9a453439 Added permissions for deleting and renaming of repositories. [SCI-1269] 2017-06-02 17:50:34 +02:00
mlorb
58ac457d38 fix merge bug 2017-05-23 11:32:02 +02:00
mlorb
872f712be8 Merge branch 'custom-repositories' into ml_sci_1266_v2 2017-05-23 11:05:25 +02:00
Mojca Lorber
9ae615264d add global repositories screen - tab control 2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin
e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
mlorb
39e1ac4b26 Merge pull request #512 from biosistemika/ml_sci_1074 
Fix permissions for experiment actions [SCI-1074]
 2017-03-10 11:44:27 +01:00
Mojca Lorber
1ba5f1748f fix permissions for experiment actions 2017-03-09 17:45:34 +01:00
Oleksii Kriuchykhin
0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
okriuchykhin
8e18ff44a6 Merge pull request #479 from okriuchykhin/ok_SCI_999 
Add task complete/uncomplete functionality [SCI-999]
 2017-02-20 15:19:00 +01:00
Luka Murn
c6ed73bc82 Allow team admins to see all projects, even hidden ones 2017-02-13 13:42:53 +01:00
Oleksii Kriuchykhin
cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00
zmagod
f04a2f663a renamed organizations in config/ 2017-01-25 12:30:11 +01:00
zmagod
9ae799d52c rename organization/org/Organization to Team in datatables 2017-01-25 09:48:49 +01:00
Luka Murn
3bee9d2e12 Save an (yet unworking) version of user smart annotations 
Used so other devs can start working on smart annotations.
 2017-01-04 10:54:02 +01:00
Luka Murn
da630ac2cb Make edit, delete buttons clickable & hide them if neccesary 2016-12-09 13:18:59 +01:00
Luka Murn
595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Zmago Devetak
b26bf7b183 Merge pull request #136 from ZmagoD/zd_SCI_370 
Enabled to delete results in task archive [fixes SCI-370]
 2016-09-13 15:22:08 +02:00
zmagod
691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
zmagod
faed0500c7 set move and clone permissions to also validate the user on the organizational level [fixes SCI-372] 2016-09-08 09:23:29 +02:00
Luka Murn
a0311970f8 Add missing commits for showing image and not able to preview 2016-08-26 16:49:32 +02:00
Luka Murn
24dd25d9f5 Add edit/delete result comment functionality 
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
 2016-08-25 13:51:31 +02:00
Luka Murn
bac0455435 Add edit&delete functionality to step comments 
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
 2016-08-25 13:51:31 +02:00
Luka Murn
8a73a3ab5c Update permission_helper.rb and routes.rb 2016-08-25 13:51:30 +02:00
Luka Murn
319bcc7850 Add permissions for comments to permission_helper.rb 2016-08-25 13:51:30 +02:00
Jure Grabnar
00da7efb44 Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 
Conflicts:
	app/models/experiment.rb

SCI-328 #close
 2016-08-24 13:11:10 +02:00
zmagod
27d77bc73f added new permission for dropdown actions 2016-08-24 10:56:30 +02:00
Jure Grabnar
6879521a75 Add missing .experiment to can_unlink_protocol 2016-08-18 10:48:44 +02:00
Jure Grabnar
0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +02:00
Jure Grabnar
7f21ae138a Set clone actions/routes/view 
DRY code for showing AJAX on project#show page
 2016-08-11 09:46:15 +02:00
Jure Grabnar
a0fe31479f Fix permissions for archived experiments 2016-08-09 10:00:44 +02:00
Jure Grabnar
0ca5725f9b Archive/restore of experiments now work 2016-08-08 16:35:45 +02:00
Jure Grabnar
2bd74866e0 Fix my_modules archive page 2016-08-08 15:04:02 +02:00
Jure Grabnar
5a023483d7 Prepare views for experiment archive 2016-08-08 14:19:35 +02:00
Jure Grabnar
775a39344c Fix experiment archive permissions 2016-08-08 13:40:08 +02:00
zmagod
9c5c4f0a3a Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44 2016-08-05 15:23:01 +02:00
zmagod
caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
zmagod
9581e2751f fixes samples page for experiment level [fixes SCI-44] 2016-08-02 08:44:07 +02:00