scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 23:15:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
2795 commits 43 branches 185 tags 169 MiB
Commit graph

2795 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
mlorb
7db4bd1f5f fix a few style error on All teams page 2017-10-05 10:05:55 +02:00
mlorb
91e2a6bab2 Merge pull request #787 from mlorb/ml-sci-1561 
Fix bug with tinyMCE text validaton [SCI-1561]
 2017-10-05 08:39:22 +02:00
okriuchykhin
2c5d913048 Merge pull request #804 from okriuchykhin/ok_SCI_1482 
Improve memory utilization in PDF report generator [SCI-1482]
 2017-10-04 17:51:28 +02:00
mlorb
fcea55c2a1 Merge pull request #808 from mlorb/ml-sci-1631 
Fix rounded style of buttons and fix invite users to a team style errors [SCI-1631]
 2017-10-04 14:57:45 +02:00
zmagod
14bae8def5 trigger redirect to root page on team switch [fixes SCI-1641] 2017-10-04 14:42:38 +02:00
zmagod
4380a65caf fixes activities key [fixes SCI-1628] 2017-10-04 13:45:52 +02:00
zmagod
e9568bcd47 optin flow in activities modal 2017-10-04 11:35:32 +02:00
zmagod
84f279de22 setup flow 2017-10-04 09:16:17 +02:00
mlorb
83f06361f2 fix rounded style of buttons and fix invite users to a team style errors 2017-10-03 17:33:30 +02:00
zmagod
ce6613ac63 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629 2017-10-03 16:05:45 +02:00
zmagod
55332e2957 adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629] 2017-10-03 16:01:33 +02:00
Luka Murn
f8fc2737d5 Merge pull request #803 from Ducz0r/lm-sci-1599 
Add global flash notifications/alerts [SCI-1599]
 2017-10-03 11:15:27 +02:00
Luka Murn
2964579638 Fix Zmago's comments 2017-10-03 11:14:47 +02:00
Luka Murn
8ba7ed5884 Change the generation to be done using Redux (instead of this.window...) 2017-10-02 19:25:04 +02:00
zmagod
182e3dcc37 added colors constants 2017-10-02 14:56:49 +02:00
zmagod
edf4443995 added notification alert [fixes SCI-1566] 2017-10-02 14:51:54 +02:00
Luka Murn
caa8791cad Merge pull request #796 from Ducz0r/lm-sci-1620 
[SCI-1620] Add tests for create new team page
 2017-10-02 11:40:11 +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
Oleksii Kriuchykhin
6824f9a8bc Improve memory utulization in PDF report generator [SCI-1482] 2017-10-02 11:29:22 +02:00
Luka Murn
7cc2136c74 Bump VERSION to 1.12.4 2017-09-29 13:32:31 +02:00
mlorb
1af27d9361 Merge pull request #802 from mlorb/ml-sci-1619 
Write unit tests for invite users [SCI-1619]
 2017-09-29 10:41:00 +02:00
Luka Murn
cbf2e3cc3f Hound is love, Hound is life 2017-09-28 20:07:11 +02:00
Luka Murn
a0db8fcf9d Some codestyle fixes 2017-09-28 19:49:25 +02:00
Luka Murn
6951755a92 Add animation, multiple alerts, make them float 2017-09-28 19:39:17 +02:00
zmagod
9de8592858 fixed edit image on hover action 2017-09-28 17:13:04 +02:00
zmagod
f492234f89 fixes hound allerts 2017-09-28 17:00:11 +02:00
zmagod
cb4bacc372 refactor preferences page [fixes SCI-1564] 2017-09-28 16:53:51 +02:00
zmagod
54c771804a upgrades to react 16.0 2017-09-28 15:10:20 +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
Luka Murn
f6c7e854ad Update main application, slight refactor 2017-09-27 17:59:04 +02:00
Luka Murn
a46f50af21 Remove FlashMessages component 2017-09-27 17:34:45 +02:00
Luka Murn
82d672293a First WIP version of FlashMessages & Alert components 2017-09-27 17:29:04 +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
okriuchykhin
34d1735cf5 Merge pull request #800 from okriuchykhin/ok_SCI_1623_v2 
Update AWS SDK v2 [SCI-1623]
 2017-09-26 14:46:02 +02:00
Oleksii Kriuchykhin
faaa016267 Update AWS SDK v2 [SCI-1623] 2017-09-26 13:41:53 +02:00
Luka Murn
4f8f248cd2 Merge pull request #798 from Ducz0r/lm-opensci-26-fix 
Fix missing value in delayed_uploader_tutorial
 2017-09-22 17:12:21 +02:00
Luka Murn
05e627e976 Fix missing value in delayed_uploader_tutorial 
Closes OPENSCI-26.
 2017-09-22 17:10:53 +02:00
zmagod
1a7f8fc857 added frontend validations 2017-09-22 16:59:38 +02:00
mlorb
668a92a3d8 Merge pull request #793 from mlorb/ml-sci-1498 
Adds invite users modal [SCI-1498]
 2017-09-22 10:01:27 +02:00
mlorb
4ef7b57f31 fix error handeling 2017-09-22 09:57:41 +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