scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
6013 commits 31 branches 181 tags 166 MiB
Commit graph

1464 commits

Author SHA1 Message Date
zmagod
c5379896c0 fix HOC to recive objects 2018-01-08 16:28:20 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866 
Wrong date at activity
 2018-01-08 14:20:26 +01:00
zmagod
c07f54a0c7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-08 08:38:14 +01:00
zmagod
eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797 
Permissions - refactor organization & team level permissions (core) [SCI-1797]
 2018-01-05 16:03:55 +01:00
mlorb
99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb
70ae14a9b8 refactor manage repository permissions again because of addons 2018-01-05 11:17:01 +01:00
mlorb
ec851caa80 refactor manage repository column permissions again because of addons 2018-01-05 10:43:59 +01:00
zmagod
862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
okriuchykhin
b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870 
Fix adding users to a task [SCI-1870]
 2018-01-04 14:14:05 +01:00
mlorb
abced181d5 refactor manage repository rows permissions again because of addons 2018-01-04 11:53:58 +01:00
zmagod
e0e3ef9359 fixes flow, and before_action in permissions_controller 2018-01-03 17:23:50 +01:00
mlorb
0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
zmagod
1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
mlorb
dc68b3068b fix Rails 5.1 bug with params 2018-01-03 13:19:56 +01:00
mlorb
0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin
49ae9bcd55 Fix adding users to a task [SCI-1870] 2017-12-20 13:44:21 +01:00
Oleksii Kriuchykhin
512ee07bde Fix repositories [SCI-1873] 2017-12-19 17:53:45 +01:00
Luka Murn
cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
mlorb
bd7eda1506 fix failing tests 2017-12-14 14:18:18 +01:00
mlorb
2936770c01 refactor can view team users ATWHO permission 2017-12-14 14:18:18 +01:00
mlorb
5c790287ec refactor again manage user team permissions 2017-12-14 14:18:18 +01:00
mlorb
7c1ae6bc82 refactor manage repository permissions 2017-12-14 14:18:18 +01:00
mlorb
2918a9833d refactor manage repository column permissions 2017-12-14 14:18:18 +01:00
mlorb
3f5e9e60b7 refactor view repository permission 2017-12-14 14:18:18 +01:00
mlorb
079ac7a4d3 refactor manage repository row permissions 2017-12-14 14:18:18 +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
e577b363b2 byTheWay fix of Rails 5.1 bug 2017-12-14 14:18:17 +01:00
mlorb
29f9414839 refactor create project permission 2017-12-14 14:18:17 +01:00
mlorb
72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb
b09377cd8d refactor update sample permission 2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6 refactor view/export samples permission 2017-12-14 14:18:16 +01:00
mlorb
0d37f9c85a refactor clone protocol permission 2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
mlorb
806fcbce36 refactor update protocol in repository permission 2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e refactor read protocol in repository permission 2017-12-14 14:18:15 +01:00
mlorb
a3a494c3a2 fix banana: remove dead code which strangely reappeared, probably with some rebasing 2017-12-14 14:18:15 +01:00
mlorb
ccc2451494 refactor create sample permissions 2017-12-14 14:18:15 +01:00
mlorb
43c01b74b1 refactor create protocol permission 2017-12-14 14:18:14 +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
mlorb
a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +01:00
zmagod
219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
zmagod
249d3d7698 fixes current timezone setup for activities 2017-12-13 16:48:31 +01:00
okriuchykhin
2fa7591f36
Merge pull request #903 from okriuchykhin/ok_SCI_1864 
Rename notifications settings accessor [SCI-1864]
 2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin
baf3151bb0 Fix notification settings accessors [SCI-1864] 2017-12-13 11:59:53 +01:00
zmagod
b106545d31 fixes per @duco 's request 2017-12-13 08:57:50 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step 
Fixes bug with embedded images [SCI-1624]
 2017-12-12 09:53:24 +01:00
Oleksii Kriuchykhin
6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +01:00
Luka Murn
86ac07c69f
Merge pull request #902 from biosistemika/rails-5.1 
Merge rails-5.1 into decoupling-settings-page
 2017-12-07 09:25:11 +01:00
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747 
Improve server side assets validation display for steps [SCI-1747]
 2017-12-04 14:12:43 +01:00
zmagod
e01e7bebbf add permissions endpoint on the API 2017-12-04 13:25:48 +01:00
Zanz2
835ac6910f Code refactor part 1 2017-12-02 00:29:47 +01:00
zmagod
52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +01:00
okriuchykhin
16729ccd7d
Merge pull request #898 from okriuchykhin/ok_SCI_1838 
Fix assignment of users to projects [SCI-1838]
 2017-11-30 11:16:07 +01:00
Oleksii Kriuchykhin
194054d973 Fix assignment of users to projects [SCI-1838] 2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin
7bb52191cd Fix Ajax calls with redirect [SCI-1837] 2017-11-29 16:13:28 +01:00
Zanz2
bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 
Fixed validations lengths and added workarounds for bugs [SCI-1833]
 2017-11-24 17:55:20 +01:00
zmagod
066c782cd2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step 2017-11-24 16:29:32 +01:00
Zmago Devetak
027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651 
export and import RTE images
 2017-11-24 16:28:28 +01:00
Zanz2
dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
Zanz2
f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
zmagod
91fec89cab adds tiny_mce_assets to protocol export 2017-11-21 16:30:48 +01:00
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +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
b2e1623cf1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784 2017-11-16 20:04:12 +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
Zanz2
1b540a75a1 Fixed to use .megabytes 2017-11-16 15:17:13 +01:00
Zanz2
41c1193a78 Fixed unit error;Now when comparing file size, both are in bytes 2017-11-16 01:34:38 +01:00
Oleksii Kriuchykhin
84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
mlorb
288e3ddcbd
Merge pull request #877 from mlorb/ml-sci-1190 
Fix bug when removing all keywords in protocol [SCI-1190]
 2017-11-15 11:22:18 +01:00
Mojca Lorber
c2a5b52767 fix bug when removing all keywords in protocol 2017-11-14 15:04:37 +01:00
Zanz2
6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2
f35ab78849 Added some code to make the two seperate jira issues work together (protocol info and scinote tables 2017-11-14 00:56:39 +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
e7384ac38d Code review fixes, made seperate helper file 2017-11-12 15:31:04 +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
zmagod
9eac014f1a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
zmagod
e2af987b80 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568 2017-11-09 08:35:39 +01:00
zmagod
54e360bb52 fixes team switch 2017-11-06 15:14:17 +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
aa03a889c7 Fixed PR review 2017-11-03 16:28:15 +01:00
zmagod
5bc38414d1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-03 09:56:44 +01:00
zmagod
2118b31762 adds about sciNote modal 2017-11-02 13:23:57 +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
Zanz2
2413dc251a Added new preview tables code 2017-10-28 02:19:22 +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
3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod
d2ed415a25 Fixes per @okriuchykhin 's request 2017-10-26 10:42:18 +02:00
Zanz2
79e0a11054 Fixed before start and link not displaying in protocol description 2017-10-25 17:39:01 +02:00
zmagod
5e6a4bb69a adds environment variable that disables/enables the creation of new team when user sign up 2017-10-25 15:29:04 +02:00
zmagod
c36fcb1fa4 fixes user invitation button [fixes SCI-1726] 2017-10-25 11:31:32 +02:00
Zanz2
19b9da2e83 deleted comment 2017-10-24 19:44:34 +02:00
Zanz2
49501b3d3d Finished review refactor 2017-10-24 19:24:53 +02:00
Luka Murn
c026b60790 Update Profile page to use validation 2017-10-23 18:04:20 +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
Luka Murn
8254153bb9 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/connection.rb
	app/models/experiment.rb
	app/models/my_module.rb
 2017-10-23 08:57:57 +02:00
okriuchykhin
44733fefda Merge pull request #839 from okriuchykhin/ok_SCI_1609 
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
 2017-10-19 16:26:36 +02:00
Oleksii Kriuchykhin
631b41cdaa Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551] 2017-10-19 11:38:23 +02:00
Zanz2
67b09adaeb Fixed last few rubocop errors 2017-10-17 19:43:46 +02:00
Zanz2
6cf775a4b1 Refactored code, made html render on preview too 2017-10-17 19:27:20 +02:00
okriuchykhin
8e90e041b9 Merge pull request #825 from okriuchykhin/ok_SCI_1665 
Optimize memory usage in samples/repositories import [SCI-1665]
 2017-10-17 17:26:00 +02:00
