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
3518 commits 70 branches 179 tags 165 MiB
Commit graph

177 commits

Author SHA1 Message Date
zmagod 86a8afd907 refactor 2018-03-16 15:56:12 +01:00
zmagod ee03115361 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095 2018-03-16 15:32:40 +01:00
Zmago Devetak d7679dcb99
Merge pull request #1032 from ZmagoD/zd_SCI_2141 
refactor global activities in separate page [fixes SCI-2141]
 2018-03-13 15:20:14 +01:00
zmagod 8fe173e831 re-structure top navigation bar 2018-03-12 16:27:35 +01:00
zmagod e218cae453 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +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 6b1fee4d30 Added/joined repository record assignment to task with sample assignmment to task. 2018-02-14 14:39:10 +01:00
Matej Zrimšek f21c794a95 Fixed permission error when accessing samples page. 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 7938c2e036 Minor code style changes. 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
Matej Zrimšek 13e9a2a132 Corrected some project level permissions; minor refactoring. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
zmagod 695e9d90d2 fixes user dropdown [fixes SCI-2033] 2018-02-07 08:43:42 +01:00
zmagod 25dcfe66ae Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960 2018-02-01 16:04:05 +01:00
zmagod 366b67ca1c fixes per @mojca 's request 2018-01-31 15:18:18 +01:00
zmagod b1684dbd5b removed unneeded hook 2018-01-31 14:40:19 +01:00
zmagod 34f5076b04 fixes failin specs [fixes SCI-2001] 2018-01-31 12:05:45 +01:00
zmagod 029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +01:00
zmagod 76b08e6ac9 add permissions in views 2018-01-24 13:59:57 +01:00
okriuchykhin 8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 
Remove Addons caption if no addons in info modal and fix linter packages
 2018-01-17 15:33:43 +01:00
Oleksii Kriuchykhin b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
Oleksii Kriuchykhin 79e1eaf145 Fix export samples button [SCI-1936] 2018-01-15 13:54:08 +01:00
mlorb 99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb 0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
mlorb 0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +01:00
mlorb 740ecc674b refactor view repositories permission 2017-12-14 14:18:18 +01:00
mlorb 3ca51f097f refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions 2017-12-14 14:18:17 +01:00
mlorb 72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb f801ed8eb6 refactor view/export samples permission 2017-12-14 14:18:16 +01:00
mlorb ccc2451494 refactor create sample permissions 2017-12-14 14:18:15 +01:00
mlorb a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +01:00
zmagod f71ff8589d changes testing image 2017-10-11 09:51:20 +02:00
Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
 2017-08-07 08:45:53 +02:00
zmagod a2b7bcda4c refactor repositories js files [fixes SCI-1485] 2017-07-17 15:05:28 +02:00
Luka Murn 3e80f761b8 Add "about" modal, prepare hooks, VERSION system for addons 
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
 2017-07-10 15:27:50 +02:00
Luka Murn 16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
 2017-07-06 15:12:15 +02:00
okriuchykhin 2e24e6b73a Merge pull request #725 from okriuchykhin/ok_SCI_1409 
Fix datatables [SCI-1409]
 2017-07-03 15:47:19 +02:00
Oleksii Kriuchykhin b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
Mojca Lorber a3514bdaf0 fix restore action from archives pages 2017-06-29 16:14:25 +02:00
Matej Zrimšek 4dbf5b0f53 Fixed sample types page load error, when viewing them on a task level. [SCI-1419] 2017-06-27 16:28:25 +02:00
mlorb 025050a7cd Merge pull request #716 from mlorb/ml-sci-1420 
Add tooltips to navigation bar [SCI-1420]
 2017-06-27 14:52:07 +02:00
Mojca Lorber d03be76f35 add tooltips to archive buttons 2017-06-27 14:48:45 +02:00
Mojca Lorber 0160956377 put all titles on links 2017-06-27 14:21:06 +02:00
Mojca Lorber 6bfb5e125c add tooltips to navigation bar 2017-06-27 13:46:49 +02:00
Matej Zrimšek f847b44067 Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
Matej Zrimšek d49524a26f Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378] 2017-06-20 16:10:50 +02:00
Mojca Lorber 4c3036af87 fix ordering of repositoris on task 2017-06-19 10:53:18 +02:00
Oleksii Kriuchykhin 2d693a3fb7 Fix repository view permissions for team guests [SCI-1345] 2017-06-13 10:33:08 +02:00