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 |
|
Zanz2
|
549346bb0a
|
Deleted a warning that was out of place
|
2017-09-22 16:13:06 +02:00 |
|
Zanz2
|
dd4d4072e8
|
Made code more aesthetic
|
2017-09-22 16:02:56 +02:00 |
|
Zanz2
|
6ebdea5dce
|
Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)
|
2017-09-22 15:12:29 +02:00 |
|
Zanz2
|
4051c0b06b
|
Deleted old unused files i spotted on github
|
2017-09-22 13:28:38 +02:00 |
|
Zanz2
|
6a07aa28e4
|
Accidentally removed this line after reviewing git changes, adding it back
|
2017-09-22 13:11:49 +02:00 |
|
Zanz2
|
deef790951
|
added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions
|
2017-09-22 11:56:50 +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 |
|
Zanz2
|
1dbb03e22d
|
Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer
|
2017-09-21 16:05:33 +02:00 |
|
Zanz2
|
df8cbc2741
|
vastly improved protocol preview styling to look more like documentation specifications
|
2017-09-21 13:46:52 +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 |
|
Zanz2
|
8da72eb64a
|
made code look nicer
|
2017-09-21 09:29:13 +02:00 |
|
Zanz2
|
f48833c47a
|
added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();
|
2017-09-21 08:40:05 +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 |
|
Zanz2
|
d59234a1e3
|
minor changes, working on refresh after submit
|
2017-09-20 16:04:52 +02:00 |
|