zmagod
c554bc5c18 fixes accept invitation bug [fixes SCI-1684] 2017-10-17 16:00:26 +02:00
Oleksii Kriuchykhin
cd0aba1896 Change any? to empty? [SCI-1665] 2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin
c8d2ae70fa Move duplicated code to service [SCI-1665] 2017-10-17 14:46:16 +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
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
Zanz2
e72c1bebcb deleted comments 2017-10-12 19:18:22 +02:00
Zanz2
8d0d6f0502 refactored methods 2017-10-12 19:10:16 +02:00
okriuchykhin
db9a031581 Merge pull request #813 from okriuchykhin/ok_SCI_1642 
Refactor canvas [SCI-1642]
 2017-10-12 17:45:34 +02:00
Zanz2
21036a1081 Deleted unnecesarry if's 2017-10-12 17:22:02 +02:00
Zanz2
414a15872c Made seperate method for steps mapping 2017-10-12 17:15:43 +02:00
gazvoda
88f03a0706 Merge pull request #735 from gazvoda/lg-SCI-1249-v2 
Truncate checklist items in activity modal [fixes SCI-1249]
 2017-10-12 15:58:05 +02:00
Oleksii Kriuchykhin
56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
Zanz2
5d667f146e Moved .js form reset and made a standalone description method 2017-10-11 17:59:09 +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
f8334b3d5b Add editable field to task in tasks tree API call [GIOT-44] 2017-10-09 14:38:33 +02:00
zmagod
d85233cb2c Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566 2017-10-09 09:30:06 +02:00
zmagod
2a64d23a6e Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567 2017-10-09 09:14:58 +02:00
Zanz2
8720222ac2 Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper) 2017-10-07 22:45:01 +02:00
Zanz2
183c93d21b Refactoring to git review specifications 2017-10-07 22:13:31 +02:00
Zanz2
9655c98566 Github review refactor 2017-10-07 20:47:05 +02:00
Zanz2
f5b2ad0d34 Refactor github code review 2017-10-07 16:07:04 +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
6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
zmagod
5a31df7204 adds @Ducz0r suggestions 2017-10-06 10:45:22 +02:00
zmagod
dea69014d0 fixes bug with password confirmation 2017-10-06 09:54:17 +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
a020e23286 follow suggestions of @Ducz0r 2017-10-05 13:56:56 +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
524e8bffbf fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567] 2017-10-05 10:07:50 +02:00
zmagod
3dc3ed906f fixes bug with embedded images [fixes SCI.1624] 2017-10-02 18:06:42 +02:00
zmagod
edf4443995 added notification alert [fixes SCI-1566] 2017-10-02 14:51:54 +02:00
Oleksii Kriuchykhin
6824f9a8bc Improve memory utulization in PDF report generator [SCI-1482] 2017-10-02 11:29:22 +02:00
zmagod
cb4bacc372 refactor preferences page [fixes SCI-1564] 2017-09-28 16:53:51 +02:00
zmagod
c8c8afdd1d update react-bootstrap 2017-09-28 15:00:54 +02:00
mlorb
c358f8fa0c write unit tests for invite users 2017-09-28 14:49:33 +02:00
zmagod
26b526d61b adds getter and setters for user settings 2017-09-27 14:38:52 +02:00
zmagod
66269d68ff fixed image upload 2017-09-27 09:17:09 +02:00
zmagod
e2aa0d7515 fixes user profile 2017-09-26 17:29:11 +02:00
Zanz2
b23ca33e73 Deleted todo-list comments :D 2017-09-26 16:46:17 +02:00
Zanz2
c72cf6320a Finished rubocop refactoring 2017-09-26 16:19:09 +02:00
Zanz2
8d961c934a Rubocop refactored part of the controller code 2017-09-26 13:17:00 +02:00
Zanz2
2bfe8f0b95 Testing why rubocop gives errors 2017-09-25 15:27:24 +02:00
Zanz2
292c1e3c31 Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first 2017-09-25 14:14:27 +02:00
Zanz2
11b2ef3112 Made code nicer, hopefully not unintentionally breaking something 2017-09-25 13:53:32 +02:00
zmagod
1a7f8fc857 added frontend validations 2017-09-22 16:59:38 +02:00
Zanz2
dd4d4072e8 Made code more aesthetic 2017-09-22 16:02:56 +02:00
Zanz2
6ebdea5dce Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code) 2017-09-22 15:12:29 +02:00
Zanz2
4051c0b06b Deleted old unused files i spotted on github 2017-09-22 13:28:38 +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
1dbb03e22d Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer 2017-09-21 16:05:33 +02:00
zmagod
39025769ec Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564 2017-09-21 13:45:27 +02:00
zmagod
ed2beefc08 fixed profile info inputs 2017-09-21 13:42:49 +02:00
mlorb
55772a80ab fix hound and refactor 2017-09-21 10:45:36 +02:00
mlorb
48c8922604 adds invite users modal 2017-09-21 10:45:35 +02:00
Zanz2
f48833c47a added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload(); 2017-09-21 08:40:05 +02:00
Luka Murn
e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
Luka Murn
5429f6bbbd Fix @ZmagoD's remarks 2017-09-21 08:06:11 +02:00
Zanz2
d59234a1e3 minor changes, working on refresh after submit 2017-09-20 16:04:52 +02:00
Zanz2
72c707ae88 protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit 2017-09-20 15:31:10 +02:00
Luka Murn
416ccf905d Minor fix 2017-09-20 10:53:38 +02:00
Zanz2
7b85d74a23 added jquery code to reset file selector selected file after it is canceled in the preview modal 2017-09-20 09:32:31 +02:00
Zanz2
3812b2e64b Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore 2017-09-20 08:58:00 +02:00
Zanz2
ea8f3e822d Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone 2017-09-20 08:38:34 +02:00
Luka Murn
44877a13a5 Refactor services on backend. New team page is now working 2017-09-19 16:32:21 +02:00
Luka Murn
80c05e50ec Semi-working version of create new team form 2017-09-19 16:30:26 +02:00
Zanz2
7aba782639 optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show 2017-09-19 15:02:16 +02:00
zmagod
d1477179b2 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499 2017-09-18 15:10:52 +02:00
Zanz2
f861b1fc52 Configured the controller,the main task ahead is to figure out how to import all of the data i have available 2017-09-15 15:52:55 +02:00
zmagod
83647d81b4 adds edit team name modal 2017-09-15 14:00:48 +02:00
Zanz2
5d6cc341ed added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done 2017-09-14 14:42:04 +02:00
Toni Dezman
d38f4343f2 Decupling redux part 1 2017-09-14 11:46:49 +02:00
Zanz2
29b9d50363 Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer 2017-09-14 11:30:53 +02:00
zmagod
705d07f60e adds remove team action 2017-09-13 17:11:51 +02:00
Zanz2
9fc91aac32 added protocols io upload preview modal 2017-09-13 16:04:16 +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
706031dacb added model and controler, model should go to services while the controller should go to protocols controller 2017-09-12 15:25:22 +02:00
Toni Dezman
67d617deb5 adds hound_bot's and zmagos suggestions 2017-09-07 13:40:53 +02:00
Toni Dezman
185039bc99 adds suggestions from code review 2017-09-04 15:00:26 +02:00
zmagod
9c01ab414c refactor leave team 2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin
a927c2832d Improve error logging [GIOT-31] 2017-09-01 16:36:45 +02:00
zmagod
91d2d8a935 adds team details view 2017-08-31 15:56:55 +02:00
Toni Dezman
4034400c42 Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-08-31 11:42:15 +02:00
Toni Dezman
8b61fe563c user preferences APIs 2017-08-31 11:23:44 +02:00
zmagod
1325732b0c adds specs for team controller actions 2017-08-30 16:18:21 +02:00
Toni Dezman
2e6a942152 api for timezone 2017-08-30 14:59:17 +02:00
Oleksii Kriuchykhin
c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
zmagod
ee054f91b8 adds bullet gem [fixes SCI-1578] 2017-08-30 09:29:45 +02:00
Toni Dezman
c82dfa502a adds errors in client_api for users_controller 2017-08-29 13:14:52 +02:00
zmagod
ec86691659 fixed tests 2017-08-29 12:04:00 +02:00
zmagod
c54dd9473e adds controller spec for leave team [fixes SCI-1497] 2017-08-29 11:56:46 +02:00
zmagod
478bd491ff added pagination and sorting to team tables 2017-08-28 17:05:09 +02:00
zmagod
5ea464b675 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497 2017-08-28 09:36:29 +02:00
Toni Dezman
ea9a195f09 email and password action/redusers work 2017-08-26 14:07:31 +02:00
zmagod
db16da7bd6 adds custom query to fetch teams data 2017-08-25 16:07:37 +02:00
Toni Dezman
ccd14f6b50 adds apis for full_name and initials input fields 2017-08-25 14:45:02 +02:00
Toni Dezman
989be6563f Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-08-25 09:06:38 +02:00
zmagod
782daabce1 first run 2017-08-25 08:54:32 +02:00
Toni Dezman
e4a704d063 namespaces client_api/users/user_controller.rb 2017-08-25 08:21:52 +02:00
zmagod
685cb42aac fixes repository, protocols link, adds csfr token to request headers 2017-08-21 15:30:54 +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
9227ea5854 Finish the user settings jsonb, also fix references throughout app 
Closes SCI-1475.
 2017-08-10 14:29:01 +02:00
