zmagod
dccf4e34ff
fix cucumber settings
2017-10-12 13:50:48 +02:00
Zanz2
5d667f146e
Moved .js form reset and made a standalone description method
2017-10-11 17:59:09 +02:00
Oleksii Kriuchykhin
9a8e33c6d7
Small fixes [SCI-1642]
2017-10-11 17:24:31 +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
Luka Murn
fe89b942e7
Add Add-ons page to User -> Settings -> Account
...
Closes SCI-1675.
2017-10-11 14:15:37 +02:00
zmagod
f71ff8589d
changes testing image
2017-10-11 09:51:20 +02:00
okriuchykhin
0d3cb3a129
Merge pull request #814 from okriuchykhin/ok_GIOT_55
...
Remove GIOT sign-in button [GIOT-55]
2017-10-10 17:04:34 +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
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
Oleksii Kriuchykhin
f8334b3d5b
Add editable field to task in tasks tree API call [GIOT-44]
2017-10-09 14:38:33 +02:00
mlorb
1049e0730e
implements @ZmagoD comments
2017-10-09 13:59:32 +02:00
Oleksii Kriuchykhin
bd26052110
Remove GIOT sign-in button [GIOT-55]
2017-10-09 11:56:46 +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
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
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
Zanz2
8720222ac2
Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper)
2017-10-07 22:45:01 +02:00
Zanz2
183c93d21b
Refactoring to git review specifications
2017-10-07 22:13:31 +02:00
Zanz2
9655c98566
Github review refactor
2017-10-07 20:47:05 +02:00
Zanz2
3a8092b663
Refactor and threw out useless comments
2017-10-07 18:05:09 +02:00
Zanz2
d52400f741
Refactored code according to review
2017-10-07 17:58:23 +02:00
Zanz2
2b9563ec6d
Added preview text to en.yml
2017-10-07 17:45:23 +02:00
Zanz2
f5b2ad0d34
Refactor github code review
2017-10-07 16:07:04 +02:00
Zanz2
66e5004e60
Changed import text to be inside en.yml, as said in the code review, deleted some blank lines
2017-10-07 15:56:43 +02:00
lenart
de3c18509f
Variable name changes, added comments to code [fixes SCI-1249]
2017-10-06 17:12:15 +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
Oleksii Kriuchykhin
6820511ea0
Further canvas optimizations [SCI-1642]
2017-10-06 12:43:27 +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
Zanz2
48f03d6dfb
hound blank line fix
2017-10-05 18:41:58 +02:00
Zanz2
fc1cd73e1d
fixed hound blank line
2017-10-05 18:38:44 +02:00
Zanz2
9fd67019e0
Deleted unused file
2017-10-05 18:09:07 +02:00
Zanz2
64b72f4ad4
Fixed a bug, where if the url get query is nil (if you go directly to /protocols, it doesnt get the public type from url, now when it is nil it just defaults to public
2017-10-05 17:31:49 +02:00
Oleksii Kriuchykhin
b26b963e54
Optimize update canvas SQL and remove module group name [SCI-1642]
2017-10-05 16:19:25 +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
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
91e2a6bab2
Merge pull request #787 from mlorb/ml-sci-1561
...
Fix bug with tinyMCE text validaton [SCI-1561]
2017-10-05 08:39:22 +02:00
okriuchykhin
2c5d913048
Merge pull request #804 from okriuchykhin/ok_SCI_1482
...
Improve memory utilization in PDF report generator [SCI-1482]
2017-10-04 17:51:28 +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
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
Oleksii Kriuchykhin
6824f9a8bc
Improve memory utulization in PDF report generator [SCI-1482]
2017-10-02 11:29:22 +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
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
c72cf6320a
Finished rubocop refactoring
2017-09-26 16:19:09 +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
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
4ef7b57f31
fix error handeling
2017-09-22 09:57:41 +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
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
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
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
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
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
zmagod
83647d81b4
adds edit team name modal
2017-09-15 14:00:48 +02:00
Zanz2
d85e02730d
Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc
2017-09-15 12:19:58 +02:00
Zanz2
175aa16a7d
Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this
2017-09-14 15:52:44 +02:00
Zanz2
5d6cc341ed
added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done
2017-09-14 14:42:04 +02:00
zmagod
1a00b53034
adds user_team tests
2017-09-14 13:11:19 +02:00
Toni Dezman
d38f4343f2
Decupling redux part 1
2017-09-14 11:46:49 +02:00
Zanz2
d6d1f9d490
changed second modal preview styling to fit its specifications
2017-09-14 11:46:41 +02:00
Zanz2
29b9d50363
Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer
2017-09-14 11:30:53 +02:00
zmagod
705d07f60e
adds remove team action
2017-09-13 17:11:51 +02:00
Zanz2
9fc91aac32
added protocols io upload preview modal
2017-09-13 16:04:16 +02:00
Zanz2
b7432b336a
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
2017-09-13 15:15:08 +02:00
zmagod
1b3b3dfea9
adds team members update role functionality
2017-09-12 17:30:13 +02:00
Žan Žagar
706031dacb
added model and controler, model should go to services while the controller should go to protocols controller
2017-09-12 15:25:22 +02:00
Žan Žagar
2a7a2b8fa1
Changed some minor button text and fixed a local error
2017-09-12 09:26:22 +02:00
Žan Žagar
62350d0d42
Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later
2017-09-11 16:03:33 +02:00
Žan Žagar
9b640c5df8
Dropdown menu works, need to add backend code for the second button
2017-09-11 15:28:48 +02:00
Žan Žagar
0f4dadefa9
prvi (star gumb) v dropdownu sedaj deluje
2017-09-11 15:23:09 +02:00
Žan Žagar
f668f60237
dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni
2017-09-11 15:22:22 +02:00
Žan Žagar
31e8c107fd
dodav na pravi branch te file
2017-09-11 14:35:00 +02:00
Toni Dezman
1cd9cd92fc
adds global spinner
2017-09-11 14:30:49 +02:00
Jure Grabnar
b4a13dffe3
init commit, dodav na protocols index gumb z dropdown
2017-09-11 13:07:22 +02:00
Mojca Lorber
a0f7030a70
fix bug with tinyMCE text validaton
2017-09-07 14:54:12 +02:00
Toni Dezman
67d617deb5
adds hound_bot's and zmagos suggestions
2017-09-07 13:40:53 +02:00
Mojca Lorber
0e14420193
fix bugs with importing samples
2017-09-06 14:41:14 +02:00
Toni Dezman
185039bc99
adds suggestions from code review
2017-09-04 15:00:26 +02:00
zmagod
9c01ab414c
refactor leave team
2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin
fc0e2d2172
Add validation for uid uniqness [GIOT-29]
2017-09-01 17:00:13 +02:00
Oleksii Kriuchykhin
a927c2832d
Improve error logging [GIOT-31]
2017-09-01 16:36:45 +02:00
zmagod
91d2d8a935
adds team details view
2017-08-31 15:56:55 +02:00
Toni Dezman
4034400c42
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-31 11:42:15 +02:00
Toni Dezman
8b61fe563c
user preferences APIs
2017-08-31 11:23:44 +02:00
zmagod
1325732b0c
adds specs for team controller actions
2017-08-30 16:18:21 +02:00
Toni Dezman
2e6a942152
api for timezone
2017-08-30 14:59:17 +02:00
Oleksii Kriuchykhin
c3fceb90df
Backport API to Rails-4 [SCI-1579]
2017-08-30 13:30:41 +02:00
zmagod
ee054f91b8
adds bullet gem [fixes SCI-1578]
2017-08-30 09:29:45 +02:00
Toni Dezman
c82dfa502a
adds errors in client_api for users_controller
2017-08-29 13:14:52 +02:00
zmagod
ec86691659
fixed tests
2017-08-29 12:04:00 +02:00
zmagod
c54dd9473e
adds controller spec for leave team [fixes SCI-1497]
2017-08-29 11:56:46 +02:00
zmagod
478bd491ff
added pagination and sorting to team tables
2017-08-28 17:05:09 +02:00
zmagod
5ea464b675
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497
2017-08-28 09:36:29 +02:00
zmagod
0cc00f292a
adds leave button to modal
2017-08-28 09:36:21 +02:00
Toni Dezman
ea9a195f09
email and password action/redusers work
2017-08-26 14:07:31 +02:00
Toni Dezman
eb0641d76a
InputEnabled submits form with ENTER
2017-08-26 13:04:36 +02:00
zmagod
7b5b4c957c
adds formated messages in modal
2017-08-25 16:40:23 +02:00
zmagod
db16da7bd6
adds custom query to fetch teams data
2017-08-25 16:07:37 +02:00
Toni Dezman
ccd14f6b50
adds apis for full_name and initials input fields
2017-08-25 14:45:02 +02:00
Toni Dezman
989be6563f
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-25 09:06:38 +02:00
zmagod
34be62a648
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3
2017-08-25 08:58:20 +02:00
zmagod
782daabce1
first run
2017-08-25 08:54:32 +02:00
Toni Dezman
e4a704d063
namespaces client_api/users/user_controller.rb
2017-08-25 08:21:52 +02:00
Toni Dezman
4ea4c30e29
extracts route magic strings to routes constants
2017-08-25 08:20:40 +02:00
Toni Dezman
3c6f66ebd3
Merge branch 'decoupling-settings-page' into td_SCI_1494_v2
2017-08-24 10:23:30 +02:00
Toni Dezman
8a7154fa47
changes disabled switches code
2017-08-24 09:37:06 +02:00
Toni Dezman
de5136f9cb
fixes navigation container
2017-08-24 09:22:37 +02:00
Toni Dezman
309e52b806
extracts navigation to <MainNav /> component
2017-08-24 08:56:17 +02:00
Toni Dezman
12db6e790f
removes styles from time-zone and changes clicking on switches
2017-08-24 08:35:55 +02:00
Toni Dezman
b02117ea67
implements code review suggestions
2017-08-23 11:20:10 +02:00
Luka Murn
39bb8ecdab
Fix code
2017-08-23 10:54:54 +02:00
Toni Dezman
1dfd7a0cee
adds i18n and 404 page
2017-08-22 15:54:47 +02:00
zmagod
94403a545c
add labels to navigation items [fixes SCI-1493]
2017-08-22 14:00:28 +02:00
zmagod
3a2a1205e3
style global activities
2017-08-22 13:20:06 +02:00
Toni Dezman
42d5e67581
moves components to nicer folder structure
2017-08-22 12:56:29 +02:00
Toni Dezman
bda9704e10
changess to settings/app.jsx
2017-08-22 10:11:47 +02:00
Toni Dezman
d1583a86f5
adds SettingsProfile
2017-08-22 10:08:16 +02:00
Toni Dezman
b29df328d9
some additional styles
2017-08-22 09:49:23 +02:00
Toni Dezman
dc746cbf6f
a lot of styles for Settings page
2017-08-22 09:49:02 +02:00
Toni Dezman
5352791d46
styles to icons in Notifications
2017-08-22 09:47:36 +02:00
Toni Dezman
3c20ef5fea
fixes TimeZone dropdown position: relative issue
2017-08-22 09:47:20 +02:00
Toni Dezman
3e6d45e82f
adds Notification Switches
2017-08-22 09:46:59 +02:00
Toni Dezman
dd5c329ef1
makes redux work with Notifications
2017-08-22 09:46:44 +02:00
Toni Dezman
522262f9fe
adds timezone
2017-08-22 09:46:29 +02:00
Toni Dezman
52b1603b92
adds MyStatistics logic
2017-08-22 09:44:51 +02:00
Toni Dezman
086be89a5d
logic for MyProfile component is finished
2017-08-22 09:43:45 +02:00
Toni Dezman
a3d126b073
adds Redux and few fields
2017-08-22 09:41:47 +02:00
Toni Dezman
0de080485e
adds avatar and editable inputs
2017-08-22 09:39:50 +02:00
Luka Murn
b70b609109
Update styling of data grid a bit
2017-08-21 17:55:45 +02:00
Luka Murn
f4f0cd234f
Add support for sorting to both tables
2017-08-21 15:37:49 +02:00
Luka Murn
abcd74e681
Initial commit, including react-bootstrap-table and react-data-grid
2017-08-21 15:37:49 +02:00
zmagod
685cb42aac
fixes repository, protocols link, adds csfr token to request headers
2017-08-21 15:30:54 +02:00
zmagod
1f45123d51
removes unneeded comments
2017-08-21 13:34:39 +02:00
zmagod
c5e32c4ea0
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch
2017-08-21 09:52:14 +02:00
Luka Murn
ec7b7ffe08
You are my sunshine, my only sunshine,
...
You make me happy when skies are grey
You never know, Hound, how much I love you
Please don't take my Hound away
2017-08-10 14:42:58 +02:00
Luka Murn
9227ea5854
Finish the user settings jsonb, also fix references throughout app
...
Closes SCI-1475.
2017-08-10 14:29:01 +02:00
Luka Murn
c62002381b
Add default settings migration and concern
2017-08-10 11:30:57 +02:00
Zmago Devetak
1d9d473caf
Merge pull request #768 from ZmagoD/zd_SCI_1493_v2
...
Copy sciNote header functionality into Settings React.js part 2
2017-08-09 16:16:25 +02:00
zmagod
b90348eabf
adds numeric.js to constants
2017-08-09 16:01:03 +02:00
zmagod
790ae9d685
moved files to app/ folder
2017-08-09 15:21:02 +02:00
zmagod
7630f6af3d
styled notifications dorpdown
2017-08-09 14:49:29 +02:00
zmagod
007f50a158
adds main stylesheet for global styles
2017-08-09 12:46:04 +02:00
zmagod
bd352869a3
adds user account dropdown
2017-08-09 09:08:13 +02:00
zmagod
226458a3f0
adds recent notifications
2017-08-08 15:44:28 +02:00
Zmago Devetak
4be39a8580
Merge pull request #762 from ZmagoD/zd_SCI_1493
...
Copy navbar to React
2017-08-07 14:07:55 +02:00
Luka Murn
85634b2fb6
Add 'off' before setting export button to 'on'
2017-08-07 14:04:39 +02:00
zmagod
be42cd2204
refactor
2017-08-07 13:51:22 +02:00
Luka Murn
13eae287bb
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
2017-08-07 11:54:45 +02:00
Luka Murn
c6448264d0
Revert "Td sci 1492"
2017-08-07 11:47:21 +02:00
zmagod
be29db2f78
changed folder name
2017-08-07 11:13:09 +02:00
zmagod
0a7c6300b0
fixes eslint
2017-08-07 09:31:24 +02:00
Luka Murn
ae5bccf709
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin
35b643f34e
Fix typo in config and code style improvements [SCI-1507]
2017-08-04 10:19:56 +02:00
Oleksii Kriuchykhin
e958410261
Add core API using JWT authentication and tests for it [SCI-1507]
2017-08-03 17:00:14 +02:00
zmagod
c314bae28d
add team switch js/controller
2017-08-03 16:03:15 +02:00
zmagod
2e83322f76
fixes global activities
2017-08-03 11:17:09 +02:00
zmagod
6ef19725f1
adds redux
2017-08-02 17:27:05 +02:00
Matej Zrimšek
d90ca1b934
Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481]
2017-08-02 16:49:53 +02:00
lenart
6c5bc32f24
Revert incorrect changes from previous commit [SCI-1249]
2017-08-02 16:00:23 +02:00
lenart
e781dfc6a6
Truncate activity taking smart annotations into account fixes [SCI-1249]
2017-08-02 15:51:32 +02:00
zmagod
caae1e2fe8
adds intl, router, bootstrap to npm modules
2017-07-31 10:42:40 +02:00
Toni Dezman
9a1cf53046
Merge pull request #758 from programmertoni/td_SCI_1492
...
Td sci 1492
2017-07-29 05:44:47 +02:00
Toni Dezman
f76512f364
adds hound recomendations for react/settings_controller.rb
2017-07-28 12:53:15 +02:00
Matej Zrimšek
07fea16d26
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
2017-07-28 12:01:11 +02:00
Toni Dezman
ffda8b259b
adds Redux and changes to index.jsx page
2017-07-28 10:52:25 +02:00
zmagod
b69ec22dfe
fixes failing tests [fixes SCI-1470]
2017-07-28 10:14:50 +02:00
Toni Dezman
1673d43993
adds react/settings controller and react/layout
2017-07-27 15:26:03 +02:00
Toni Dezman
d781ff9b2d
removes unnecessary code from packs/settings/index.jsx
2017-07-27 14:22:28 +02:00
Toni Dezman
0f4286d5d1
adds Settings index react page
2017-07-27 14:21:27 +02:00
zmagod
416ab8eee3
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400
2017-07-26 16:20:09 +02:00
okriuchykhin
af4b310754
Add ordering for column mappings in repositories
2017-07-26 13:35:54 +02:00
Oleksii Kriuchykhin
6a43483a2f
Fix adding and editing repository items [SCI-1519]
2017-07-26 11:22:26 +02:00
okriuchykhin
38f254ae9b
Merge pull request #749 from ZmagoD/zd_SCI_1487
...
don't hide modal [fixes SCI-1487]
2017-07-25 14:35:10 +02:00
zmagod
dfc8ea7fbf
don't hide modal [fixes SCI-1487]
2017-07-25 14:33:41 +02:00
okriuchykhin
532153b9cb
Merge pull request #747 from okriuchykhin/ok_SCI_101
...
Improve samples import speed [SCI-101]
2017-07-25 14:10:45 +02:00
Oleksii Kriuchykhin
efd03db6db
Further samples import improvement [SCI-101]
2017-07-25 10:56:07 +02:00
Matej Zrimšek
ad0dce921b
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
2017-07-24 18:12:41 +02:00
Oleksii Kriuchykhin
67b0c78593
Improve samples import speed [SCI-101]
2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin
6d56e6b72e
Remove redundant self [SCI-1487]
2017-07-20 11:51:42 +02:00
Oleksii Kriuchykhin
6c33b46f6a
Improve import of repository records plus tsv file import fixes [SCI-1487]
2017-07-20 11:44:10 +02:00
Zmago Devetak
7b898666da
Merge pull request #745 from ZmagoD/zd_SCI_1485
...
refactor repositories js files [fixes SCI-1485]
2017-07-19 11:17:52 +02:00
Oleksii Kriuchykhin
ece27b2652
Fix importing files with empty header cells and error messages improvements [SCI-1484]
2017-07-18 14:54:35 +02:00
zmagod
a2b7bcda4c
refactor repositories js files [fixes SCI-1485]
2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin
036ee390ed
Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]
2017-07-14 16:19:03 +02:00
Zmago Devetak
77893e6bcb
Merge pull request #743 from ZmagoD/zd_SCI_1483
...
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 12:01:42 +02:00
zmagod
506e47a595
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 09:45:36 +02:00
Oleksii Kriuchykhin
ba35717243
Fix babel and eslint config [SCI-1461]
2017-07-13 14:11:01 +02:00
Mojca Lorber
739f8b5b4e
remove redundant rollback call
2017-07-13 13:49:26 +02:00
Mojca Lorber
ec76873e95
fix sorting by assigned causes ajax error
2017-07-13 11:41:19 +02:00
Oleksii Kriuchykhin
b8e93ee883
Add Webpacker and React [SCI-1461]
2017-07-12 16:41:55 +02:00
Zmago Devetak
69919359f1
Merge pull request #738 from ZmagoD/zd_SCI_1452
...
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-12 14:50:29 +02:00
Nbernot
2a3e830a3c
Merge pull request #732 from biosistemika/business_users
...
Business users [SCI-1428, SCI-1447]
2017-07-11 13:34:56 +02:00
Nbernot
d746ae2549
Removes parentheses around if conditions
2017-07-11 13:33:47 +02:00
Luka Murn
73a4cd1e4f
Merge pull request #737 from Ducz0r/lm-sci-1450
...
Add versioning modal & support to sciNote [SCI-1450]
2017-07-11 09:47:51 +02:00
zmagod
baaec67399
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-10 16:22:32 +02:00
Oleksii Kriuchykhin
a6b80589f2
Fix default order of the columns in repositories [SCI-1445]
2017-07-10 15:32:18 +02:00
Luka Murn
3e80f761b8
Add "about" modal, prepare hooks, VERSION system for addons
...
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
2017-07-10 15:27:50 +02:00
Luka Murn
16e672b9d8
Add VERSION file where the sciNote Core version is stored
2017-07-10 09:26:35 +02:00
lenart
58e2575c75
Truncate checklist items in activity modal [fixes SCI-1249]
2017-07-07 15:56:16 +02:00
Luka Murn
9f60ece25f
Merge branch 'master' into rails-5.1
...
Conflicts:
app/models/repository.rb
app/models/repository_row.rb
app/views/projects/index.html.erb
app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
zmagod
750c82a80f
setup testing tools [fixes SCI-1400]
2017-07-06 09:07:05 +02:00
Nejc Bernot
d917cf3340
Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST
2017-07-05 11:52:36 +02:00
Nejc Bernot
803934e07d
Changes the host for the download and redirect paths
2017-07-05 10:23:10 +02:00
Nejc Bernot
91fe7fe4ad
Changes the completely NOT ruby code
2017-07-04 17:13:59 +02:00
Luka Murn
e3b9c1c644
Woops, almost forgot on this one
2017-07-04 15:00:14 +02:00
Luka Murn
8d68769d09
Hound is Love, Hound is Life
2017-07-04 14:47:58 +02:00
Luka Murn
91cddce8a6
Fixes DEPRECATION WARNING-s for Rails 5.1.2
...
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).
Closes SCI-1427.
2017-07-04 14:35:51 +02:00
Nejc Bernot
bd9904adb3
Adds support for business servers
...
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
2017-07-04 14:27:43 +02:00
Zmago Devetak
53a1dd14b7
Merge pull request #718 from ZmagoD/zd_SCI_1129_v3
...
Fixes error message [fixes SCI-1129]
2017-07-04 11:16:36 +02:00
Zmago Devetak
5f4006fe4a
Merge pull request #723 from ZmagoD/zd_SCI_1408
...
Fixes bugs on canvas [fixes SCI-1408]
2017-07-04 11:16:04 +02:00
okriuchykhin
75c887ce7d
Merge pull request #721 from okriuchykhin/ok_SCI_1412
...
Fix activities [SCI-1412]
2017-07-04 10:59:08 +02:00
okriuchykhin
2e24e6b73a
Merge pull request #725 from okriuchykhin/ok_SCI_1409
...
Fix datatables [SCI-1409]
2017-07-03 15:47:19 +02:00
mlorb
1b2884c1b7
Merge pull request #722 from mlorb/ml-sci-1396
...
Fix bugs on projects page [SCI-1396]
2017-07-03 15:37:16 +02:00
Oleksii Kriuchykhin
b234c07c13
Fix datatables [SCI-1409]
2017-07-03 15:33:50 +02:00
zmagod
311270ff49
refactor
2017-07-03 15:32:02 +02:00
Zmago Devetak
76ab8d0d3c
Merge pull request #728 from ZmagoD/testing-addons
...
Testing addons
2017-07-03 15:11:33 +02:00
okriuchykhin
4740564a40
Merge pull request #727 from okriuchykhin/ok_SCI_1445
...
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:55:24 +02:00
Oleksii Kriuchykhin
4c6690e59b
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:53:15 +02:00
lenart
74e723d5d5
Changed data hook name and form id [SCI-1430]
2017-07-03 11:28:35 +02:00
Oleksii Kriuchykhin
5c39b90b2d
Fix activities button misbehaviour with turbolinks [SCI-1412]
2017-06-30 16:33:52 +02:00
zmagod
bc33883c3c
first run fixing addons
2017-06-30 10:23:28 +02:00
lenart
8ec458db91
Added data hook and form id for GA tracking [SCI-1430]
2017-06-30 10:06:54 +02:00
Mojca Lorber
a3514bdaf0
fix restore action from archives pages
2017-06-29 16:14:25 +02:00
Mojca Lorber
4fb07e1e4f
fix edit comments
2017-06-29 13:33:59 +02:00
Mojca Lorber
2ab74c8979
add user variable
2017-06-29 12:56:14 +02:00
zmagod
68cfac4a38
adds images into assets folder
2017-06-29 11:04:31 +02:00
zmagod
fd13921720
fixes repeat tutorial [fixes SCI-1410]
2017-06-29 11:00:50 +02:00
zmagod
bef5a085c4
Fixes bugs on canvas [fixes SCI-1408]
2017-06-29 10:29:41 +02:00
okriuchykhin
f56e972ce6
Merge pull request #720 from okriuchykhin/ok_SCI_1411
...
Fix global search [SCI-1411]
2017-06-29 09:55:56 +02:00
Mojca Lorber
21b4ba7627
fix bugs on projects page
2017-06-28 17:15:09 +02:00
Oleksii Kriuchykhin
e474cda03a
Fix activities [SCI-1412]
2017-06-28 16:49:50 +02:00
Oleksii Kriuchykhin
21cce4baa0
Fix global search [SCI-1411]
2017-06-28 15:44:18 +02:00
Zmago Devetak
502eb5c211
fixes tabs
2017-06-28 15:40:15 +02:00
zmagod
d8a3fdea20
fixes hound
2017-06-28 15:29:10 +02:00
zmagod
525c9770ac
fixes experiment page [fixes SCI-1395]
2017-06-28 15:21:32 +02:00
zmagod
a9f38962bc
Fixes error message [fixes SCI-1129]
2017-06-28 11:17:50 +02:00
Matej Zrimšek
4dbf5b0f53
Fixed sample types page load error, when viewing them on a task level. [SCI-1419]
2017-06-27 16:28:25 +02:00
zmagod
71aa05bb0e
refactor
2017-06-27 14:58:49 +02:00
mlorb
025050a7cd
Merge pull request #716 from mlorb/ml-sci-1420
...
Add tooltips to navigation bar [SCI-1420]
2017-06-27 14:52:07 +02:00
Mojca Lorber
d03be76f35
add tooltips to archive buttons
2017-06-27 14:48:45 +02:00
Mojca Lorber
0160956377
put all titles on links
2017-06-27 14:21:06 +02:00
Mojca Lorber
6bfb5e125c
add tooltips to navigation bar
2017-06-27 13:46:49 +02:00
okriuchykhin
d126391940
Merge pull request #710 from okriuchykhin/ok_SCI_1356
...
Add global search in custom repositories [SCI-1356]
2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin
69231060b0
Fix checking of my_modules presence [SCI-1356]
2017-06-27 13:39:08 +02:00
Zmago Devetak
6c541602e7
Merge pull request #715 from ZmagoD/zd_SCI_1328_v2
...
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 13:34:29 +02:00
Oleksii Kriuchykhin
4060ba2ac3
Code style fixes [SCI-1356]
2017-06-27 13:23:51 +02:00
mz3944
ca59ac5e36
Merge pull request #714 from mz3944/mz-SCI-1402
...
Missing error message when not selecting name in case of import repository file [SCI-1402]
2017-06-27 11:54:26 +02:00
zmagod
7b9410f02f
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 11:26:32 +02:00
okriuchykhin
ee2cc006af
Merge pull request #712 from okriuchykhin/ok_SCI_1404
...
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-27 09:22:43 +02:00
okriuchykhin
8ae479b370
Merge pull request #713 from okriuchykhin/ok_SCI_1399
...
Remove spinner after samples import error [SCI-1399]
2017-06-27 09:22:21 +02:00
Oleksii Kriuchykhin
938896981d
Remove spinner after samples import error [SCI-1399]
2017-06-26 16:51:58 +02:00
Matej Zrimšek
f847b44067
Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]
2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
84556cf744
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin
f2f57de264
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin
fc72453a5b
Fix hound warning [SCI-1356]
2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +02:00
zmagod
819f47b450
setup sciNote for Rails 5.1
2017-06-23 15:19:08 +02:00
zmagod
75507107fd
migrate to 4.2.9
2017-06-23 08:50:12 +02:00
Zmago Devetak
f9e04e80b4
Merge pull request #705 from ZmagoD/zd_SCI_1393
...
removes imported repository row if the row value is not valid [fixes …
2017-06-22 17:50:02 +02:00
Zmago Devetak
cffac82e88
Merge pull request #704 from ZmagoD/zd_SCI_1392
...
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 17:47:15 +02:00
Zmago Devetak
514c6c0d53
Merge pull request #706 from ZmagoD/zd_SCI_1385
...
fixes row dupplication [fixes SCI-1385]
2017-06-22 17:47:00 +02:00
zmagod
7367435c6d
refactor
2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19
fix update repository_row
2017-06-22 17:29:17 +02:00
zmagod
590135b9b3
refactor
2017-06-22 17:26:11 +02:00
zmagod
1690d8ebe3
removed reload on hide modal
2017-06-22 16:47:50 +02:00
zmagod
2b2f513366
fixes export pdf error on production
2017-06-22 16:40:50 +02:00
zmagod
e7328c2e20
fixes row dupplication [fixes SCI-1385]
2017-06-22 16:01:37 +02:00
zmagod
703be13fb0
removes imported repository row if the row value is not valid [fixes SCI-1393]
2017-06-22 15:21:36 +02:00
zmagod
a2e1aa5b36
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 14:43:01 +02:00
Mojca Lorber
1ba32e19cb
allign no. of pages and showing entries per page
2017-06-22 14:23:03 +02:00
zmagod
28129ebb73
refactor
2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
18fd5b00ba
fix hound
2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
mz3944
568e41f5fa
Merge pull request #701 from mz3944/mz-SCI-1383
...
Removed empty first column of repository export file [SCI-1383]
2017-06-21 10:57:46 +02:00
Matej Zrimšek
d907819de5
Removed byebug calls. [SCI-1383]
2017-06-21 10:49:00 +02:00
mz3944
d19bfc8fd8
Merge pull request #700 from mz3944/mz-SCI-1386
...
Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]
2017-06-21 10:40:37 +02:00
mz3944
2ad27289c9
Merge pull request #699 from mz3944/mz-SCI-1378
...
Change repository icon on reports [SCI-1378]
2017-06-21 10:40:16 +02:00
mz3944
4d5136270a
Merge pull request #698 from mz3944/mz-SCI-1384
...
Fixed AJAX error when deleting custom columns in repository table [SCI-1384]
2017-06-21 10:39:53 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c
Removed empty first column of repository export file. [SCI-1383]
2017-06-20 18:40:41 +02:00
Matej Zrimšek
ce97d18e78
Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386]
2017-06-20 17:51:51 +02:00
Matej Zrimšek
d49524a26f
Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]
2017-06-20 16:10:50 +02:00
Oleksii Kriuchykhin
115ce91d8d
Handle column mappings in task repository [SCI-1381]
2017-06-20 15:58:52 +02:00
Matej Zrimšek
6c7987681c
Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]
2017-06-20 14:52:41 +02:00
Oleksii Kriuchykhin
9a9f8b9c41
Fix total number of records in task repository [SCI-1381]
2017-06-19 16:45:57 +02:00
mlorb
14429a270c
Merge pull request #689 from mlorb/ml_sci_1354
...
Truncate and display text in tooltip in custom repository fields [SCI-1354]
2017-06-19 15:50:38 +02:00
Mojca Lorber
730c4738d5
fix tooltip in edit mode
2017-06-19 15:49:31 +02:00
Mojca Lorber
39dd6daabb
small fixes
2017-06-19 15:30:38 +02:00
mlorb
122ac7971f
Merge pull request #692 from mlorb/ml_sci_1348
...
Fix cog position on repositories page [SCI-1348]
2017-06-19 15:16:01 +02:00
mlorb
9a7669bf2a
remove empty line
2017-06-19 15:15:27 +02:00
mlorb
ff02c45f5f
Merge pull request #695 from mlorb/ml_sci_1353
...
Retain the same word case in repositories dropdown [SCI-1353]
2017-06-19 14:48:58 +02:00
mlorb
733f6267db
Merge pull request #696 from mlorb/ml_sci_1380
...
Fix ordering of repositories on task [SCI-1380]
2017-06-19 14:28:00 +02:00
mlorb
7cbc8a2f95
Merge pull request #694 from mlorb/ml_sci_1347
...
Fix flash when deleting samples of other users [SCI-1347]
2017-06-19 14:19:57 +02:00
mlorb
beaba6a92b
Merge pull request #693 from mlorb/ml_sci_1351_v3
...
Fix error msg when editing empty cell in repositories [SCI-1351]
2017-06-19 14:19:27 +02:00
zmagod
70fa681519
split the import service
2017-06-19 14:05:37 +02:00
Mojca Lorber
4c3036af87
fix ordering of repositoris on task
2017-06-19 10:53:18 +02:00
Mojca Lorber
f77b1aa4e8
retain the same word case in repositories dropdown
2017-06-19 10:32:12 +02:00
Mojca Lorber
9b941fe374
fix flash when deleting samples of other users
2017-06-16 17:12:04 +02:00
mz3944
e027a871e9
Merge pull request #691 from mz3944/mz-SCI-1357-v2
...
Repository management - filter on custom columns [SCI-1357]
2017-06-16 16:04:47 +02:00
Matej Zrimšek
6b284d8c89
Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357]
2017-06-16 16:02:31 +02:00
mlorb
49ce08f1f5
Merge pull request #688 from mlorb/ml_sci_1375
...
Fix no repository name in activity bug [SCI-1375]
2017-06-16 15:13:42 +02:00
Mojca Lorber
1b683bc70e
fix error msg when editing empty cell in repositories
2017-06-16 15:09:04 +02:00
Matej Zrimšek
1f0eeeaecb
Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357]
2017-06-16 14:31:31 +02:00
okriuchykhin
05ea00a5d3
Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2
...
Fix bug when reordering column to the first position in repositories [SCI-1346]
2017-06-16 14:29:08 +02:00
Mojca Lorber
b6f146f177
fix cog position on repositories page
2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin
94d74b8101
Make assigned column always visible in repositories [SCI-1346]
2017-06-16 11:47:41 +02:00
Mojca Lorber
a195c9a5af
truncate and display text in tooltip in custom repository fields
2017-06-15 15:08:33 +02:00
Luka Murn
3df034ff21
Merge pull request #687 from mz3944/mz-SCI-1357
...
Repository management - filter on custom columns [SCI-1357]
2017-06-15 13:30:42 +02:00
Mojca Lorber
ea455d3596
fix no repository name in activity bug
2017-06-15 09:43:10 +02:00
Matej Zrimšek
bae1e298d7
Fixed repositories search to only search the current repository. [SCI-1357]
2017-06-14 19:49:08 +02:00
Matej Zrimšek
092e82c722
Date search fix for repositories. [SCI-1357]
2017-06-14 19:36:15 +02:00
Matej Zrimšek
e38947b1f8
Minor repository search refactoring. [SCI-1357]
2017-06-14 19:28:53 +02:00
Matej Zrimšek
be4a8d494a
Search functionality added to custom columns of custom repositories. [SCI-1357]
2017-06-14 19:28:12 +02:00
mlorb
6e203d2f15
Merge pull request #685 from mlorb/ml_sci_1373
...
Fix bug with audit trail - ajax error [SCI-1373]
2017-06-14 17:59:34 +02:00
Zmago Devetak
ab24414bfe
Merge pull request #686 from ZmagoD/zd_SCI_1371
...
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:59:24 +02:00
zmagod
5d6fba7153
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:35:41 +02:00
okriuchykhin
374270bb10
Merge pull request #684 from okriuchykhin/ok_SCI_1349
...
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 15:15:03 +02:00
Mojca Lorber
107aa76e55
fix bug with audit trail - ajax error
2017-06-14 14:48:22 +02:00
Oleksii Kriuchykhin
13fdbf8850
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 14:29:59 +02:00
Mojca Lorber
e6ec184dba
fix multiple errors handling on fields in repositories tables
2017-06-14 13:09:23 +02:00
zmagod
2d3b5f4308
refactor
2017-06-14 10:55:24 +02:00
okriuchykhin
da87a41c86
Merge pull request #680 from okriuchykhin/ok_SCI_1365
...
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-14 10:19:09 +02:00
zmagod
6dd85d6c39
fixes drag'n drop bug in results on safari [fixes SCI-1370]
2017-06-14 09:45:49 +02:00
zmagod
cee052fc19
added service object
2017-06-14 09:11:20 +02:00
Matej Zrimšek
cea6d15d3e
Fixed Hound warning. [SCI-1351]
2017-06-13 18:15:47 +02:00
Matej Zrimšek
1bc46fe0cb
Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351]
2017-06-13 18:12:42 +02:00
Mojca Lorber
849b269d87
fix errors in repo table
2017-06-13 16:56:34 +02:00
Oleksii Kriuchykhin
2e98433abc
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-13 16:56:28 +02:00
okriuchykhin
97a94ff4a3
Merge pull request #679 from okriuchykhin/ok_SCI_1345
...
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 15:47:44 +02:00
mlorb
074a47aae1
Merge pull request #675 from mlorb/ml_sci_1272
...
Fix permissions [SCI-1272]
2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin
2d693a3fb7
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 10:33:08 +02:00
Luka Murn
2e2f07bf58
Merge pull request #668 from Ducz0r/lm-sci-1335
...
Fix sidebar for repositories [SCI-1335]
2017-06-13 09:37:33 +02:00
Zmago Devetak
f3f1a68070
Merge pull request #667 from ZmagoD/zd_SCI_1338
...
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-13 09:33:04 +02:00
Zmago Devetak
19adddbfdb
Merge pull request #666 from ZmagoD/zd_SCI_1337
...
truncate long repository names [fixes SCI-1337]
2017-06-13 09:32:43 +02:00
Zmago Devetak
21577cd0e9
Merge pull request #664 from ZmagoD/zd_SCI_1315
...
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-13 09:32:26 +02:00
Oleksii Kriuchykhin
4b0d7acabe
Fix search when viewing only assigned repository records [SCI-1342]
2017-06-13 09:11:27 +02:00
Luka Murn
c3d289291f
Fix case statement
...
Closes SCI-1335.
2017-06-13 09:09:07 +02:00
okriuchykhin
d88de4009a
Merge pull request #674 from okriuchykhin/ok_SCI_1346
...
Fix reordering columns to the first position [SCI-1346]
2017-06-13 09:01:10 +02:00
okriuchykhin
56c3b891a5
Merge pull request #673 from okriuchykhin/ok_SCI_1350
...
Fix row selection info after record deletion [SCI-1350]
2017-06-13 09:00:48 +02:00
okriuchykhin
05c77e7298
Merge pull request #672 from okriuchykhin/ok_SCI_1341
...
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-13 09:00:33 +02:00
mlorb
d0d7dc7468
Merge pull request #677 from mlorb/ml_sci_1344
...
Change custom repositories icon [SCI-1344]
2017-06-13 08:57:22 +02:00
Zmago Devetak
6cdf37041f
Merge pull request #663 from ZmagoD/zd_SCI_1328
...
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-13 08:57:09 +02:00
Luka Murn
28f78a0c6c
Merge pull request #670 from Ducz0r/lm-sci-1340
...
Fix assigned repository rows in task display [SCI-1340]
2017-06-13 08:55:55 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
Mojca Lorber
faa6456e28
change custom repositories icon
2017-06-12 18:00:28 +02:00
Matej Zrimšek
e3db79b3cc
Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275]
2017-06-12 17:49:42 +02:00
Mojca Lorber
9108102b42
fix permissions
2017-06-12 17:34:36 +02:00
Oleksii Kriuchykhin
248fd7be06
Fix reordering columns to the first position [SCI-1346]
2017-06-12 17:16:49 +02:00
Oleksii Kriuchykhin
c081cda5f3
Fix row selection info after record deletion [SCI-1350]
2017-06-12 10:23:18 +02:00
Oleksii Kriuchykhin
aa42ca6b8b
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-12 10:07:16 +02:00
Matej Zrimšek
4ea8972a6c
Fixed rebasing mistake. [SCI-1275]
2017-06-09 19:48:20 +02:00
Matej Zrimšek
514aa6214b
Repository records minor JS refactoring. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
29b721365a
Moved export form to proper place in the code. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
f46d8f6970
Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
773a55ffac
Fixed CSV export of repository records. [SCI-1275]
2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3
Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository
2017-06-09 19:44:28 +02:00