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
2677 commits 31 branches 181 tags 167 MiB
Commit graph

2677 commits

This branch
This branch
All branches
Author SHA1 Message Date
zmagod
6fe48a07ae fix hound, add custom hook for webpacker:compile 2017-10-16 17:02:35 +02:00
zmagod
c5978f2d86 adds cucumber test for profile page [fixes SCI-1572] 2017-10-16 16:21:52 +02:00
zmagod
bdc1051cbb cleanup 2017-10-12 17:05:04 +02:00
zmagod
e5ebedb428 fix errors with polyfill 2017-10-12 16:49:33 +02:00
zmagod
dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
zmagod
3740e89ca0 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1572 2017-10-11 15:20:09 +02:00
zmagod
abe0b8adcc tweak tweak 2017-10-11 15:20:03 +02:00
zmagod
9e2b589e4b fixes phantom.js parser error 2017-10-11 10:37:18 +02:00
zmagod
f71ff8589d changes testing image 2017-10-11 09:51:20 +02:00
mlorb
8bd698e5c3 Merge pull request #817 from mlorb/ml-sci-1632 
Fixes buttons on my profile page [SCI-1632]
 2017-10-10 16:30:50 +02:00
mlorb
7ca29b50a2 Merge pull request #816 from mlorb/ml-sci-1636 
Fixes style errors on one team page [SCI-1636]
 2017-10-10 16:23:50 +02:00
Zmago Devetak
e99791bd29 Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration 
fixes webpack production build
 2017-10-10 15:08:28 +02:00
zmagod
f12a645fa3 fix hound 2017-10-10 15:01:25 +02:00
zmagod
f00c36998d removes unneeded style component 2017-10-10 14:51:46 +02:00
zmagod
a35ba0239a fixes flow types 2017-10-10 14:48:46 +02:00
Zmago Devetak
d1c3d00c84 Merge pull request #807 from ZmagoD/zd_SCI_1629 
adds bootstrap and font-awesome in webpacker build fixes the missing …
 2017-10-10 14:09:52 +02:00
zmagod
c014742a88 fixes webpack production build 2017-10-10 14:08:23 +02:00
mlorb
fd859d7b7f fixes buttons on my profile page 2017-10-10 13:25:44 +02:00
mlorb
7dae772822 fixes style errors on one team page 2017-10-10 11:32:13 +02:00
zmagod
9e1622ccd2 adds profile steps 2017-10-10 09:17:55 +02:00
mlorb
25e6eb4511 Merge pull request #812 from mlorb/ml-sci-1634 
Fix a few style error on All teams page [SCI-1634]
 2017-10-09 14:59:57 +02:00
mlorb
1049e0730e implements @ZmagoD comments 2017-10-09 13:59:32 +02:00
Zmago Devetak
35f467c5fd Merge pull request #809 from ZmagoD/zd_SCI_1628 
Activities are not separated by date
 2017-10-09 11:08:28 +02:00
zmagod
fc585ebe11 refactor GlobalActivitiesModal constructor 2017-10-09 10:58:40 +02:00
zmagod
943339345a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628 2017-10-09 10:41:36 +02:00
zmagod
2d1c849106 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629 2017-10-09 09:43:29 +02:00
zmagod
bc2c9e24e2 set scss-lint to allow double quotes 2017-10-09 09:41:52 +02:00
Zmago Devetak
5ab5c7e898 Merge pull request #805 from ZmagoD/zd_SCI_1566 
added notification alert [fixes SCI-1566]
 2017-10-09 09:35:33 +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
f370d170df fix package.json 2017-10-09 09:27:25 +02:00
Zmago Devetak
f2103dca6d Merge pull request #811 from ZmagoD/zd_SCI_1567 
fixes sign out action on settings page, clean the redux store, handle…
 2017-10-09 09:24:57 +02:00
zmagod
0a8ef8cd9d removed unneeded import 2017-10-09 09:23:25 +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
Zmago Devetak
395d0cb863 Merge pull request #810 from ZmagoD/zd_SCI_1641 
trigger redirect to root page on team switch [fixes SCI-1641]
 2017-10-06 17:06:06 +02:00
zmagod
811b206392 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1641 2017-10-06 17:05:07 +02:00
zmagod
839eaf8e03 downgrade to react 15 since bootstrap-react is not fully compatible 2017-10-06 17:02:14 +02:00
zmagod
3321fc495c Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628 2017-10-06 15:54:52 +02:00
zmagod
8dfb5e2260 implements @mlorb suggestions 2017-10-06 15:22:01 +02:00
Zmago Devetak
bb3f61bf07 Merge pull request #797 from ZmagoD/zd_SCI_1564 
Code Profile & Preferences page - form validations / refactor / remove redux
 2017-10-06 14:11:30 +02:00
zmagod
c3562e08e9 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566 2017-10-06 10:46:47 +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
zmagod
c20f0c2d8a fixes user_controller specs, adds user model specs for settings 2017-10-05 15:53:05 +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
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
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