Luka Murn
c62002381b Add default settings migration and concern 2017-08-10 11:30:57 +02:00
zmagod
bd352869a3 adds user account dropdown 2017-08-09 09:08:13 +02:00
zmagod
226458a3f0 adds recent notifications 2017-08-08 15:44:28 +02:00
zmagod
be42cd2204 refactor 2017-08-07 13:51:22 +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
c6448264d0 Revert "Td sci 1492" 2017-08-07 11:47:21 +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
35b643f34e Fix typo in config and code style improvements [SCI-1507] 2017-08-04 10:19:56 +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
c314bae28d add team switch js/controller 2017-08-03 16:03:15 +02:00
zmagod
2e83322f76 fixes global activities 2017-08-03 11:17:09 +02:00
zmagod
6ef19725f1 adds redux 2017-08-02 17:27:05 +02:00
lenart
e781dfc6a6 Truncate activity taking smart annotations into account fixes [SCI-1249] 2017-08-02 15:51:32 +02:00
zmagod
caae1e2fe8 adds intl, router, bootstrap to npm modules 2017-07-31 10:42:40 +02:00
Toni Dezman
f76512f364 adds hound recomendations for react/settings_controller.rb 2017-07-28 12:53:15 +02:00
Toni Dezman
1673d43993 adds react/settings controller and react/layout 2017-07-27 15:26:03 +02:00
Oleksii Kriuchykhin
6a43483a2f Fix adding and editing repository items [SCI-1519] 2017-07-26 11:22:26 +02:00
Matej Zrimšek
ad0dce921b Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516] 2017-07-24 18:12:41 +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
Oleksii Kriuchykhin
036ee390ed Fix error messages in repository import and uploading files starting with hyphen[SCI-1484] 2017-07-14 16:19:03 +02:00
Mojca Lorber
739f8b5b4e remove redundant rollback call 2017-07-13 13:49:26 +02:00
Nbernot
2a3e830a3c Merge pull request #732 from biosistemika/business_users 
Business users [SCI-1428, SCI-1447]
 2017-07-11 13:34:56 +02:00
Luka Murn
16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
lenart
58e2575c75 Truncate checklist items in activity modal [fixes SCI-1249] 2017-07-07 15:56:16 +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
Nejc Bernot
d917cf3340 Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST 2017-07-05 11:52:36 +02:00
Nejc Bernot
803934e07d Changes the host for the download and redirect paths 2017-07-05 10:23:10 +02:00
okriuchykhin
75c887ce7d Merge pull request #721 from okriuchykhin/ok_SCI_1412 
Fix activities [SCI-1412]
 2017-07-04 10:59:08 +02:00
zmagod
bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
Oleksii Kriuchykhin
e474cda03a Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
Oleksii Kriuchykhin
21cce4baa0 Fix global search [SCI-1411] 2017-06-28 15:44:18 +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
Oleksii Kriuchykhin
4060ba2ac3 Code style fixes [SCI-1356] 2017-06-27 13:23:51 +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
e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
zmagod
819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
zmagod
7367435c6d refactor 2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19 fix update repository_row 2017-06-22 17:29:17 +02:00
zmagod
590135b9b3 refactor 2017-06-22 17:26:11 +02:00
zmagod
e7328c2e20 fixes row dupplication [fixes SCI-1385] 2017-06-22 16:01:37 +02:00
zmagod
28129ebb73 refactor 2017-06-21 17:39:20 +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
18fd5b00ba fix hound 2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56 adds import records to repositories [fixes SCI-1336] 2017-06-21 14:45:50 +02:00
Matej Zrimšek
d907819de5 Removed byebug calls. [SCI-1383] 2017-06-21 10:49:00 +02:00
zmagod
f64e1ac713 fix locales 2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c Removed empty first column of repository export file. [SCI-1383] 2017-06-20 18:40:41 +02:00
mlorb
7cbc8a2f95 Merge pull request #694 from mlorb/ml_sci_1347 
Fix flash when deleting samples of other users [SCI-1347]
 2017-06-19 14:19:57 +02:00
mlorb
beaba6a92b Merge pull request #693 from mlorb/ml_sci_1351_v3 
Fix error msg when editing empty cell in repositories [SCI-1351]
 2017-06-19 14:19:27 +02:00
zmagod
70fa681519 split the import service 2017-06-19 14:05:37 +02:00
Mojca Lorber
9b941fe374 fix flash when deleting samples of other users 2017-06-16 17:12:04 +02:00
Mojca Lorber
1b683bc70e fix error msg when editing empty cell in repositories 2017-06-16 15:09:04 +02:00
Mojca Lorber
ea455d3596 fix no repository name in activity bug 2017-06-15 09:43:10 +02:00
Mojca Lorber
e6ec184dba fix multiple errors handling on fields in repositories tables 2017-06-14 13:09:23 +02:00
zmagod
2d3b5f4308 refactor 2017-06-14 10:55:24 +02:00
zmagod
cee052fc19 added service object 2017-06-14 09:11:20 +02:00
Matej Zrimšek
cea6d15d3e Fixed Hound warning. [SCI-1351] 2017-06-13 18:15:47 +02:00
Matej Zrimšek
1bc46fe0cb Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351] 2017-06-13 18:12:42 +02:00
Mojca Lorber
849b269d87 fix errors in repo table 2017-06-13 16:56:34 +02:00
mlorb
074a47aae1 Merge pull request #675 from mlorb/ml_sci_1272 
Fix permissions [SCI-1272]
 2017-06-13 10:51:04 +02:00
