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
|
ef1025e0ee
|
fixes hound
|
2017-10-02 18:11:54 +02:00 |
|
zmagod
|
3dc3ed906f
|
fixes bug with embedded images [fixes SCI.1624]
|
2017-10-02 18:06:42 +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 |
|
Zanz2
|
b23ca33e73
|
Deleted todo-list comments :D
|
2017-09-26 16:46:17 +02:00 |
|
Zanz2
|
9bf69276ae
|
deleted unused files
|
2017-09-26 16:39:19 +02:00 |
|
Zanz2
|
c72cf6320a
|
Finished rubocop refactoring
|
2017-09-26 16:19:09 +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 |
|
Zanz2
|
3074acbc0d
|
Made javascript code nicer
|
2017-09-26 13:31:24 +02:00 |
|
Zanz2
|
055746bfd9
|
Rubocop beautified code v2
|
2017-09-26 13:21:48 +02:00 |
|
Zanz2
|
ad1847256c
|
Rubocop beautified code
|
2017-09-26 13:20:55 +02:00 |
|
Zanz2
|
8d961c934a
|
Rubocop refactored part of the controller code
|
2017-09-26 13:17:00 +02:00 |
|
Zanz2
|
2bfe8f0b95
|
Testing why rubocop gives errors
|
2017-09-25 15:27:24 +02:00 |
|
Zanz2
|
79e065a811
|
Fixed a mistake in the fix that made it not render the preview
|
2017-09-25 14:39:43 +02:00 |
|
Zanz2
|
292c1e3c31
|
Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first
|
2017-09-25 14:14:27 +02:00 |
|
Zanz2
|
11b2ef3112
|
Made code nicer, hopefully not unintentionally breaking something
|
2017-09-25 13:53:32 +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 |
|