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 |
|
Zanz2
|
72c707ae88
|
protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit
|
2017-09-20 15:31:10 +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 |
|
Zanz2
|
7b85d74a23
|
added jquery code to reset file selector selected file after it is canceled in the preview modal
|
2017-09-20 09:32:31 +02:00 |
|
Zanz2
|
3812b2e64b
|
Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore
|
2017-09-20 08:58:00 +02:00 |
|
Zanz2
|
ea8f3e822d
|
Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone
|
2017-09-20 08:38:34 +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 |
|
Zanz2
|
ed64ce814a
|
i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript
|
2017-09-19 16:07:54 +02:00 |
|
Zanz2
|
7aba782639
|
optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show
|
2017-09-19 15:02:16 +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 |
|
zmagod
|
40359c5c73
|
fixed edit name modal
|
2017-09-15 16:34:05 +02:00 |
|
Zanz2
|
f861b1fc52
|
Configured the controller,the main task ahead is to figure out how to import all of the data i have available
|
2017-09-15 15:52:55 +02:00 |
|