okriuchykhin
|
5e0cf58bc5
|
Merge pull request #1058 from okriuchykhin/ok_SCI_2111
Implement search in file repository cells and improve performance [SCI-2111]
|
2018-03-30 12:39:47 +02:00 |
|
Oleksii Kriuchykhin
|
e42fc3117b
|
Implement search in file repository cells and improve performance [SCI-2111]
|
2018-03-26 13:19:09 +02:00 |
|
mlorb
|
b7a14215bc
|
Merge pull request #1050 from mlorb/ml-sci-2120-v2
Refactor project navigation [SCI-2120]
|
2018-03-26 12:56:19 +02:00 |
|
mlorb
|
1797afa718
|
Merge branch 'ux-release-1' into ml-sci-2238
|
2018-03-26 10:44:43 +02:00 |
|
mlorb
|
70e0d8bd1d
|
Merge pull request #1052 from mlorb/ml-sci-2125
Implement new Help dropup in navigation [SCI-2125]
|
2018-03-26 09:22:39 +02:00 |
|
mlorb
|
83741358d1
|
fix locales
|
2018-03-23 16:19:06 +01:00 |
|
mlorb
|
eee597b315
|
fix naming
|
2018-03-23 15:56:38 +01:00 |
|
mlorb
|
bc06542ed7
|
refactor project navigation
|
2018-03-22 11:41:33 +01:00 |
|
Oleksii Kriuchykhin
|
36302ad6e8
|
Refactor existing columns management to control only Column visibility and order [SCI-2220]
|
2018-03-21 16:56:36 +01:00 |
|
mlorb
|
884eef9d07
|
Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118
|
2018-03-20 14:25:59 +01:00 |
|
okriuchykhin
|
935715a8c1
|
Merge pull request #1043 from okriuchykhin/ok_SCI_2193
Rename record to item in repository row info modal [SCI-2193]
|
2018-03-20 09:53:34 +01:00 |
|
Oleksii Kriuchykhin
|
acbd40e0d1
|
Remove Power Up button [SCI-2117]
|
2018-03-18 22:12:29 +01:00 |
|
Oleksii Kriuchykhin
|
79fd2fbb2f
|
Rename record to item in repository row info modal [SCI-2193]
|
2018-03-18 13:51:40 +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 |
|
mlorb
|
9de998e85c
|
code left-side menu bar
|
2018-03-14 14:33:34 +01:00 |
|
zmagod
|
dd2f7dd417
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration
|
2018-03-13 13:24:36 +01:00 |
|
zmagod
|
8fe173e831
|
re-structure top navigation bar
|
2018-03-12 16:27:35 +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 |
|
mlorb
|
5e44859ce0
|
Merge pull request #1010 from mlorb/ml-sci-1826
Sign up with linkedIn account [SCI-1826]
|
2018-03-05 13:24:36 +01:00 |
|
zmagod
|
2b55cd7090
|
rename variables
|
2018-03-02 14:14:27 +01:00 |
|
mlorb
|
08439e7f58
|
sign up with linkedIn account
|
2018-02-28 18:12:21 +01:00 |
|
zmagod
|
e3ca782996
|
add info modal for repository items [fixes SCI-2066]
|
2018-02-27 16:21:46 +01:00 |
|
Matej Zrimšek
|
48bdd84163
|
Updated file upload text, to notify user of another approach to uploading files.
|
2018-02-22 14:18:53 +01:00 |
|
Matej Zrimšek
|
68206cb591
|
Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling.
|
2018-02-14 14:39:08 +01:00 |
|
zmagod
|
bd1345d560
|
fixes bug with assets upload on task result page,
adds ctrl+v listener to upload images from clipboard, adds image preview modal
|
2018-02-06 15:39:19 +01:00 |
|
zanzdebian
|
8bd8c34c4d
|
Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)
|
2018-01-25 13:45:35 +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 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Zanz2
|
b105920d4e
|
Merge pull request #901 from Zanz2/code_refactor
Protocols.io code beautification and refactoring [SCI-1929]
|
2018-01-12 12:34:00 +01:00 |
|
mlorb
|
6c4514f550
|
add create_teams permission checks
|
2018-01-09 15:28:27 +01:00 |
|
Luka Murn
|
cf291bf887
|
Merge branch 'gilson-iot-rails4'
Conflicts:
Gemfile.lock
|
2017-12-19 10:56:39 +01:00 |
|
mlorb
|
11a3cd196c
|
add create, update team permission and refactor 422 respond handling in controllers
|
2017-12-14 14:18:14 +01:00 |
|
mlorb
|
8893fd668d
|
add create, update, delete user_team permission
|
2017-12-14 14:18:14 +01:00 |
|
Zanz2
|
fcbd956d6e
|
Finished code beautification
|
2017-12-03 01:17:49 +01:00 |
|
Zanz2
|
f577bf93b5
|
Fixed pull request review
|
2017-11-21 19:20:15 +01:00 |
|
Zanz2
|
d8c809ffd0
|
Reviewed pull request
|
2017-11-20 23:19:34 +01:00 |
|
Zanz2
|
cf66d94d45
|
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
|
2017-11-20 00:59:32 +01:00 |
|
Zanz2
|
fa25a6785b
|
Made the propper files and functionality for the text truncation to function
|
2017-11-17 02:43:32 +01:00 |
|
Zanz2
|
c44465817d
|
Added the functions and put in limitations from my validations files, changed controller name, added some locals
|
2017-11-16 20:03:44 +01:00 |
|
mlorb
|
6c80c338e4
|
Merge pull request #880 from mlorb/ml-sci-1316
Change text for avatar size on my profile page [SCI-1316]
|
2017-11-16 10:43:23 +01:00 |
|
Oleksii Kriuchykhin
|
84f4aba213
|
Pull latest master into gilson-iot-rails4
|
2017-11-15 15:15:26 +01:00 |
|
Mojca Lorber
|
cd006c2640
|
change text for expiry of a link for an exported file
|
2017-11-15 14:32:19 +01:00 |
|
Mojca Lorber
|
ff998a6c98
|
change text for avatar size on my profile page
|
2017-11-15 14:21:04 +01:00 |
|
mlorb
|
47784e09a8
|
Merge pull request #867 from mlorb/ml-sci-1434
Add explanation when copying custom repositories [SCI-1434]
|
2017-11-15 11:34:02 +01:00 |
|
Zanz2
|
9bd198eaf6
|
Merge pull request #875 from Zanz2/removed_txt_1793
Removed the .txt text from translations file [SCI-1793]
|
2017-11-14 19:12:32 +01:00 |
|
Zanz2
|
6b9a10ffe4
|
Made validations for JSON format and .txt and .json files
|
2017-11-14 12:02:17 +01:00 |
|
Zanz2
|
3e964da241
|
Removed the .txt text from translations file
|
2017-11-14 11:42:10 +01:00 |
|
Mojca Lorber
|
be74338d9f
|
add explanation when copying custom repositories
|
2017-11-13 16:30:42 +01:00 |
|
mlorb
|
cd6799d571
|
Merge pull request #866 from biosistemika/protocols-io-import
Protocols io import
|
2017-11-13 11:53:28 +01:00 |
|