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

812 commits

Author SHA1 Message Date
zmagod
cebb06269b refactor specs 2018-04-12 13:34:34 +02:00
Luka Murn
9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
zmagod
7f93cf6220 adds specs for duplicate class 2018-04-12 13:00:21 +02:00
zmagod
6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod
e4b49e62a3 fixes import limit 2018-04-10 15:45:51 +02:00
zmagod
b12f6f1b92 set limit on maximum number of dropdown list items [fixes SCI-2259] 2018-04-09 12:50:25 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
zmagod
6e255a4657 fixes failing specs 2018-04-04 14:44:32 +02:00
zmagod
659a088058 refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222] 2018-03-29 15:55:26 +02:00
Zmago Devetak
75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068 
Write server-side endpoints for custom repositories [SCI-2068]
 2018-03-20 14:30:47 +01:00
Oleksii Kriuchykhin
a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod
1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod
c2eb6d6900 fixes hound adds specs to repository_list_items controller 2018-03-16 10:53:05 +01:00
zmagod
d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
zmagod
b67a54e2d1 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import 2018-03-13 15:25:57 +01:00
zmagod
3957c4c54c fix failing spec 2018-03-13 15:03:48 +01:00
okriuchykhin
503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +01:00
zmagod
32d2d218ba fix failing specs 2018-03-13 11:24:16 +01:00
mlorb
3b9ad2f86f
Merge pull request #1028 from mlorb/ml-sci-2144 
Add file custom column type to db [SCI-2144]
 2018-03-12 15:18:02 +01:00
mlorb
34f5c2c7ac fix validation in asset model and change formatted method in repository_asset_value model 2018-03-12 10:50:45 +01:00
Zmago Devetak
d50bc5fde9
Merge pull request #998 from ZmagoD/zd_SCI_2014 
migration script for migrating samples -> custom repositories [SCI-2014]
 2018-03-09 17:19:12 +01:00
mlorb
64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
zmagod
26c5c8bf46 fix failing test 2018-03-09 16:59:17 +01:00
zmagod
22eb4121f0 follow @okriuchykhin 's suggestions 2018-03-09 15:44:42 +01:00
zmagod
0baa7a1f99 fix hound 2018-03-09 14:43:12 +01:00
zmagod
4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
zmagod
fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +01:00
zmagod
fca01bd54f refactor repository export [fixes SCI-2025] 2018-03-05 15:54:04 +01:00
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
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
zmagod
83db7ed01d adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014] 2018-02-26 17:21:58 +01:00
zmagod
5922aa21a8 adds fetch_all_team_samples method/spec 2018-02-15 17:38:45 +01:00
zmagod
c53df21946 adds specs for sample_to_repository migration service 2018-02-15 16:56:38 +01:00
zmagod
e0ac8e8f91 extract helper methods in service 2018-02-15 09:36:09 +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
zmagod
34f5076b04 fixes failin specs [fixes SCI-2001] 2018-01-31 12:05:45 +01:00
zmagod
88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
zmagod
0d7c116de1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-09 10:03:02 +01:00
zmagod
743a388a8d adds additional tests for permissions controller 2018-01-09 10:00:07 +01:00
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
1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
mlorb
bd7eda1506 fix failing tests 2017-12-14 14:18:18 +01:00
zmagod
219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
zmagod
b106545d31 fixes per @duco 's request 2017-12-13 08:57:50 +01:00
zmagod
e01e7bebbf add permissions endpoint on the API 2017-12-04 13:25:48 +01:00
zmagod
61be762b76 fix failing navigation spec 2017-11-23 15:30:08 +01:00
zmagod
70db34090d fixes rspec tests 2017-11-20 09:41:14 +01:00
zmagod
e0b6683a44 create view directory per @Ducz0r 's request 2017-11-09 10:06:53 +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
zmagod
55d05b013b fix typo 2017-11-03 10:11:23 +01:00
zmagod
e17f945d8a fix typos 2017-11-02 16:41:29 +01:00
zmagod
605674bf6b adds controller spec 2017-11-02 13:36:21 +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
c026b60790 Update Profile page to use validation 2017-10-23 18:04:20 +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
zmagod
c3562e08e9 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566 2017-10-06 10:46:47 +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
zmagod
c20f0c2d8a fixes user_controller specs, adds user model specs for settings 2017-10-05 15:53:05 +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
1b03222260 adds tests for sign_out_user action on users controller 2017-10-05 10:24:28 +02:00
zmagod
edf4443995 added notification alert [fixes SCI-1566] 2017-10-02 14:51:54 +02:00
Luka Murn
334a8a600b Merge branch 'decoupling-settings-page' into lm-sci-1620 2017-10-02 11:39:13 +02:00
Luka Murn
fbddf4da79 Update Gemfile for correct devise version, minorly fix services spec 2017-10-02 11:37:58 +02:00
mlorb
c358f8fa0c write unit tests for invite users 2017-09-28 14:49:33 +02:00
zmagod
e2aa0d7515 fixes user profile 2017-09-26 17:29:11 +02:00
Luka Murn
6e082ccc24 Hound is love, Hound is life #2 2017-09-21 19:20:19 +02:00
Luka Murn
e0a6b1360d Hound is love, Hound is life 2017-09-21 19:18:39 +02:00
Luka Murn
a14457cba0 Add tests for create team service 2017-09-21 19:12:47 +02:00
Luka Murn
ee96851951 Add tests for create new team page 
Closes SCI-1620.
 2017-09-21 13:46:36 +02:00