zmagod
a865253a2e first run 2017-06-13 08:10:10 +02:00
Matej Zrimšek
e3db79b3cc Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275] 2017-06-12 17:49:42 +02:00
Mojca Lorber
9108102b42 fix permissions 2017-06-12 17:34:36 +02:00
Matej Zrimšek
f46d8f6970 Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275] 2017-06-09 19:44:28 +02:00
Matej Zrimšek
773a55ffac Fixed CSV export of repository records. [SCI-1275] 2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3 Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository 2017-06-09 19:44:28 +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
Mojca Lorber
be52af4e4f fix rename/delete/copy modals not working 2017-06-08 15:13:00 +02:00
Mojca Lorber
71c523c406 load tabs with javascript 2017-06-08 13:47:30 +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
61eb52f86f Implement GUI for copying repositories 
Closes SCI.1270.
 2017-06-07 19:11:25 +02:00
Luka Murn
0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d Hound is love, Hound is life 2017-06-07 18:22:15 +02:00
Luka Murn
02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +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
ad8dd6d740 PR fixes [SCI-1274] 2017-06-07 15:23:25 +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
353c27da15 rename method 2017-06-07 13:51:16 +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
Mojca Lorber
51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber
dde714d78f fix hound 2017-06-06 13:33:57 +02:00
Mojca Lorber
39dda1ad5d refactoring 2017-06-06 13:18:44 +02:00
Mojca Lorber
acdea2198d code changes after rebasing 2017-06-06 11:10:55 +02:00
Mojca Lorber
da98788031 small code fixes 2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Matej Zrimšek
afce3010ef After repository deletion, the next selected repository is the first one. [SCI-1269] 2017-06-05 17:56:09 +02:00
Matej Zrimšek
419d638163 Renamed reposiotry edit and destroy permission helper. [fix 1269] 2017-06-05 17:36:26 +02:00
Matej Zrimšek
f012779780 Renamed before_action for repository edit and destroy action. [fix 1269] 2017-06-05 10:02:16 +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
5c9a453439 Added permissions for deleting and renaming of repositories. [SCI-1269] 2017-06-02 17:50:34 +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
cdaac6a01b Added remove repository modal logic. [SCI-1269] 2017-06-02 17:50:33 +02:00
Matej Zrimšek
791bb934ca Remove repository modal logic (WIP). [SCI-1269] 2017-06-02 17:50:33 +02:00
zmagod
1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +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
d83dcac894 Merge pull request #642 from mz3944/mz-SCI-1291 
Fixed permission error while cloning workflows. [fixes SCI-1291]
 2017-05-29 09:53:33 +02:00
Matej Zrimšek
853096634d Fixed permission error while cloning workflows. [fixes SCI-1291] 2017-05-26 11:14:50 +02:00
Mojca Lorber
8540f88b7e small fix - renaming of ids and hrefs 2017-05-25 10:06:48 +02:00
Oleksii Kriuchykhin
7310763184 Add missing include [SCI-1306] 2017-05-25 08:57:50 +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
20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +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
Oleksii Kriuchykhin
f28df506f9 Fix bug in counting search results for assets [SCI-1284] 2017-05-17 09:08:40 +02:00
Matej Zrimšek
ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Zmago Devetak
39203a16f4 Merge pull request #622 from ZmagoD/zd_SCI_1261 
fixes remove user action on project [fixes SCI-1261]
 2017-05-15 15:28:39 +02:00
Zmago Devetak
a151bbdd7d Merge pull request #623 from ZmagoD/zd_SCI_974 
adds persistence to experiments order in project overview [fixes SCI-…
 2017-05-15 15:28:18 +02:00
okriuchykhin
16325db1c6 Merge pull request #621 from okriuchykhin/ok_SCI_1263 
Fix sorting in reports [SCI-1263]
 2017-05-15 09:57:35 +02:00
zmagod
c35e2a4860 adds persistence to experiments order in project overview [fixes SCI-974] 2017-05-15 09:54:37 +02:00
okriuchykhin
8e523782d9 Merge pull request #619 from okriuchykhin/ok_SCI_617 
Fixes error when cloning experiments with long names [SCI-617]
 2017-05-12 16:53:38 +02:00
okriuchykhin
a8bbc3c3ba Merge pull request #615 from okriuchykhin/ok_SCI_1008 
Fix task and step ordering in reports [SCI-1008]
 2017-05-12 16:44:57 +02:00
zmagod
b6367981c7 fixes remove user action on project [fixes SCI-1261] 2017-05-12 16:18:53 +02:00
Oleksii Kriuchykhin
5a2d618b1d Fix sorting in reports [SCI-1263] 2017-05-12 16:04:19 +02:00
Oleksii Kriuchykhin
79efb34191 Fixes error when clonning experiments with long names [SCI-617] 2017-05-12 11:07:11 +02:00
Zmago Devetak
0dc4addd6c fix typo 2017-05-12 10:10:50 +02:00
Oleksii Kriuchykhin
bb8c7c342c Add additional info to samples info modal [SCI-960] 2017-05-11 22:20:06 +02:00
Oleksii Kriuchykhin
0ef9c7eff6 Fix task ordering in reports [SCI-1008] 2017-05-11 15:30:19 +02:00
okriuchykhin
ab0d882be1 Merge pull request #614 from okriuchykhin/ok_SCI_1254 
Fix step actions in reports [SCI-1254]
 2017-05-11 14:44:36 +02:00
Zmago Devetak
9911c0d148 Merge pull request #613 from ZmagoD/zd_SCI_1241_v3 
replace all ActionController::Base.helpers.sanitize calls with custom…
 2017-05-11 14:30:26 +02:00
Oleksii Kriuchykhin
fe134419a3 Fix step actions in reports [SCI-1254] 2017-05-11 13:51:43 +02:00
okriuchykhin
328c9292b1 Merge pull request #606 from okriuchykhin/ok_SCI_1235 
Fix error messages display during file upload in steps and results [SCI-1235]
 2017-05-11 13:00:36 +02:00
zmagod
80a0af8c9f replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241] 2017-05-11 11:36:47 +02:00
zmagod
2081e0a94b Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1 2017-05-10 15:14:17 +02:00
Zmago Devetak
ff0f85fce8 Merge pull request #592 from ZmagoD/zd_SCI_160 
removes TempFile after 7 days [fixes SCI-160]
 2017-05-10 09:32:18 +02:00
Oleksii Kriuchykhin
52ad5ecdc2 Fix error messages display during file upload in steps and results [SCI-1235] 2017-05-09 17:13:47 +02:00
zmagod
04ee24d553 refactor 2017-05-09 14:05:21 +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
okriuchykhin
bd0b930382 Merge pull request #598 from okriuchykhin/ok_SCI_152 
Add counters for users and comments on canvas [SCI-152]
 2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin
