scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-06 07:33:04 +08:00
Code Issues Projects Releases Packages Wiki Activity
2992 commits 39 branches 184 tags 168 MiB
Commit graph

86 commits

Author SHA1 Message Date
Matej Zrimšek
9ef04a6a2b Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version. 2018-01-16 17:01:44 +01:00
mlorb
f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
zmagod
331823c2fb upgrade capybara_email gem 2017-11-23 16:27:49 +01:00
Luka Murn
c51a85a161
Merge pull request #888 from biosistemika/lm-sci-1795 
Setup main architecture for permissions refactoring [SCI-1795]
 2017-11-23 12:32:49 +01:00
Luka Murn
28cadb987e Update revision of canaid Gem 2017-11-20 18:16:05 +01:00
Luka Murn
ccef5571f1 Add dependency to Canaid, the permission helper library 2017-11-16 15:49:13 +01:00
zmagod
ed50466acd fixes dependencies issue [fix SCI-1817] 2017-11-16 09:49:42 +01:00
zmagod
327e27e123 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576 2017-11-09 15:55:10 +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
b036452d8c adds background worker to cucumber tests 2017-11-08 11:59:01 +01:00
mlorb
1c3c822796 change drivers for browser 2017-11-06 14:26:01 +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
e740e586e8 Additional fixes required by latest merge from master (nr. 2) 2017-10-23 10:43:32 +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
56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
zmagod
dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
mlorb
c358f8fa0c write unit tests for invite users 2017-09-28 14:49:33 +02:00
Oleksii Kriuchykhin
faaa016267 Update AWS SDK v2 [SCI-1623] 2017-09-26 13:41:53 +02:00
mlorb
48c8922604 adds invite users modal 2017-09-21 10:45:35 +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
zmagod
ee054f91b8 adds bullet gem [fixes SCI-1578] 2017-08-30 09:29:45 +02:00
Luka Murn
b6eb46471a Merge pull request #753 from Ducz0r/lm-remove-some-code 
Remove some code we're no longer maintaining
 2017-08-22 14:04:04 +02:00
Luka Murn
90188c89c9 Update delayed_paperclip library 
Closes SCI-1376.
 2017-08-22 08:34:58 +02:00
zmagod
c5e32c4ea0 Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch 2017-08-21 09:52:14 +02:00
Luka Murn
13eae287bb Revert "Add core API using JWT authentication and tests for it [SCI-1507]" 2017-08-07 11:54:45 +02:00
Luka Murn
ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
 2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin
e958410261 Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00
zmagod
6ef19725f1 adds redux 2017-08-02 17:27:05 +02:00
Luka Murn
03a7440136 Remove SkyLight stuff (we're not using it any more) 2017-07-27 14:26:44 +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
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
Oleksii Kriuchykhin
b8e93ee883 Add Webpacker and React [SCI-1461] 2017-07-12 16:41:55 +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
zmagod
bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
zmagod
71aa05bb0e refactor 2017-06-27 14:58:49 +02:00
zmagod
819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
zmagod
1b21f073d7 Rails 5.1.1 2017-06-23 10:34:46 +02:00
zmagod
909a114418 Rails 5.0.0.rc2 2017-06-23 10:08:54 +02:00
zmagod
75507107fd migrate to 4.2.9 2017-06-23 08:50:12 +02:00
rekonder
ede744849b Export repository [aj-SCI-1275] 2017-06-09 19:44:28 +02:00
zmagod
10db322307 fixes input sanitize method [fixes SCI-1248] 2017-05-10 14:57:11 +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