Luka Murn
e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
zmagod
015026926d refactor 2017-09-18 15:46:24 +02:00
zmagod
f0a8275559 fixes merge conflicts 2017-09-18 15:36:33 +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
zmagod
1a00b53034 adds user_team tests 2017-09-14 13:11:19 +02:00
zmagod
705d07f60e adds remove team action 2017-09-13 17:11:51 +02:00
zmagod
1b3b3dfea9 adds team members update role functionality 2017-09-12 17:30:13 +02:00
Toni Dezman
67d617deb5 adds hound_bot's and zmagos suggestions 2017-09-07 13:40:53 +02:00
Toni Dezman
b7bed5b5fe changes double quotes with single quotes 2017-09-05 14:47:05 +02:00
Toni Dezman
b2e969459c adds controller unit tests 2017-09-05 14:43:35 +02:00
Toni Dezman
df1fb6286b renames rspec file to _spec.rb 2017-09-04 15:13:55 +02:00
zmagod
9c01ab414c refactor leave team 2017-09-01 17:10:43 +02:00
zmagod
1325732b0c adds specs for team controller actions 2017-08-30 16:18:21 +02:00
Oleksii Kriuchykhin
c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
zmagod
f7cb395b6a fix hound v2 2017-08-29 13:11:42 +02:00
zmagod
df0bca363c fix hound 2017-08-29 13:10:18 +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
db16da7bd6 adds custom query to fetch teams data 2017-08-25 16:07:37 +02:00
Luka Murn
c62002381b Add default settings migration and concern 2017-08-10 11:30:57 +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
Oleksii Kriuchykhin
e958410261 Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00
zmagod
ca3e89ab62 fix hound 2017-07-28 12:03:44 +02:00
zmagod
b69ec22dfe fixes failing tests [fixes SCI-1470] 2017-07-28 10:14:50 +02:00
zmagod
cd7ababab0 fix sample types 2017-07-26 16:16:08 +02:00
zmagod
dfd488fa96 prevents cleaning data after rspec 2017-07-10 14:38:18 +02:00
zmagod
6636190442 removes unneeded gems, adds validation test to models 2017-07-06 17:37:29 +02:00
zmagod
234ca71f0a removes unneded gems, fixes hound 2017-07-06 09:45:59 +02:00
zmagod
750c82a80f setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00