7a61f5813c Add comments to the code [SCI-152] 2017-05-09 10:22:01 +02:00
Oleksii Kriuchykhin
bd5a48b9c8 Improve code style [SCI-1158] 2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin
344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +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
zmagod
d6f303581f refactor 2017-05-08 12:56:33 +02:00
ajugo
2973ead765 Missing files, comments, checklist in steps [fixes SCI-1224] (#591) 
* Missing files, comments, checklist in steps [fixes SCI-1224]

* Code fixes
 2017-05-08 10:44:15 +02:00
Oleksii Kriuchykhin
0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
zmagod
f079a097c5 removes TempFile after 7 days [fixes SCI-160] 2017-05-05 14:54:22 +02:00
Zmago Devetak
f3415abe3e Merge pull request #587 from ZmagoD/zd_SCI_1233 
fixes bug with empty checklist item [fixes SCI-1233]
 2017-05-05 10:11:52 +02:00
zmagod
f784844472 fixes bug with empty checklist item [fixes SCI-1233] 2017-05-04 16:15:00 +02:00
zmagod
8d0c22327b adds asc order to checklists [fixes SCI-1228] 2017-05-04 15:17:34 +02:00
zmagod
acc5594f1b add popup for approval to complete the Task [fixes SCI-1200] 2017-05-04 12:41:22 +02:00
zmagod
5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
Zmago Devetak
cc6c2942c2 Merge pull request #574 from ZmagoD/zd_SCI_1194_v2 
prevent to get nil as a param in checklist_item_annotation method [fi…
 2017-05-03 10:56:21 +02:00
zmagod
d5abb52909 refactor 2017-05-03 10:55:11 +02:00
Oleksii Kriuchykhin
cf7d0ea248 Fix dowloand of export zip files from local storage [SCI-1128] 2017-04-26 13:23:30 +02:00
zmagod
0456393317 prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194] 2017-04-25 16:22:10 +02:00
zmagod
ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02:00
zmagod
1fefeee3d1 adds team space related methods 2017-04-25 13:44:31 +02:00
zmagod
66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
mlorb
54f1c7b3e8 Merge pull request #566 from mlorb/ml_sci_365 
New experiment redirection [SCI-365]
 2017-04-24 08:55:55 +02:00
zmagod
550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber
cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +02:00
Mojca Lorber
0bae4657f6 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
Mojca Lorber
b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
zmagod
0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00
mz3944
a0b5a94d67 Merge pull request #564 from mz3944/mz-SCI-856 
Case insensitive email invitation
 2017-04-19 09:36:46 +02:00
zmagod
37be04c09c add tiny_mce controller 2017-04-19 09:13:16 +02:00
Matej Zrimšek
bafdbf4082 Email is now case insensitive when inviting users by it. [fixes SCI-856] 2017-04-18 18:01:29 +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
Matej Zrimšek
a889174938 Name of result tables should be nil, as it can't be specified. [fixes SCI-1187] 2017-04-18 15:08:13 +02:00
Zmago Devetak
e1a30cc17c Merge pull request #558 from ZmagoD/zd_SCI_1192 
fixes broken users search method for smart annotation [fixes SCI-1192]
 2017-04-14 15:38:33 +02:00
zmagod
8af3858209 fix hound 2017-04-14 11:13:58 +02:00
zmagod
9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Mojca Lorber
27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
zmagod
90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod
e77df92017 fix samples_controller 2017-04-06 15:26:24 +02:00
zmagod
9bb1bb3f9b refactor [fixes SCI-825] 2017-04-06 15:08:03 +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
b398bb7516 add step annotations methods in steps_action concerns 2017-04-06 13:06:20 +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
Oleksii Kriuchykhin
42ccefe2ce Remove logs table and old unused logging code [SCI-1127] 2017-03-30 11:47:57 +02:00
Zmago Devetak
2b35b34eb8 Merge pull request #529 from ZmagoD/zd_SCI_1135 
fixes alert messages in samples [fixes SCI-1135]
 2017-03-29 14:57:11 +02:00
zmagod
0096f9dc14 refactor 2017-03-29 09:32:23 +02:00
zmagod
9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +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
mlorb
3beb179f87 Merge pull request #514 from biosistemika/ml_sci_1089 
Add error messages to sample group/type edit/delete actions [SCI-1089]
 2017-03-27 09:57:32 +02:00
zmagod
4635a3320d Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-24 16:09:28 +01:00
zmagod
023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
zmagod
94732c6d18 adds delayed zip generator 2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin
2edebb282a Add team_id field to assets and tables [SCI-1046] 2017-03-23 10:36:55 +01:00
zmagod
4385c68f5f adds zip_export utility first run 2017-03-21 16:15:11 +01:00
zmagod
d8955d1a78 fixes breadcrumbs in office file [fixes SCI-1111] 2017-03-20 13:48:45 +01:00
Mojca Lorber
83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod
5cc6cd094e refactor 2017-03-17 16:47:58 +01:00
zmagod
307fef17d8 fixes owner id if empty 2017-03-15 18:01:15 +01:00
Zmago Devetak
1afb4c9a42 Merge pull request #515 from ZmagoD/file_owner_id_bug 
fixes bug with wopi contorller
 2017-03-15 17:40:07 +01:00
zmagod
c5156f5ca3 fixes bug with wopi contorller 2017-03-15 17:33:36 +01:00
Mojca Lorber
4792bd87b9 fix error message when editing custom column on locked task 2017-03-15 14:09:44 +01:00
zmagod
856a4611c6 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-14 15:58:08 +01:00
zmagod
15b1712a3d fixes bug with organization 2017-03-14 13:29:59 +01:00
zmagod
df2abe5d17 fixed typo 2017-03-13 13:51:31 +01:00
zmagod
7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +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
okriuchykhin
2a33391f4b Merge pull request #511 from okriuchykhin/ok_SCI_1090 
Refactoring of the comments using STI [SCI-1090]
 2017-03-10 10:50:43 +01:00
Oleksii Kriuchykhin
456934464a Remove unneeded validation calls [SCI-1090] 2017-03-09 17:20:27 +01:00
zmagod
1d42d46c02 fixes bug with step comments 2017-03-09 16:02:52 +01:00
zmagod
3057965940 fix bug with filenames 2017-03-09 11:48:50 +01:00
zmagod
9939d8df06 refactor 2017-03-09 10:51:54 +01:00
zmagod
49f91184da fixes locals 2017-03-09 09:55:15 +01:00
zmagod
5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Luka Murn
800df7a26b Also make button icons work when rendering them via JS 
Closes SCI-1073.
 2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin
0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Oleksii Kriuchykhin
4868ec5331 Remove task completion duplicated code [SCI-1075] 2017-02-28 17:07:59 +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
Oleksii Kriuchykhin
4fb5fa79af Move task completion activity and notification creation to separate methods [SCI-999] 2017-02-16 13:36:05 +01:00
Oleksii Kriuchykhin
218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
zmagod
836baa7412 fixes bug with user teams table [fixes SCI-987] 2017-02-15 10:06:21 +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
Luka Murn
1b6f50647c Please Hound 2017-02-13 16:40:27 +01:00
Oleksii Kriuchykhin
f97c20e9b5 Fix hound warnings [SCI-999] 2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin
78d5cbb223 Add links to task completion notification [SCI-999] 2017-02-13 14:51:21 +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
280b7a0e75 Minor fix 2017-02-09 15:10:45 +01:00
Luka Murn
2a9f975c13 Some minor fixes 2017-02-09 14:58:11 +01:00
Luka Murn
f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +01:00
Luka Murn
5cb3eb5e09 Refactor preferences -> move them to subcontroller, subroute 2017-02-09 11:07:16 +01:00
okriuchykhin
c2a69982aa Merge pull request #471 from okriuchykhin/ok_SCI_936 
Adds datatable to all teams page [SCI-936]
 2017-02-07 10:33:33 +01:00
Oleksii Kriuchykhin
cc6b518c7f Check that user is a member of a team when switching to it [SCI-984] 2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin
db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
Oleksii Kriuchykhin
031741d122 Disable protocols link if user has no teams [SCI-934] 2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin
c119b7c014 Make sciNote work for users without any teams [SCI_934] 2017-02-01 14:16:26 +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
zmagod
be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin
d1e69438de Add config option to enable/disable users registration [SCI-935] 2017-01-30 15:04:02 +01:00
zmagod
e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Mojca Lorber
5bed5f0f4a fix bug with avatar in smart annotations 2017-01-26 17:15:00 +01:00
Oleksii Kriuchykhin
310d8c1920 Refactor smart annotation/auto_link/simple_format rendering [SCI-940] 2017-01-25 17:18:19 +01:00
zmagod
c2c5616078 rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
Oleksii Kriuchykhin
fe6d6842c2 Add sanitization of group/type to sample edit [SCI-902] 2017-01-24 16:58:03 +01:00
zmagod
21c2f82582 rename controllers where org/organization 2017-01-24 16:57:14 +01:00
Oleksii Kriuchykhin
a04f05eeb3 Add sanitization to sample groups/types [SCI-902] 2017-01-24 14:39:54 +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
Oleksii Kriuchykhin
d555ba7905 Add export to protocol management page and code style improvements [SCI-742] 2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
14a6705b55 Implemented protocol export through Zip::OutputStream [SCI-742] 2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
1abd7fc574 Added xml schemas and zip gem [SCI-742] 2017-01-23 17:34:02 +01:00
Mojca Lorber
44de927cf4 display smart annotations in reports - without rich text fields 2017-01-19 14:22:54 +01:00
Mojca Lorber
b3c423c582 add table name in protocol step 2017-01-18 14:22:18 +01:00
Luka Murn
cf72da5635 Merge branch 'improved-files-handling' into 'master' 
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
 2017-01-18 11:29:40 +01:00
okriuchykhin
02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
Luka Murn
a0e9e5afa8 Merge pull request #402 from mz3944/mz-sci-848-v2 
Unable to delete samples [SCI-848]
 2017-01-16 10:47:13 +01:00
zmagod
1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
f567d0307e Fix includes [SCI-102] 2017-01-12 17:02:01 +01:00
Luka Murn
8b01f912a0 Fix new year problems with activities 
Closes SCI-876.
 2017-01-12 14:47:15 +01:00
Matej Zrimšek
93a8e0bdae Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848] 2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin
d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin
0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
zmagod
3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +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
6efcf49927 working version of dropdown filter 2017-01-10 14:14:21 +01:00
zmagod
53d20df449 added xregexp 2017-01-10 14:14:21 +01:00
zmagod
94262b56ef prepare data for atwho 2017-01-10 14:14:21 +01:00
Luka Murn
5873eea994 We serve to please the Hound 2017-01-10 10:42:52 +01:00
mz3944
ef431da2db Merge pull request #389 from mz3944/mz-sci-848 
Unable to delete samples [SCI-848]
 2017-01-09 11:57:48 +01:00
