scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 07:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
2856 commits 70 branches 179 tags 165 MiB
Commit graph

683 commits

Author SHA1 Message Date
zmagod e0e3ef9359 fixes flow, and before_action in permissions_controller 2018-01-03 17:23:50 +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 52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +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 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
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod c36fcb1fa4 fixes user invitation button [fixes SCI-1726] 2017-10-25 11:31:32 +02:00
Luka Murn c026b60790 Update Profile page to use validation 2017-10-23 18:04:20 +02:00
Luka Murn 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
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 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
okriuchykhin db9a031581 Merge pull request #813 from okriuchykhin/ok_SCI_1642 
Refactor canvas [SCI-1642]
 2017-10-12 17:45:34 +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
Luka Murn fe89b942e7 Add Add-ons page to User -> Settings -> Account 
Closes SCI-1675.
 2017-10-11 14:15:37 +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
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 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
zmagod 1a7f8fc857 added frontend validations 2017-09-22 16:59:38 +02:00
mlorb 9d96bf668a fix error handeling, refactoring 2017-09-21 16:42:56 +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
Luka Murn e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00