scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 03:35:25 +08:00
Code Issues Projects Releases Packages Wiki Activity
3595 commits 39 branches 184 tags 168 MiB
Commit graph

377 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
zmagod
659a088058 refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222] 2018-03-29 15:55:26 +02:00
mlorb
9aa87a17e5 remove help helper 2018-03-23 14:26:53 +01:00
mlorb
35afc06cbd
Merge pull request #1038 from mlorb/ml-sci-2118 
Code left-side menu bar [SCI-2118]
 2018-03-20 14:40:55 +01:00
mlorb
e0926ddc3c code refactoring 2018-03-20 13:53:11 +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
mlorb
9de998e85c code left-side menu bar 2018-03-14 14:33:34 +01:00
zmagod
0baa7a1f99 fix hound 2018-03-09 14:43:12 +01:00
zmagod
26883af386 fix assigned ordering 2018-03-08 17:36:10 +01:00
Oleksii Kriuchykhin
156a639e4c Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133] 2018-03-06 17:36:40 +01:00
zmagod
fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +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
Zanz2
8f5dd3df38
Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818 
Table missing scrollbar [SCI-1818]
 2018-03-05 17:13:06 +01:00
Zanz2
1e6f1acef5 fixed according to pr 2018-03-05 17:02:37 +01:00
Zanz2
451d14c2e9 Added 4 to constants too, then fixed line too long error 2018-03-05 16:48:18 +01:00
Zanz2
c5728c4018
Merge branch 'master' into null_step_crash_sci2043 2018-03-05 16:37:24 +01:00
Zanz2
e3e7514049 removed redundant return 2018-03-05 16:15:33 +01:00
Zanz2
554b31e0aa Added constants 2018-03-05 16:09:06 +01:00
Zanz2
ba67446eee quick fix for if previous guid is unknown format 2018-03-03 22:26:00 +01:00
Zanz2
5bcda7f6de fixed pr 2018-03-02 23:02:35 +01:00
Zanz2
350f12bdbc using dig method now 2018-03-02 22:29:51 +01:00
Luka Murn
070450f813 Merge branch 'release-1.12.11' 
Conflicts:
	config/initializers/extends.rb
 2018-03-01 14:04:57 +01:00
Oleksii Kriuchykhin
aa933ad1f4 Add extendable file types mappings for icons [PIP-46] 2018-02-26 14:23:02 +01:00
Zanz2
29aea1ebd2 refactored according to PR 2018-02-21 16:17:53 +01:00
Zanz2
9c2a2956e3 Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818 
Merging Biosis master with branch that resizes small tables to atleast 5x5
 2018-02-19 17:40:13 +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
Zanz2
673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
 2018-02-16 12:52:51 +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
4fe669ca9a Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions. 2018-02-16 10:53:22 +01:00
Zanz2
fab9180b7b fixed small oversight 2018-02-15 23:40:09 +01:00
Zanz2
c963c948a1 Fixed main issue, bad step structure now gets fixed to empty template 2018-02-15 23:28:20 +01:00
Zanz2
95501eb046 saving work for later 2018-02-15 20:01:36 +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
8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +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
Matej Zrimšek
d423700e84 Used permissions where they were missing. 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
Zanz2
a6356d2420 Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines 2018-02-07 14:46:25 +01:00
Zanz2
efaf5ad721 Commands now get styled like code 2018-02-07 13:51:22 +01:00
Zanz2
a6e93b8e35 Fixed hound line too long 2018-02-07 13:04:02 +01:00
Zanz2
e56c0bb100 Tables are now always atleast 5x5, like in scinote when creating new table 2018-02-07 10:55:44 +01:00
Zanz2
f7f46a094e Fixed PR and a mistake i made 2018-02-07 09:53:49 +01:00
Zanz2
167cbc98e5
Merge branch 'master' into yellow_flashv3_SCI1834 2018-02-07 09:42:56 +01:00
Zanz2
80735f2412 Fixed the bug with big text difference in preview and imported protocol 2018-02-07 09:26:45 +01:00
Zanz2
a37d4f3cde there are always now atleast 5 rows, like in edit table in repository, so it adds empty rows if there are not atleast 5 originally 2018-02-06 15:46:03 +01:00
Zanz2
a2df9777f6
Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000 
fixed empty table name unable to generate reports bug [SCI-2000]
 2018-02-06 14:34:31 +01:00
Zanz2
83e9550feb
Merge pull request #966 from Zanz2/images_not_imported_SCI1807 
Images not imported [SCI-1807]
 2018-02-06 14:33:35 +01:00
Zanz2
f9c6eafe49 most protocol attributes, and step description and step expected result now dont get cut tables when they are at max character limit 2018-02-06 12:04:24 +01:00