okriuchykhin
3c47d17019 Merge pull request #386 from okriuchykhin/ok_SCI_815 
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
 2017-01-09 11:54:28 +01:00
zmagod
226d5d8247 added blank string to wopi-lock header param 2017-01-09 11:51:18 +01:00
Oleksii Kriuchykhin
89710d8782 Enable image preview for newly uploaded images [SCI-694] 2017-01-06 16:41:24 +01:00
Oleksii Kriuchykhin
aa2b573278 Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
Matej Zrimšek
ec7a1cb4c0 Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Matej Zrimšek
5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Luka Murn
3cdd375a2d Merge pull request #388 from biosistemika/hotfix-1.6.1 
Hotfix 1.6.1
 2017-01-06 11:23:16 +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
ef688feb4e Hotfix 1.6.1 
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
 2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin
835e982292 SAnitize AJAX calls in controllers and datatables [SCI-102] 2017-01-05 13:12:22 +01:00
Oleksii Kriuchykhin
cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
Luka Murn
a78bb79618 Temp commit 2017-01-05 12:07:17 +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
3bee9d2e12 Save an (yet unworking) version of user smart annotations 
Used so other devs can start working on smart annotations.
 2017-01-04 10:54:02 +01:00
Luka Murn
cedc6c5074 Merge pull request #382 from Ducz0r/lm-sci-166-fix 
Re-add tags index controller action to render tags [SCI-166]
 2017-01-04 10:48:09 +01:00
Luka Murn
6402acc102 Merge pull request #377 from Ducz0r/lm-sci-820-fix 
Fix 2 bugs with comments editing [SCI-820]
 2017-01-04 10:47:29 +01:00
zmagod
87ffa7f03b fixes X-WOPI-ServerVersion bug 2017-01-04 10:02:08 +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
Mojca Lorber
c476faca30 fix hound 2017-01-03 11:04:09 +01:00
Mojca Lorber
e555535dfb add edit button to protocol preview modal 2017-01-03 10:04:14 +01:00
Luka Murn
af9e272b2a Re-add tags index controller action to render tags 
Closes SCI-166.
 2017-01-03 09:39:41 +01:00
Zmago Devetak
5d0e80a5e1 Merge pull request #369 from ZmagoD/zd_SCI_812 
fixes bug with samples sorting [fixes SCI-812]
 2017-01-03 08:56:59 +01:00
okriuchykhin
cce57d066c Merge pull request #370 from okriuchykhin/ok_SCI_817 
Fix issue with long samples column names in import modal [SCI-817]
 2016-12-30 15:29:32 +01:00
okriuchykhin
e8955b0304 Merge pull request #375 from okriuchykhin/ok_SCI_361 
Add sorting to Project's experiments overview [SCI-361]
 2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin
d798f1b120 Fix XSS vulnerability in protocol keywords [SCI-632] 2016-12-29 15:15:29 +01:00
Luka Murn
b931b20f02 Fix 2 bugs with comments editing 
Closes SCI-820.
 2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin
4d3e002c81 Add sorting to Project's experiments overview [SCI-361] 2016-12-23 15:40:01 +01:00
Mojca Lorber
40e3240a99 add content to preview modal 2016-12-22 11:43:11 +01:00
zmagod
e554fdf805 code refactor 2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin
53ea09c3de Fix issue with long samples column names in import modal [SCI-817] 2016-12-21 14:34:53 +01:00
zmagod
e2723a288c fixes bug with samples sorting [fixes SCI-812] 2016-12-21 14:32:28 +01:00
Oleksii Kriuchykhin
00ea3a027c Fix generation of preview url for new steps and results [SCI-694] 2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin
cbef971d85 Fix timeouts when fetching images from S3 [SCI-694] 2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin
d2b76d8385 Improved image preview modal [SCI-694] 2016-12-19 17:36:18 +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
zmagod
6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +01:00
okriuchykhin
c4ff12be51 Merge pull request #349 from okriuchykhin/ok_SCI_783 
Fix columns ordering when deleting custom fields [SCI-783]
 2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin
de8eed0a19 Fix hound warning [SCI-783] 2016-12-14 15:27:24 +01:00
Oleksii Kriuchykhin
fa1cf1f04d Better handling of columns deleting with fixing columns ordering [SCI-783] 2016-12-14 15:23:00 +01:00
zmagod
3c1a275510 fixes invited user samples table [fixes SCI-790] 2016-12-13 10:56:13 +01:00
Mojca Lorber
2cfcba0ceb add protocol preview modal 2016-12-13 10:39:18 +01:00
zmagod
4b0e2baa3f fixes breadcrumbs in secondary nav 2016-12-12 16:03: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
8bb452e4f7 trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775] 2016-12-12 10:30:03 +01:00
zmagod
de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +01:00
Luka Murn
1a8b141b95 Add delete custom field functionality 2016-12-09 13:49:19 +01:00
Luka Murn
754c90b612 Edit functionality now works 2016-12-09 13:18:59 +01:00
Mojca Lorber
0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
 2016-12-08 15:44:50 +01:00
