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

2609 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Zmago Devetak
76a42f7fb7 Merge pull request #791 from ZmagoD/zd_SCI_1622 
fixes profile page route, moves source files out of packs folder, res…
 2017-09-19 13:39:00 +02:00
zmagod
40af99c57f fix hound v2 2017-09-19 13:36:51 +02:00
zmagod
8416ccc5c2 fixes hound alerts 2017-09-19 13:33:43 +02:00
zmagod
88928be2d3 fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622] 2017-09-19 13:08:08 +02:00
Zmago Devetak
4e8381d9ba Merge pull request #781 from ZmagoD/zd_SCI_1499 
Write single team page in React.js
 2017-09-18 15:59:44 +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
b9492daa69 fixes changeTeam method 2017-09-18 15:16:07 +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
Toni Dezman
39c9b708bd Merge pull request #780 from programmertoni/td_SCI_1565 
Td sci 1565
 2017-09-18 11:37:19 +02:00
Toni Dezman
f144e057b7 Merge pull request #789 from programmertoni/td_SCI-1600_spinner 
Global Spinner
 2017-09-18 11:36:25 +02:00