scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 14:46:00 +08:00
Code Issues Projects Releases Packages Wiki Activity
2774 commits 31 branches 181 tags 167 MiB
Commit graph

2774 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mlorb
9d96bf668a fix error handeling, refactoring 2017-09-21 16:42:56 +02:00
Luka Murn
ee96851951 Add tests for create new team page 
Closes SCI-1620.
 2017-09-21 13:46:36 +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
ac3601bd2e hound 2017-09-21 10:56:17 +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
Luka Murn
beae1b05d8 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-09-21 08:27:38 +02:00
Luka Murn
a399b1dd44 Merge pull request #792 from Ducz0r/lm-sci-1501 
[SCI-1501] Rewrite "New team" wizard into React.js
 2017-09-21 08:12:14 +02:00
Luka Murn
5429f6bbbd Fix @ZmagoD's remarks 2017-09-21 08:06:11 +02:00
zmagod
c636ca4276 refactor user preferences and profile page 2017-09-20 11:17:59 +02:00
Luka Murn
416ccf905d Minor fix 2017-09-20 10:53:38 +02:00
Luka Murn
6e993f41b8 Indentation error 2017-09-19 16:59:19 +02:00
Luka Murn
869c3593a3 Hound is love, Hound is life 2017-09-19 16:56:39 +02:00
Luka Murn
decdce17fa Fix rebasing problems 2017-09-19 16:47:55 +02:00
Luka Murn
44877a13a5 Refactor services on backend. New team page is now working 2017-09-19 16:32:21 +02:00
Luka Murn
80c05e50ec Semi-working version of create new team form 2017-09-19 16:30:26 +02:00
Luka Murn
df44976fc6 Save input values into component state 2017-09-19 14:07:17 +02:00
Luka Murn
0108d9ea19 Finish new team GUI 2017-09-19 14:04:46 +02:00
Luka Murn
28cb9643d9 Blank new team page with breadcrumbs 2017-09-19 14:04:46 +02:00