zmagod
40fdfef67f setup delayed_paperclip gem 2016-12-08 15:24:14 +01:00
zmagod
ac52e643be cleanup direct upload 2016-12-08 11:26:13 +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
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
Mojca Lorber
849f78b4df implement reordering of columns in the samples table and change from local to database storage 2016-12-05 11:34:36 +01:00
zmagod
7725374c42 refactor sample types/groups [fixes SCI-700] 2016-12-02 09:58:35 +01:00
zmagod
83aae59eed adds sample groups index page 2016-12-02 09:33:09 +01:00
Luka Murn
372b455d7d Merge pull request #332 from Ducz0r/lm-sci-750-751 
Fix inviting users not working
 2016-12-01 15:52:40 +01:00
Luka Murn
6a770f6a7e Fix inviting users not working 
Closes SCI-750, SCI-751.

Probably reopens parts of SCI-746.
 2016-12-01 15:46:37 +01:00
Matej Zrimšek
3bdaa4bcef Some token authentication refactoring and error handilng fixes. [closes SCI-689] 2016-12-01 15:38:56 +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
Nejc Bernot
cb03ed8384 Users can now have multiple tokens 
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
 2016-11-30 16:48:42 +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
4e4a48620c adds validation to input fields 2016-11-29 18:08:29 +01:00
zmagod
12848f15fa adds sample_type index view with all crud actions 2016-11-29 17:15:54 +01:00
Luka Murn
b5d0a39827 Fix some recaptcha form submit errors for signup pages 
Closes SCI-746.
 2016-11-29 15:53:58 +01:00
zmagod
5c0b2d7b24 init sample_types page 2016-11-29 08:57:12 +01:00
okriuchykhin
f9c8223fe5 Merge pull request #321 from okriuchykhin/ok_SCI_736 
Improve regexp for image whitelisting [SCI-736]
 2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin
cc0aab2e59 Improve regexp for image whitelisting [SCI-736] 2016-11-28 10:08:54 +01:00
okriuchykhin
31f6379866 Merge pull request #318 from okriuchykhin/ok_SCI_736 
Add whitelisting of supported image types [SCI-736]
 2016-11-28 09:32:49 +01:00
okriuchykhin
5981d1a48e Merge pull request #316 from okriuchykhin/ok_SCI_738 
Add full name field to accept invitation form [SCI-738]
 2016-11-25 16:15:23 +01:00
Oleksii Kriuchykhin
74f6455a8f Add whitelisting of supported image types [SCI-736] 2016-11-25 16:12:43 +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
87d3280847 Refactor registrations_controller code slightly 2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin
698e07a3b5 Enable reCaptcha and auto log in on confirm invitation form [SCI-706] 2016-11-24 14:11:02 +01:00
Luka Murn
198febfd94 Fix user projects not working 2016-11-23 13:19:10 +01:00
Luka Murn
fba646bfba Fix Hound errors 2016-11-22 15:19:12 +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
Mojca Lorber
60f23b109b integrate reCaptcha into sciNote 2016-11-22 14:57:41 +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
Luka Murn
59eb1c1d18 Remove unused new, edit user_projects views 2016-11-19 17:01:10 +01:00
Luka Murn
911b7ba72f Remove unused new user_my_module view 2016-11-19 16:59:24 +01:00
Luka Murn
6999105e51 Remove tags 2016-11-19 16:57:08 +01:00
Luka Murn
008b31df0c Finish removing new comment forms 2016-11-19 16:54:55 +01:00
Luka Murn
595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Luka Murn
3be30c0e7a Re-introduce fix for SCI-650 that was lost during merge 
Closes SCI-650.
 2016-11-18 10:57:03 +01:00
Luka Murn
26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +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
Luka Murn
04749c3b2c Allow inviting of existing, unconfirmed users 
Closes SCI-676.
 2016-11-15 15:04:31 +01:00
Luka Murn
861e7cf72d Update invited user form so it works if user inputs empty team name 
Closes SCI-650
 2016-11-11 17:27:32 +01:00
Luka Murn
564274a588 Set invited_by field to invited users 2016-11-10 14:45:24 +01:00
Mojca Lorber
d2ae11f1af fix hound 2016-11-10 14:16:54 +01:00
Mojca Lorber
3e162b3a93 remove redcarpet gem - markdown 2016-11-10 14:11:32 +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
Mojca Lorber
27c83992b4 refactoring notification method 2016-11-07 15:31:06 +01:00
Luka Murn
ce7733e9e9 Also add notification when UserOrganization is created 2016-11-07 09:47:30 +01:00
Luka Murn
0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +01:00
Luka Murn
6fe0d6b3df A working invite modal! 2016-11-07 09:43:10 +01:00
Luka Murn
ccf8932611 Add first version of invite users modal 2016-11-07 09:43:09 +01:00
Oleksii Kriuchykhin
fe6724431e Futher improvement of samples assign/unassign logging [SCI-605] 2016-11-07 09:29:56 +01:00
Oleksii Kriuchykhin
a1bfacef86 Improved samples assign/unassign logging [SCI-605] 2016-11-03 17:59:32 +01:00
Oleksii Kriuchykhin
3d25da5db7 Fixed bug with protocol loading from file [SCI-605] 2016-11-03 14:15:22 +01:00
Mojca Lorber
749b108928 fix hound 2016-11-02 13:32:15 +01:00
Mojca Lorber
a2213e23b3 add notification for removing user from team and removing user from project 2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin
e8d20dfc01 Added additional activities [SCI-605] 2016-11-02 10:43:36 +01:00
Luka Murn
eec6b1403d Merge pull request #247 from Ducz0r/lm-hotfix-blank-current-org 
Add check in application controller to always set current org if nil
 2016-10-25 11:53:05 +02:00
Zmago Devetak
266d1415d0 Merge pull request #246 from ZmagoD/zd_SCI_599 
fixes error when removing user from team [SCI-599]
 2016-10-25 11:52:44 +02:00
Luka Murn
7885fd0f39 Add check in application controller to always set current org if nil 2016-10-25 11:39:57 +02:00
zmagod
6a328969f0 reset current_user if the user leaves the team [fixes SCI-599] 2016-10-25 09:53:02 +02:00
zmagod
24b81c96f6 sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608] 2016-10-24 21:20:41 +02:00
zmagod
e02132578a first run 2016-10-24 20:07:20 +02:00
Zmago Devetak
4f5b7ad8ad Merge pull request #228 from ZmagoD/zd_SCI_585 
Removes archived projects from index page [fixes SCI-585]
 2016-10-21 11:33:01 +02:00
Oleksii Kriuchykhin
5be7904f5a Fix hound warnings [SCI-557] 2016-10-21 09:37:24 +02:00
zmagod
db806f3c10 hide private projects 2016-10-21 09:06:19 +02:00
Oleksii Kriuchykhin
0c1ff06f21 Fixes issue with new comments and date separator SCI-557 2016-10-20 22:33:15 +02:00
zmagod
4c086a6fc1 removes archived projects from index page [fixes SCI-585] 2016-10-20 13:13:44 +02:00
zmagod
557957c857 fixed issue with mozilla browsers 2016-10-17 15:21:19 +02:00
zmagod
1614cbc2b2 fixes repeat tutorial button and localization typos 2016-10-17 15:16:22 +02:00
zmagod
931cba2666 fixes hound [fixes SCI-512] 2016-10-17 15:10:26 +02:00
zmagod
fa36488397 fixed new project form 2016-10-17 15:10:26 +02:00
zmagod
8f24d0d80c fixed new user registration 2016-10-17 15:10:26 +02:00
zmagod
3117a464f0 fixed controllers 2016-10-17 15:10:26 +02:00
zmagod
bb9c03df24 fixes controllers 2016-10-17 15:10:26 +02:00
zmagod
d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
zmagod
efe031d766 setup current_organization in all controllers 2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311 setup global team switch view and controller action 2016-10-17 15:10:26 +02:00
Matej Zrimšek
a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
5966911b92 Fixed Hound alerts. 2016-10-17 11:57:46 +02:00
Matej Zrimšek
0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Luka Murn
bdaeb4db13 Add notification mailer preview 2016-10-13 08:56:04 +02:00
mlorb
78f7879c04 Merge pull request #216 from mlorb/ml_sci_555 
Adding update notifications in settings [SCI-555]
 2016-10-13 08:53:55 +02:00
