scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-10-01 12:26:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
3913 commits 69 branches 179 tags 165 MiB
Commit graph

522 commits

Author SHA1 Message Date
Zmago Devetak 50ccec5007
Merge pull request #1009 from ZmagoD/zd_SCI_2066 
add info modal for repository items [fixes SCI-2066]
 2018-03-05 12:49:29 +01:00
zmagod 0996745781 refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024] 2018-03-02 13:39:22 +01:00
mlorb 08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
Matej Zrimšek b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
Matej Zrimšek 321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
zmagod 36595d33f4 fix name scope 2018-02-12 09:09:56 +01:00
zmagod d12f8403e4 add reference to repository column 2018-02-12 09:05:41 +01:00
zmagod ae99c92516 follow @okriuchykhin 's suggestions 2018-02-09 16:28:21 +01:00
zmagod 557aeca049 refactor relations 2018-02-09 14:11:56 +01:00
zmagod 7c13c5a1f4 fixes typo, follows @okriuchykhin 's suggestions 2018-02-09 11:38:52 +01:00
zmagod 6b7ff11bcf setup models for repository list column [fixes SCI-2015] 2018-02-07 15:28:28 +01:00
Oleksii Kriuchykhin 16e1d072b9 Improve files handling in protocol clonning [SCI-2003] 2018-02-01 15:44:08 +01:00
mlorb 775b8b3201 fix bug with ajax error caused to the other user when deleting column in custom repository 2018-01-29 16:01:33 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin 819febb05b Remove skip_on_import from repository_cell [SCI-1939] 2018-01-17 12:54:32 +01:00
Oleksii Kriuchykhin a64012237e Fix repository records import [SCI-1939] 2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin 2ddb0ea009 Improve XLSX parsing with Roo [SCI-1915] 2018-01-11 17:52:57 +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 e49ffb61d4
Merge pull request #914 from okriuchykhin/ok_SCI_1873 
Fix repositories [SCI-1873]
 2018-01-04 13:33:30 +01:00
Oleksii Kriuchykhin 66869fe4cf Fix canvas update [SCI-1871] 2017-12-20 11:44:11 +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
zmagod 219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin 6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +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
Zmago Devetak 3cd7e6fdde
fix open method 2017-11-24 15:19:58 +01:00
mlorb 9e7b75a880
Merge pull request #892 from mlorb/ml-sci-1215_v2 
Make background gray for paperclip images [SCI-1215]
 2017-11-23 17:32:09 +01:00
Mojca Lorber 0ffe476a54 make background gray for paperclip images 2017-11-23 14:35:42 +01:00
Luka Murn 00fe267a2a Minor codestyle fixes 2017-11-23 11:33:39 +01:00
Mojca Lorber fe5828fa97 add copying of TinyMce assets when cloning the protocol 2017-11-22 16:47:21 +01:00
zmagod 91fec89cab adds tiny_mce_assets to protocol export 2017-11-21 16:30:48 +01:00
Luka Murn d715eb06ef Add team & project role-related helper functions to User model 
This will be required later once we start using Canaid.
 2017-11-16 15:50:30 +01:00
