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 |
|
Oleksii Kriuchykhin
|
a105e61d48
|
Remove tutorial [SCI-1860]
|
2018-03-18 13:18:05 +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 |
|
Zanz2
|
b265beb386
|
Merge pull request #864 from Zanz2/move_desc
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
|
2017-11-13 10:07:01 +01:00 |
|
Zanz2
|
23d3ffa5a4
|
Fixed PR
|
2017-11-12 15:48:45 +01:00 |
|
Zanz2
|
fa2c0fe556
|
merging
|
2017-11-09 18:55:17 +01:00 |
|
Zanz2
|
812fa3f1d5
|
Hopefully this will resolve my merge problems
|
2017-11-09 17:42:17 +01:00 |
|
Zanz2
|
9086cd8b6b
|
Jira branch code
|
2017-11-09 10:49:44 +01:00 |
|
zmagod
|
f43492adff
|
trigger an alert to on canvas save if page reload [fixes SCI-1610]
|
2017-11-07 15:08:26 +01:00 |
|
mlorb
|
126f278308
|
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
Scinote protocols IO base branch
|
2017-11-06 14:53:01 +01:00 |
|
Zanz2
|
de9a3a1d0d
|
Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly
|
2017-10-28 23:57:29 +02:00 |
|
okriuchykhin
|
2e0bf91467
|
Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
|
2017-10-27 11:14:39 +02:00 |
|
Zanz2
|
a732c8afa7
|
Code for protocol repository scinote table elements view
|
2017-10-26 17:28:27 +02:00 |
|
zmagod
|
c36fcb1fa4
|
fixes user invitation button [fixes SCI-1726]
|
2017-10-25 11:31:32 +02:00 |
|
Luka Murn
|
c026b60790
|
Update Profile page to use validation
|
2017-10-23 18:04:20 +02:00 |
|
Luka Murn
|
8cda449738
|
Update en.yml
Remove unneccesary my_module_groups localization Strings.
|
2017-10-23 17:49:55 +02:00 |
|
Luka Murn
|
82f982e983
|
Merge branch 'rails-5.1' into decoupling-settings-page
Conflicts:
Gemfile
Gemfile.lock
|
2017-10-23 10:59:10 +02:00 |
|
Zanz2
|
03e40017e4
|
Updated local
|
2017-10-19 19:58:18 +02:00 |
|
Zanz2
|
6cf775a4b1
|
Refactored code, made html render on preview too
|
2017-10-17 19:27:20 +02:00 |
|
zmagod
|
30d091dc65
|
adds label under protocols keywords input [fixes SCI-1560]
|
2017-10-17 14:10:56 +02:00 |
|
Luka Murn
|
4e06b5c397
|
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
|
2017-10-17 13:17:49 +02:00 |
|
Luka Murn
|
4d8f2665d3
|
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
|
2017-10-17 13:10:02 +02:00 |
|
zmagod
|
6fe48a07ae
|
fix hound, add custom hook for webpacker:compile
|
2017-10-16 17:02:35 +02:00 |
|
zmagod
|
c5978f2d86
|
adds cucumber test for profile page [fixes SCI-1572]
|
2017-10-16 16:21:52 +02:00 |
|
Luka Murn
|
2fb2b90da3
|
Merge pull request #820 from Ducz0r/lm-sci-1675
Add Add-ons page to User -> Settings -> Account [SCI-1675]
|
2017-10-16 13:05:43 +02:00 |
|
Luka Murn
|
38bce08b5a
|
Minor wording change.
|
2017-10-13 09:27:18 +02:00 |
|
Luka Murn
|
fe89b942e7
|
Add Add-ons page to User -> Settings -> Account
Closes SCI-1675.
|
2017-10-11 14:15:37 +02:00 |
|
Oleksii Kriuchykhin
|
bd26052110
|
Remove GIOT sign-in button [GIOT-55]
|
2017-10-09 11:56:46 +02:00 |
|
Zanz2
|
183c93d21b
|
Refactoring to git review specifications
|
2017-10-07 22:13:31 +02:00 |
|
Zanz2
|
2b9563ec6d
|
Added preview text to en.yml
|
2017-10-07 17:45:23 +02:00 |
|
Zanz2
|
66e5004e60
|
Changed import text to be inside en.yml, as said in the code review, deleted some blank lines
|
2017-10-07 15:56:43 +02:00 |
|
Oleksii Kriuchykhin
|
b26b963e54
|
Optimize update canvas SQL and remove module group name [SCI-1642]
|
2017-10-05 16:19:25 +02:00 |
|
zmagod
|
754627efe7
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
|
2017-10-05 11:08:31 +02:00 |
|
zmagod
|
e2aa0d7515
|
fixes user profile
|
2017-09-26 17:29:11 +02:00 |
|
Zanz2
|
deef790951
|
added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions
|
2017-09-22 11:56:50 +02:00 |
|
mlorb
|
9d96bf668a
|
fix error handeling, refactoring
|
2017-09-21 16:42:56 +02:00 |
|
Zanz2
|
d6d1f9d490
|
changed second modal preview styling to fit its specifications
|
2017-09-14 11:46:41 +02:00 |
|
Zanz2
|
b7432b336a
|
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
|
2017-09-13 15:15:08 +02:00 |
|
zmagod
|
1b3b3dfea9
|
adds team members update role functionality
|
2017-09-12 17:30:13 +02:00 |
|
Žan Žagar
|
fdbae19156
|
changed .json to .txt for clarity
|
2017-09-12 09:33:18 +02:00 |
|
Žan Žagar
|
2a7a2b8fa1
|
Changed some minor button text and fixed a local error
|
2017-09-12 09:26:22 +02:00 |
|
Žan Žagar
|
2c0a458aaf
|
dodav moj alternativni text za importanje (text na gumbu), za rails translate (t)
|
2017-09-11 15:21:35 +02:00 |
|
Oleksii Kriuchykhin
|
c3fceb90df
|
Backport API to Rails-4 [SCI-1579]
|
2017-08-30 13:30:41 +02:00 |
|
zmagod
|
478bd491ff
|
added pagination and sorting to team tables
|
2017-08-28 17:05:09 +02:00 |
|
zmagod
|
c5e32c4ea0
|
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch
|
2017-08-21 09:52:14 +02:00 |
|
Luka Murn
|
13eae287bb
|
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
|
2017-08-07 11:54:45 +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 |
|
Oleksii Kriuchykhin
|
e958410261
|
Add core API using JWT authentication and tests for it [SCI-1507]
|
2017-08-03 17:00:14 +02:00 |
|
zmagod
|
caae1e2fe8
|
adds intl, router, bootstrap to npm modules
|
2017-07-31 10:42:40 +02:00 |
|
Oleksii Kriuchykhin
|
6c33b46f6a
|
Improve import of repository records plus tsv file import fixes [SCI-1487]
|
2017-07-20 11:44:10 +02:00 |
|
Oleksii Kriuchykhin
|
ece27b2652
|
Fix importing files with empty header cells and error messages improvements [SCI-1484]
|
2017-07-18 14:54:35 +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 |
|
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
|
6bfb5e125c
|
add tooltips to navigation bar
|
2017-06-27 13:46:49 +02:00 |
|
okriuchykhin
|
d126391940
|
Merge pull request #710 from okriuchykhin/ok_SCI_1356
Add global search in custom repositories [SCI-1356]
|
2017-06-27 13:41:53 +02:00 |
|
mz3944
|
ca59ac5e36
|
Merge pull request #714 from mz3944/mz-SCI-1402
Missing error message when not selecting name in case of import repository file [SCI-1402]
|
2017-06-27 11:54:26 +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 |
|
Oleksii Kriuchykhin
|
84556cf744
|
Fix naming of repository items in modal and messages [SCI-1404]
|
2017-06-26 16:03:02 +02:00 |
|
Oleksii Kriuchykhin
|
e038bc58fa
|
Add global search in custom repositories [SCI-1356]
|
2017-06-23 16:12:56 +02:00 |
|
Matej Zrimšek
|
be855e98db
|
Changed repository records filter naming. [SCI-1398]
|
2017-06-23 10:16:50 +02:00 |
|