Mojca Lorber
42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Luka Murn
cccabcdd7b Remove invitation_to_organization email 
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
 2016-10-12 10:54:36 +02:00
Oleksii Kriuchykhin
5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Jure Grabnar
1f67aec258 Prevent destroying protocols when file is edited 
SCI-552 #close
 2016-10-06 16:13:42 +02:00
Jure Grabnar
b52e596209 Update protocol timestamp on put_file 
SCI-551 #close
 2016-10-06 14:37:42 +02:00
Oleksii Kriuchykhin
c783e9a03d Code fix after rebase with latest master [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
868ffd03d6 JS code improvement [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
246dae4f46 Code style improvements according to hound [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8907e54b49 Global notifications index page added [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8b5b0723d1 Initial code commit 2016-10-05 15:51:11 +02:00
zmagod
9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
Jure Grabnar
85d2370d28 Change some values to string in CheckFileInfo 2016-10-04 18:19:36 +02:00
Jure Grabnar
3e74c96085 Add wd* params to iframe action url 2016-10-04 18:00:08 +02:00
zmagod
a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn
61cb9651c7 Merge pull request #188 from biosistemika/global-notifications 
Global notifications
 2016-10-04 08:30:50 +02:00
zmagod
c9bbab1004 added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users 2016-10-03 20:31:00 +02:00
Jure Grabnar
72c5824e67 Remove navbar for viewing WOPI files 2016-10-03 20:02:13 +02:00
Jure Grabnar
ec82f64df2 Add WOPI breadcrumbs 2016-10-03 19:45:39 +02:00
Jure Grabnar
1949b1fe88 Add CloseUrl to WOPI 2016-10-03 18:25:01 +02:00
Jure Grabnar
03567d6208 Prevent archive of locked result asset 2016-10-03 17:07:57 +02:00
mlorb
153b692c0c Merge pull request #181 from mlorb/ml_sci_321 
Displaying more information for individual samples in Sample table [SCI-321]
 2016-10-03 16:37:35 +02:00
zmagod
0d23f05698 Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440 2016-10-03 16:14:22 +02:00
Jure Grabnar
f727289935 Add lock check for editing result 2016-10-03 13:43:35 +02:00
zmagod
947096862d fixed hound 2016-10-03 11:40:59 +02:00
zmagod
ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +02:00
zmagod
2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
Jure Grabnar
1e14955ade Prevent deleting asset on step update 2016-10-01 18:47:05 +02:00
Jure Grabnar
d9fa882d6a Add check for locked files on step delete 2016-10-01 14:51:55 +02:00
Jure Grabnar
a2d6d9a29a Add WOPI controlls to result 2016-10-01 11:23:32 +02:00
Jure Grabnar
ff47f29dc2 Add wopi file activity 
SCI-393 #close
 2016-09-29 16:16:42 +02:00
zmagod
e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Jure Grabnar
ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +02:00
Jure Grabnar
bc22697ebe Take/release space in putfile 2016-09-28 18:02:47 +02:00
Jure Grabnar
5e5f4c5ed4 Add text extraction on unlock 2016-09-28 17:36:53 +02:00
Jure Grabnar
02ddd64aaa Set last_modified_by on put_file 2016-09-28 17:00:19 +02:00
zmagod
cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
Jure Grabnar
e96e8486ea Add check file permissions to assets controller 
SCI-502 #close
 2016-09-28 09:33:44 +02:00
Jure Grabnar
25c9ec67b3 Check permissions in wopi_controller 2016-09-28 09:33:44 +02:00
Jure Grabnar
5aea0fbb19 Refactor the rest of WOPI logic from Nejc 2016-09-28 09:33:44 +02:00
Jure Grabnar
c1ae4360a3 Refactor WopiController 2016-09-28 09:33:44 +02:00
Jure Grabnar
0c9292e4fc Catch GET_SHARE_URL post file action 2016-09-28 09:33:44 +02:00
Jure Grabnar
3600fbfe64 Fix UnlockUnlockedFile action 
The time was nigh!
 2016-09-28 09:33:44 +02:00
Jure Grabnar
674326e761 Add timestamp WOPI checking 
Change status error code to 500.
 2016-09-28 09:33:44 +02:00
Jure Grabnar
b51f2a3027 Add basic WOPI proof checking 
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
 2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec First working version of office integration 
Only works on scinote-preview
 2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +02:00
zmagod
dad0d3868b fixing hound 2016-09-27 17:31:37 +02:00
zmagod
2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
Mojca Lorber
c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
Matej Zrimšek
13e886f7a9 Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408] 2016-09-22 17:35:23 +02:00
Matej Zrimšek
234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
Zmago Devetak
5fedcb4be2 Merge pull request #160 from ZmagoD/zd_SCI_464 
Fixes restore experiment error [fixes SCI-464]
 2016-09-21 19:24:33 +02:00
zmagod
06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +02:00
zmagod
8a8bf10f08 clean up flash label 2016-09-21 19:09:57 +02:00
zmagod
bf8e2a208f fixes restore experiment error [fixes SCI-464] 2016-09-21 08:34:32 +02:00
zmagod
42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod
da86208441 styled step comments 2016-09-20 14:13:40 +02:00
zmagod
0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +02:00
Matej Zrimšek
c2f0106993 Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
Zmago Devetak
431227c0a4 Merge pull request #147 from maslick/resultCommentsError1000Chars 
Fixed: Comments in results have no error message if the text exceeds 1000 characters
 2016-09-16 09:38:38 +02:00
Matej Zrimšek
76ff34a8a9 URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring. 2016-09-13 18:56:47 +02:00
zmagod
7c363d5ade fixed security issue 2016-09-13 13:57:31 +02:00
zmagod
3d5a42cc27 refactor results controller 2016-09-13 13:26:04 +02:00
zmagod
222ddf7438 fixed houd error 2016-09-13 13:26:04 +02:00
zmagod
691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
Pavel Maslov
15ea8fc0dc Bug fixed: comments in results have no error message if the text exceeds 1000 characters. 2016-09-13 12:01:56 +02:00
Zmago Devetak
1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
Matej Zrimšek
b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +02:00
zmagod
b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod
9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
Zmago Devetak
9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
zmagod
c526cab498 removed commented code 2016-09-06 11:38:02 +02:00
zmagod
667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
zmagod
4afaa50ce0 fixed multiple tables check 2016-09-01 13:49:12 +02:00
zmagod
111cb81d08 clear tables from report [fixes SCI-247] again 2016-09-01 13:38:09 +02:00
Mojca Lorber
a35bf7182f fixes troubles 2016-08-30 09:43:39 +02:00
Mojca Lorber
b07f1af90f fixes hound again again 2016-08-29 17:08:00 +02:00
Mojca Lorber
7f8bb9be53 fixes hound again 2016-08-29 13:59:51 +02:00
Mojca Lorber
60b0d69a72 fixes hound 2016-08-29 13:56:05 +02:00
Mojca Lorber
53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +02:00
Matej Zrimšek
e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
 2016-08-26 11:13:40 +02:00