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
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
Mojca Lorber
86530bbda0
fix flash text
2017-06-16 14:41:50 +02:00
Mojca Lorber
4566fc7191
fix text in activity for assign/unassign records message
2017-06-15 10:06:12 +02:00
Mojca Lorber
77d922a5e8
change the name of add record/repository in repositories
2017-06-13 09:45:18 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
rekonder
ede744849b
Export repository [aj-SCI-1275]
2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
Luka Murn
810599bef2
Fix en.yml localization bug
2017-06-08 13:36:37 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f
Merge pull request #659 from Ducz0r/lm-sci-1279
...
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Matej Zrimšek
77a225ec31
Added toggle between assigned and all repository records. [SCI-1276]
2017-06-07 18:13:25 +02:00
Luka Murn
b5f6d1da94
Allow custom repositories to be added to reports
2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin
c18bba9fbe
Fix rebase errors [SCI-1274]
2017-06-07 15:50:22 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d
code changes after rebasing
2017-06-06 11:10:55 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
zmagod
67d902db52
refactor
2017-06-05 10:43:58 +02:00
Matej Zrimšek
d8d54232c3
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
2017-06-02 19:08:51 +02:00
Matej Zrimšek
73aaef0949
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
21a72da84f
Added rename logic and improved remove logic. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
791bb934ca
Remove repository modal logic (WIP). [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
b92a760a5c
Added dropdown GUI for editing repository. [SCI-1269]
2017-06-02 17:47:28 +02:00
Luka Murn
fcc3995049
Merge pull request #647 from biosistemika/master
...
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
zmagod
b527afd12b
generates samples csv file in background job [fixes SCI-1278]
2017-05-29 14:42:55 +02:00
mz3944
689587c4fc
Merge pull request #643 from mz3944/mz-SCI-1305
...
Handled user removal from the team for user smart annotation [fixes SCI-1305]
2017-05-29 12:52:19 +02:00
Matej Zrimšek
e8f842c29f
Forgot to add the updated locales. [fixes SCI-1305]
2017-05-29 11:39:17 +02:00
Zmago Devetak
2224c6511d
Merge pull request #630 from ZmagoD/zd_SCI_1240_v2
...
fix label [fixes SCI-1240]
2017-05-29 09:01:30 +02:00
mlorb
872f712be8
Merge branch 'custom-repositories' into ml_sci_1266_v2
2017-05-23 11:05:25 +02:00
mz3944
6b8c8deb16
Merge pull request #634 from mz3944/mz-SCI-414
...
Uncompleted steps not added to Reports
2017-05-23 09:58:05 +02:00
mz3944
9fe3b717c8
Merge pull request #626 from mz3944/mz-SCI-487
...
Simplify "Add contents to report" popup
2017-05-23 09:57:39 +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
Matej Zrimšek
f78c80b148
Added possibility to add uncompleted steps to report. [closes SCI-414]
2017-05-17 13:25:21 +02:00
zmagod
b8b47542a6
fix label [fixes SCI-1240]
2017-05-16 16:08:29 +02:00
zmagod
e0397f8a54
fix search label [fixes SCI-1285]
2017-05-16 14:58:39 +02:00
Matej Zrimšek
dbb79ebab1
Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Matej Zrimšek
27cfd55ea5
Simplified popup modal for adding contents to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
zmagod
01972ab6a7
changes load protocol label [fixes SCI-1240]
2017-05-15 15:22:43 +02:00
Oleksii Kriuchykhin
bb8c7c342c
Add additional info to samples info modal [SCI-960]
2017-05-11 22:20:06 +02:00
ajugo
e7c970f287
Wording in activity for completion of checklist item [SCI-274] ( #601 )
2017-05-10 10:13:59 +02:00
okriuchykhin
ccc640f2bc
Merge pull request #593 from okriuchykhin/ok_SCI_1158
...
Add advanced search options [SCI-1158]
2017-05-09 10:23:34 +02:00
gazvoda
596b296c84
Merge pull request #597 from gazvoda/lg-SCI-1104
...
Added additional explanation text [fixes SCI-1104]
2017-05-09 08:41:52 +01:00
gazvoda
e98d6a4da6
Merge pull request #596 from gazvoda/lg-SCI-723
...
Added team icon on the first step of tutorial after the Team icon tex…
2017-05-08 14:57:56 +01:00
osboxes.org
c43eacdb98
Added additional explanation text [fixes SCI-1104]
2017-05-08 15:35:53 +02:00
gazvoda
e462482566
Merge pull request #595 from gazvoda/lg-SCI-1239
...
Corrected number of expiration days in message [fixes SCI-1239]
2017-05-08 13:52:23 +01:00
osboxes.org
ea0934a8cb
Added team icon on the first step of tutorial after the Team icon text [solves SCI-723]
2017-05-08 14:43:35 +02:00
osboxes.org
ddbd568166
Corrected number of expiration days in message [fixes SCI-1239]
2017-05-08 13:08:53 +02:00
Zmago Devetak
4b816f5322
Merge pull request #568 from ZmagoD/zd_SCI_1119
...
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin
0ee7e11620
Add advanced search options [SCI-1158]
2017-05-05 16:41:23 +02:00
Zmago Devetak
de3d1172c1
Merge pull request #584 from ZmagoD/zd_SCI_1200
...
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-05 14:57:27 +02:00
zmagod
b22350136f
adds label to step in report [fixes SCI-488]
2017-05-05 09:45:18 +02:00
zmagod
acc5594f1b
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-04 12:41:22 +02:00
Matej Zrimšek
8ad52354eb
Used locales instead of hardcoded values for intro.js tutorial popup.
2017-04-25 16:03:50 +02:00
zmagod
66f43803c0
refactor, fix user annotation bug
2017-04-24 16:22:25 +02:00
zmagod
550f563666
working version for steps first run
2017-04-21 16:09:04 +02:00
Mojca Lorber
0bae4657f6
add experiment level to user smart annotation notification
2017-04-20 13:21:02 +02:00
mz3944
0ebf294844
Merge pull request #562 from mz3944/mz-SCI-1187
...
Added general locale for cases when a name is optional and is not spe…
2017-04-18 15:26:35 +02:00
mlorb
aab6a9b7a4
Merge pull request #561 from mlorb/ml_sci_1198
...
Change mentions for user smart annotations in notifications [SCI-1198]
2017-04-18 09:42:38 +02:00
mlorb
39f0ec9d24
Merge pull request #557 from mlorb/ml_sci_1118
...
Rename cloning text [SCI-1118]
2017-04-18 09:42:05 +02:00
Matej Zrimšek
c8ba234023
Added general locale for cases when a name is optional and is not specified. [fixes SCI-1187]
2017-04-14 17:20:34 +02:00
Mojca Lorber
34cfe01152
change mentions for user smart annotations in notifications
2017-04-14 16:23:49 +02:00
Mojca Lorber
56efb8086f
rename the rest of cloning text
2017-04-13 17:52:32 +02:00
Mojca Lorber
5f02376da3
rename cloning text
2017-04-13 15:09:17 +02:00
zmagod
53e828566a
change system notification description
2017-04-13 14:01:52 +02:00
zmagod
f104444a0c
adds additional explanations [fixes SCI-1103]
2017-04-12 16:56:47 +02:00
Zmago Devetak
9c31239318
Merge pull request #552 from biosistemika/release-1.9.0
...
Release 1.9.1
2017-04-12 13:08:37 +02:00
zmagod
d2eb7be426
removed faq label
2017-04-10 11:23:50 +02:00
zmagod
90faeec410
fixes typos and protocol step links
2017-04-10 11:21:28 +02:00
zmagod
9610c5f5a0
fix info dropdown links [fixes SCI-1141]
2017-04-07 11:31:09 +02:00
zmagod
439cd0cd89
add notification to experiments
2017-04-06 14:55:18 +02:00
zmagod
046b608018
add notification for my_module/project comments
2017-04-06 14:07:22 +02:00
zmagod
f16607579f
refactor steps annotation
2017-04-06 13:03:13 +02:00
zmagod
bb437bd8c5
adds notification to results annotation
2017-04-06 09:33:49 +02:00
zmagod
d331911ffe
completed step annotations
2017-04-06 08:42:16 +02:00
zmagod
99c116f257
first run
2017-04-04 09:19:43 +02:00
zmagod
0096f9dc14
refactor
2017-03-29 09:32:23 +02:00
zmagod
0996c14449
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
2017-03-27 10:41:58 +02:00
zmagod
2235fd3fb7
adds view if download expires
2017-03-27 10:38:28 +02:00
zmagod
023b3213e8
fixes email link [fixes SCI-765]
2017-03-24 12:10:07 +01:00
zmagod
4385c68f5f
adds zip_export utility first run
2017-03-21 16:15:11 +01:00
Oleksii Kriuchykhin
8a8720fcfe
Add missing translation for protocol load [SCI-1125]
2017-03-21 15:07:59 +01:00
Oleksii Kriuchykhin
d17eb2b3f7
Add missing translations for samples assign/unassign activities [SCI-1114]
2017-03-17 14:15:50 +01:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
Luka Murn
473487faec
Add HTML <head><title> to edit, view file pages
...
Closes SCI-1049.
2017-03-06 13:55:07 +01:00
okriuchykhin
75792cde14
Merge pull request #492 from okriuchykhin/ok_SCI_759
...
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 16:25:16 +01:00
Oleksii Kriuchykhin
95953e9269
Fix tutorial step 26 wording [SCI-734]
2017-02-22 14:46:38 +01:00
Oleksii Kriuchykhin
35b0b33ddf
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 14:18:48 +01:00
Mojca Lorber
0fd41e8a6d
remove changes on user has no teams view
2017-02-21 15:12:58 +01:00
Mojca Lorber
90864a45a0
fix user has no teams view
2017-02-21 13:08:06 +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
d097f0dd15
Merge pull request #477 from Ducz0r/lm-sci-928
...
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
2017-02-13 16:42:57 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
3eb4faa44b
Fix task restore action
...
Closes SCI-991.
2017-02-10 14:08:56 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0
Move user profile to settings
2017-02-09 11:34:52 +01:00
Luka Murn
5cb3eb5e09
Refactor preferences -> move them to subcontroller, subroute
2017-02-09 11:07:16 +01:00
Mojca Lorber
d3e0eca44e
redesign individual team page
2017-02-01 14:44:47 +01:00
Zmago Devetak
5c9954bb89
Merge pull request #450 from ZmagoD/zd_SCI_939
...
Refactor "organizations" to "teams"
2017-02-01 13:12:02 +01:00
Luka Murn
ec799520d4
Forgot to add en.yml
2017-01-31 16:05:13 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
zmagod
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +01:00
Oleksii Kriuchykhin
890c5e3c3d
Add “no results found” message in smart annotation [SCI-886]
2017-01-19 13:42:58 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Mojca Lorber
3b92ab9f36
add names to tables from protocol steps in reports
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
zmagod
a4aa933151
refactor smart annotation parser helper
2017-01-11 10:34:14 +01:00
zmagod
fc76a4ae6d
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
2017-01-10 14:22:04 +01:00
zmagod
94262b56ef
prepare data for atwho
2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin
cba064dfcc
Improve error message whan importing CSV files with incorrect character encoding [SCI-815]
2017-01-05 17:00:21 +01:00
Luka Murn
b614ce714b
Restyle atwho dropdown
2017-01-05 14:06:48 +01:00
Luka Murn
09ef3b3ad5
Merge pull request #378 from Ducz0r/lm-sci-802-fix
...
Add tooltips to samples column dropdown [SCI-802]
2017-01-04 11:30:04 +01:00
Luka Murn
2c5b27ce81
Change "Update" to "Save"
...
Closes SCI-802.
2017-01-04 11:29:34 +01:00
mlorb
59751ec41e
Merge pull request #373 from mlorb/ml_sci_709
...
Add Protocol Preview to Protocol repository [SCI-709]
2017-01-04 11:28:55 +01:00
Luka Murn
37cd6417c8
Merge pull request #374 from Ducz0r/lm-sci-808-814-fix
...
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
2017-01-04 09:50:26 +01:00
zmagod
a434649f42
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-01-03 16:35:25 +01:00
Oleksii Kriuchykhin
d898f8993f
Add description to Clone actions [SCI-766]
2016-12-29 15:33:49 +01:00
Luka Murn
2304742d87
Add tooltips to samples column dropdown
...
Closes SCI-802.
2016-12-27 08:45:23 +01:00
Luka Murn
3922be2b17
Change String in sample types & groups
...
Closes SCI-808.
2016-12-23 11:48:57 +01:00
Mojca Lorber
40e3240a99
add content to preview modal
2016-12-22 11:43:11 +01:00
Zmago Devetak
c8631077df
Merge pull request #361 from biosistemika/improved-sample-table
...
Improved sample table
2016-12-16 15:37:54 +01:00
Mojca Lorber
2cfcba0ceb
add protocol preview modal
2016-12-13 10:39:18 +01:00
Zmago Devetak
d54007f69c
Merge pull request #337 from ZmagoD/zd_SCI_740
...
limits max size of all uploaded files at the one time
2016-12-13 09:04:14 +01:00
zmagod
8dd8a7e7cd
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
2016-12-12 15:52:25 +01:00
zmagod
5176f8b459
clean unneeded code [fixes SCI-778] refactor js
2016-12-12 15:40:13 +01:00
zmagod
d9025a9601
changes create/edit mode buttons [fixes SCI-777]
2016-12-12 14:42:06 +01:00
Luka Murn
d30a9780f4
Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
...
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
2016-12-12 09:57:37 +01:00
Luka Murn
1a8b141b95
Add delete custom field functionality
2016-12-09 13:49:19 +01:00
Matej Zrimšek
aea679ec11
Added links for creating new sample type and group when creating new sample. [fixes SCI-701]
2016-12-09 11:39:12 +01:00
zmagod
9f1e436623
limits max size of all uploaded files at the one time [fixes SCI-740]
2016-12-07 09:02:04 +01:00
okriuchykhin
cb2abfa7a9
Merge pull request #325 from okriuchykhin/ok_SCI_712
...
Added form for adding new columns to samples table into dropdown [SCI-712]
2016-12-06 15:00:01 +01:00
zmagod
8ca7151df4
added constant to load_from_file_size_error local
2016-12-06 13:52:07 +01:00
Oleksii Kriuchykhin
f6dd64772a
Add columns to samples table without page reload [SCI-712]
2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
22dabd2177
Added form for adding new columns to samples table into dropdown [SCI-712]
2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin
94866e8994
Initial code commit for samples columns dropdown [SCI-712]
2016-12-06 13:16:05 +01:00
zmagod
ef2471d3f7
fixes inport eln error message and spinner [fixes SCI-752]
2016-12-05 10:44:58 +01:00
zmagod
83aae59eed
adds sample groups index page
2016-12-02 09:33:09 +01:00
Matej Zrimšek
46465060d0
Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]
2016-11-30 16:56:56 +01:00
Luka Murn
f138a39508
Merge pull request #324 from Ducz0r/lm-sci-718-fix
...
Fix intro tutorial string
2016-11-30 09:50:40 +01:00
Luka Murn
76ec77fce4
Merge pull request #329 from biosistemika/simplify-signup
...
Merge simplify-signup into master
2016-11-30 09:41:20 +01:00
zmagod
12848f15fa
adds sample_type index view with all crud actions
2016-11-29 17:15:54 +01:00
zmagod
5c0b2d7b24
init sample_types page
2016-11-29 08:57:12 +01:00
Luka Murn
48a1c98f16
Fix intro tutorial string
...
Closes SCI-718.
2016-11-28 17:28:04 +01:00
Zmago Devetak
1e870a6e7c
Merge pull request #320 from ZmagoD/zd_SCI_698
...
adds new samples columns dropdown [fixes SCI-698]
2016-11-28 16:30:16 +01:00
zmagod
9d91d2ce28
adds new samples columns dropdown [fixes SCI-698]
2016-11-25 17:29:30 +01:00
Oleksii Kriuchykhin
3fdb20b92c
Add full name field to accept invitation form [SCI-738]
2016-11-25 11:15:10 +01:00
Luka Murn
b1b095910c
Merge pull request #309 from Ducz0r/lm-remove-unused-files
...
Brace for impact...
2016-11-25 10:00:29 +01:00
Luka Murn
198febfd94
Fix user projects not working
2016-11-23 13:19:10 +01:00
Luka Murn
7cbe44d1f2
Refactor user projects & user my modules code
2016-11-22 15:16:26 +01:00
Luka Murn
201b1a48d5
Refactor user my modules code
2016-11-22 15:07:18 +01:00
Luka Murn
e0607f7891
Refactor step comments code
2016-11-22 15:01:48 +01:00
Luka Murn
0c96036de8
Refactor some sample types code
2016-11-22 14:59:57 +01:00
Luka Murn
8ff5285179
Refactor some sample groups code
2016-11-22 14:57:01 +01:00
Luka Murn
f5e286b1f6
Remove unused code for some more comments
2016-11-22 14:52:43 +01:00
Luka Murn
1f7a8712fb
Update task comments & task tags controllers & localized Strings
...
(Remove a lot of unused code)
2016-11-22 14:26:35 +01:00
Matej Zrimšek
f13cc5be0e
Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).
2016-11-17 18:03:49 +01:00
Luka Murn
9d3685f872
Merge branch 'gamification' into 'master'
...
Conflicts:
app/controllers/users/invitations_controller.rb
app/controllers/users/settings_controller.rb
2016-11-17 16:30:18 +01:00
okriuchykhin
39d3b65c52
Merge pull request #297 from okriuchykhin/ok_SCI_685
...
Improved tutorial styling [SCI-685]
2016-11-17 10:57:10 +01:00
Oleksii Kriuchykhin
d2e29935cf
Improved tutorial styling [SCI-685]
2016-11-16 15:44:06 +01:00
Oleksii Kriuchykhin
fc09cafe63
Fix tutorial strings [SCI-677]
2016-11-16 13:15:02 +01:00
Luka Murn
04749c3b2c
Allow inviting of existing, unconfirmed users
...
Closes SCI-676.
2016-11-15 15:04:31 +01:00
okriuchykhin
01b01939f3
Merge pull request #277 from okriuchykhin/ok_SCI_571
...
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
2016-11-15 12:05:20 +01:00
Mojca Lorber
615cd3c278
profile changes for gamification
2016-11-14 15:04:18 +01:00
Oleksii Kriuchykhin
b9f982ead7
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin
d2491a18a4
Tutorial Save Protocol step added [SCI-571]
2016-11-11 10:06:18 +01:00
Oleksii Kriuchykhin
6811120829
Added step numbers in intro tutorial [SCI-570]
2016-11-09 10:52:00 +01:00
mlorb
0793fb9f11
Merge pull request #260 from mlorb/ml_sci_614
...
Add notification for removing user from team and removing user from project [SCI-614]
2016-11-08 11:30:49 +01:00