Oleksii Kriuchykhin f202687291 Allow import of the sample with missing non mandatory fields [SCI-1819] 2017-11-15 16:40:14 +01:00
Oleksii Kriuchykhin 84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
Mojca Lorber f75a2710d5 fix preview for images with transparent background 2017-11-13 18:03:14 +01:00
zmagod e0b6683a44 create view directory per @Ducz0r 's request 2017-11-09 10:06:53 +01:00
zmagod e0323a0a46 fixes failing tests 2017-10-27 09:35:39 +02:00
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +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 6c2c5aff17 Additional fixes required by latest merge from master 2017-10-23 09:51:13 +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 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
Oleksii Kriuchykhin c8d2ae70fa Move duplicated code to service [SCI-1665] 2017-10-17 14:46:16 +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
Oleksii Kriuchykhin d266034406 Use case insensitive sample types and groups in import [SCI-1689] 2017-10-13 17:15:51 +02:00
Oleksii Kriuchykhin 56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
Oleksii Kriuchykhin 9a8e33c6d7 Small fixes [SCI-1642] 2017-10-11 17:24:31 +02:00
Oleksii Kriuchykhin 6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +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 c20f0c2d8a fixes user_controller specs, adds user model specs for settings 2017-10-05 15:53:05 +02:00
zmagod a020e23286 follow suggestions of @Ducz0r 2017-10-05 13:56:56 +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
zmagod 26b526d61b adds getter and setters for user settings 2017-09-27 14:38:52 +02:00
zmagod e2aa0d7515 fixes user profile 2017-09-26 17:29:11 +02:00
Luka Murn e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-09-21 08:27:38 +02:00
Mojca Lorber 0e14420193 fix bugs with importing samples 2017-09-06 14:41:14 +02:00
zmagod 9c01ab414c refactor leave team 2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin fc0e2d2172 Add validation for uid uniqness [GIOT-29] 2017-09-01 17:00:13 +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 db16da7bd6 adds custom query to fetch teams data 2017-08-25 16:07:37 +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 ec7b7ffe08 You are my sunshine, my only sunshine, 
You make me happy when skies are grey
You never know, Hound, how much I love you
Please don't take my Hound away
 2017-08-10 14:42:58 +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
Zmago Devetak 4be39a8580 Merge pull request #762 from ZmagoD/zd_SCI_1493 
Copy navbar to React
 2017-08-07 14:07:55 +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
zmagod c314bae28d add team switch js/controller 2017-08-03 16:03:15 +02:00
zmagod b69ec22dfe fixes failing tests [fixes SCI-1470] 2017-07-28 10:14:50 +02:00
zmagod 416ab8eee3 Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400 2017-07-26 16:20:09 +02:00
Oleksii Kriuchykhin 6a43483a2f Fix adding and editing repository items [SCI-1519] 2017-07-26 11:22:26 +02:00
Oleksii Kriuchykhin efd03db6db Further samples import improvement [SCI-101] 2017-07-25 10:56:07 +02:00
Oleksii Kriuchykhin 67b0c78593 Improve samples import speed [SCI-101] 2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin 6d56e6b72e Remove redundant self [SCI-1487] 2017-07-20 11:51:42 +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
Nbernot d746ae2549 Removes parentheses around if conditions 2017-07-11 13:33:47 +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
zmagod 750c82a80f setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
Nejc Bernot 803934e07d Changes the host for the download and redirect paths 2017-07-05 10:23:10 +02:00
Nejc Bernot 91fe7fe4ad Changes the completely NOT ruby code 2017-07-04 17:13:59 +02:00
Luka Murn e3b9c1c644 Woops, almost forgot on this one 2017-07-04 15:00:14 +02:00
Luka Murn 8d68769d09 Hound is Love, Hound is Life 2017-07-04 14:47:58 +02:00
Luka Murn 91cddce8a6 Fixes DEPRECATION WARNING-s for Rails 5.1.2 
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).

Closes SCI-1427.
 2017-07-04 14:35:51 +02:00
Nejc Bernot bd9904adb3 Adds support for business servers 
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
 2017-07-04 14:27:43 +02:00
Zmago Devetak 5f4006fe4a Merge pull request #723 from ZmagoD/zd_SCI_1408 
Fixes bugs on canvas [fixes SCI-1408]
 2017-07-04 11:16:04 +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
Oleksii Kriuchykhin b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
zmagod 311270ff49 refactor 2017-07-03 15:32:02 +02:00
zmagod fd13921720 fixes repeat tutorial [fixes SCI-1410] 2017-06-29 11:00:50 +02:00
zmagod bef5a085c4 Fixes bugs on canvas [fixes SCI-1408] 2017-06-29 10:29:41 +02:00
Oleksii Kriuchykhin e474cda03a Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
Zmago Devetak 502eb5c211 fixes tabs 2017-06-28 15:40:15 +02:00
zmagod d8a3fdea20 fixes hound 2017-06-28 15:29:10 +02:00
zmagod 525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
zmagod 71aa05bb0e refactor 2017-06-27 14:58: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