mlorb
47784e09a8
Merge pull request #867 from mlorb/ml-sci-1434
...
Add explanation when copying custom repositories [SCI-1434]
2017-11-15 11:34:02 +01:00
Zanz2
c3f6c2b34a
Found a bug where i forot to include protocol description in preview modal and fixed it
2017-11-14 19:46:51 +01:00
Zanz2
bc00c4a28b
Merge pull request #874 from Zanz2/supported_file_1794
...
Made button green and added .json to supported file [SCI-1794]
2017-11-14 19:12:45 +01:00
Zanz2
6b9a10ffe4
Made validations for JSON format and .txt and .json files
2017-11-14 12:02:17 +01:00
Zanz2
7ec8d7c2b2
Made button green and added .json to supported file
2017-11-14 11:46:19 +01:00
Mojca Lorber
be74338d9f
add explanation when copying custom repositories
2017-11-13 16:30:42 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import
...
Protocols io import
2017-11-13 11:53:28 +01:00
Zanz2
b265beb386
Merge pull request #864 from Zanz2/move_desc
...
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
2017-11-13 10:07:01 +01:00
Zanz2
fa2c0fe556
merging
2017-11-09 18:55:17 +01:00
Zanz2
812fa3f1d5
Hopefully this will resolve my merge problems
2017-11-09 17:42:17 +01:00
zmagod
327e27e123
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576
2017-11-09 15:55:10 +01:00
Zanz2
a40a63ae50
Made code more aesthetic
2017-11-09 15:38:06 +01:00
Zanz2
518eb09110
Deleted un needed error flash
2017-11-09 10:49:44 +01:00
Zanz2
4b837dbe9d
Forgot flash fail messagges, now added them for file too big and general error
2017-11-09 10:49:44 +01:00
Zanz2
feb686b4ac
Fixed alignement
2017-11-09 10:49:44 +01:00
Zanz2
8b247770ef
Added the success flash alert
2017-11-09 10:49:44 +01:00
Zanz2
9086cd8b6b
Jira branch code
2017-11-09 10:49:44 +01:00
zmagod
33ebe1f748
integration tests for forgot_password [fixes SCI-1576]
2017-11-08 16:23:52 +01:00
zmagod
b036452d8c
adds background worker to cucumber tests
2017-11-08 11:59:01 +01:00
zmagod
54e360bb52
fixes team switch
2017-11-06 15:14:17 +01:00
mlorb
126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
...
Scinote protocols IO base branch
2017-11-06 14:53:01 +01:00
Zanz2
aa03a889c7
Fixed PR review
2017-11-03 16:28:15 +01:00
zmagod
5bc38414d1
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
2017-11-03 09:56:44 +01:00
Zanz2
096ee00e07
removed unnecessary html
2017-11-03 01:28:20 +01:00
Zanz2
6a4c38bbee
Fixed table elements render bugs, now renders after shown event
2017-11-03 01:04:50 +01:00
zmagod
e17f945d8a
fix typos
2017-11-02 16:41:29 +01:00
zmagod
5538805faa
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1669
2017-11-02 14:39:07 +01:00
Zanz2
6fc1afe4c1
Trying to fix this messy table preview
2017-10-30 01:57:42 +01:00
Zanz2
de9a3a1d0d
Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly
2017-10-28 23:57:29 +02:00
Zanz2
a167db11da
Scinote table elements code
2017-10-28 20:20:19 +02:00
Zanz2
c291caaae3
Debbuging preive hot tables
2017-10-28 16:59:36 +02:00
Zanz2
2413dc251a
Added new preview tables code
2017-10-28 02:19:22 +02:00
okriuchykhin
2e0bf91467
Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
2017-10-27 11:14:39 +02:00
Zanz2
a732c8afa7
Code for protocol repository scinote table elements view
2017-10-26 17:28:27 +02:00
zmagod
3d22a5404d
add scenic gem, teams datatables sql view
2017-10-26 16:59:00 +02:00
Zanz2
a645bcb32d
fixed oversight;Changed double quote to single
2017-10-25 17:21:05 +02:00
zmagod
5e6a4bb69a
adds environment variable that disables/enables the creation of new team when user sign up
2017-10-25 15:29:04 +02:00
Zanz2
49501b3d3d
Finished review refactor
2017-10-24 19:24:53 +02:00
zmagod
62dfd6a713
adds wait_for_ajax function to cucumber tests [fixes SCI-1723]
2017-10-24 15:39:06 +02:00
mlorb
324ecf1bb4
Merge pull request #843 from mlorb/ml-sci-1574
...
Add integration test for signup.feature [SCI-1574]
2017-10-24 10:05:28 +02:00
zmagod
f76dc29e61
fix change user role [fixes SCI-1669]
2017-10-23 15:48:12 +02:00
Luka Murn
82f982e983
Merge branch 'rails-5.1' into decoupling-settings-page
...
Conflicts:
Gemfile
Gemfile.lock
2017-10-23 10:59:10 +02:00
Luka Murn
8254153bb9
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
app/models/connection.rb
app/models/experiment.rb
app/models/my_module.rb
2017-10-23 08:57:57 +02:00
Zmago Devetak
a0eaec214b
Merge pull request #821 from ZmagoD/zd_SCI_1572
...
Implement integration test: profile.feature + initial setup
2017-10-20 20:17:37 +02:00
mlorb
550c5ad6f6
add integration test for signup.feature
2017-10-20 14:48:47 +02:00
Zanz2
03e40017e4
Updated local
2017-10-19 19:58:18 +02:00
okriuchykhin
44733fefda
Merge pull request #839 from okriuchykhin/ok_SCI_1609
...
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 16:26:36 +02:00
Oleksii Kriuchykhin
631b41cdaa
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 11:38:23 +02:00
zmagod
92061628a0
adds @Ducz0r suggestions
2017-10-19 10:35:53 +02:00
Zanz2
ae9ac46472
Put the two blocks of code into seperate partials
2017-10-19 00:13:35 +02:00
Zmago Devetak
fd755eedf0
Merge pull request #832 from ZmagoD/zd_SCI_1560
...
adds label under protocols keywords input [fixes SCI-1560]
2017-10-18 14:06:13 +02:00
Zanz2
6cf775a4b1
Refactored code, made html render on preview too
2017-10-17 19:27:20 +02:00
okriuchykhin
8e90e041b9
Merge pull request #825 from okriuchykhin/ok_SCI_1665
...
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-17 17:26:00 +02:00
zmagod
30d091dc65
adds label under protocols keywords input [fixes SCI-1560]
2017-10-17 14:10:56 +02:00
Luka Murn
4e06b5c397
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
2017-10-17 13:17:49 +02:00
Luka Murn
4d8f2665d3
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
2017-10-17 13:10:02 +02:00
Luka Murn
2fb2b90da3
Merge pull request #820 from Ducz0r/lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675]
2017-10-16 13:05:43 +02:00
okriuchykhin
db9a031581
Merge pull request #813 from okriuchykhin/ok_SCI_1642
...
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
Oleksii Kriuchykhin
56f52ebfa7
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-12 14:43:25 +02:00
Zanz2
5d667f146e
Moved .js form reset and made a standalone description method
2017-10-11 17:59:09 +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
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
Oleksii Kriuchykhin
bd26052110
Remove GIOT sign-in button [GIOT-55]
2017-10-09 11:56:46 +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
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
Oleksii Kriuchykhin
6820511ea0
Further canvas optimizations [SCI-1642]
2017-10-06 12:43:27 +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
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
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
zmagod
3dc3ed906f
fixes bug with embedded images [fixes SCI.1624]
2017-10-02 18:06:42 +02:00
Oleksii Kriuchykhin
6824f9a8bc
Improve memory utulization in PDF report generator [SCI-1482]
2017-10-02 11:29:22 +02:00
zmagod
cb4bacc372
refactor preferences page [fixes SCI-1564]
2017-09-28 16:53:51 +02:00
zmagod
26b526d61b
adds getter and setters for user settings
2017-09-27 14:38:52 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
31e8c107fd
dodav na pravi branch te file
2017-09-11 14:35:00 +02:00
Jure Grabnar
b4a13dffe3
init commit, dodav na protocols index gumb z dropdown
2017-09-11 13:07:22 +02:00
Mojca Lorber
0e14420193
fix bugs with importing samples
2017-09-06 14:41:14 +02:00
zmagod
9c01ab414c
refactor leave team
2017-09-01 17:10:43 +02:00
zmagod
91d2d8a935
adds team details view
2017-08-31 15:56:55 +02:00
zmagod
1325732b0c
adds specs for team controller actions
2017-08-30 16:18:21 +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
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
db16da7bd6
adds custom query to fetch teams data
2017-08-25 16:07:37 +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
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
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
zmagod
685cb42aac
fixes repository, protocols link, adds csfr token to request headers
2017-08-21 15:30:54 +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
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
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
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
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
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
zmagod
caae1e2fe8
adds intl, router, bootstrap to npm modules
2017-07-31 10:42:40 +02:00
Toni Dezman
ffda8b259b
adds Redux and changes to index.jsx page
2017-07-28 10:52:25 +02:00
Toni Dezman
1673d43993
adds react/settings controller and react/layout
2017-07-27 15:26:03 +02:00
Toni Dezman
0f4286d5d1
adds Settings index react page
2017-07-27 14:21:27 +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
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
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
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
okriuchykhin
2e24e6b73a
Merge pull request #725 from okriuchykhin/ok_SCI_1409
...
Fix datatables [SCI-1409]
2017-07-03 15:47:19 +02:00
Oleksii Kriuchykhin
b234c07c13
Fix datatables [SCI-1409]
2017-07-03 15:33:50 +02:00
lenart
74e723d5d5
Changed data hook name and form id [SCI-1430]
2017-07-03 11:28:35 +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
Mojca Lorber
21b4ba7627
fix bugs on projects page
2017-06-28 17:15:09 +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
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
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
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +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
zmagod
2b2f513366
fixes export pdf error on production
2017-06-22 16:40:50 +02:00
zmagod
a2e1aa5b36
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 14:43:01 +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
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +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
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
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
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
zmagod
2d3b5f4308
refactor
2017-06-14 10:55:24 +02:00
zmagod
cee052fc19
added service object
2017-06-14 09:11:20 +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
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
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
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
Mojca Lorber
9108102b42
fix permissions
2017-06-12 17:34:36 +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
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
rekonder
ede744849b
Export repository [aj-SCI-1275]
2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
zmagod
ee9eaea47c
truncate long repository names [fixes SCI-1337]
2017-06-09 11:20:57 +02:00
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
zmagod
33b996ffee
refactor
2017-06-09 09:49:57 +02:00
Luka Murn
c7c3c46d9d
Fix dropdown
2017-06-08 15:26:57 +02:00
Mojca Lorber
be52af4e4f
fix rename/delete/copy modals not working
2017-06-08 15:13:00 +02:00
Mojca Lorber
0004c2b7d5
fix selection of tab after redirection
2017-06-08 14:17:27 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f
Merge pull request #659 from Ducz0r/lm-sci-1279
...
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Matej Zrimšek
77a225ec31
Added toggle between assigned and all repository records. [SCI-1276]
2017-06-07 18:13:25 +02:00
Luka Murn
02dd6636ba
Allow saving & editing of reports with repository elements
...
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Luka Murn
b5f6d1da94
Allow custom repositories to be added to reports
2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106
renaming
2017-06-06 15:50:43 +02:00
Mojca Lorber
39dda1ad5d
refactoring
2017-06-06 13:18:44 +02:00
ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d
code changes after rebasing
2017-06-06 11:10:55 +02:00
Mojca Lorber
da98788031
small code fixes
2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
Matej Zrimšek
419d638163
Renamed reposiotry edit and destroy permission helper. [fix 1269]
2017-06-05 17:36:26 +02:00
zmagod
ab4961ddb1
adds overlay partial
2017-06-05 11:31:05 +02:00
zmagod
67d902db52
refactor
2017-06-05 10:43:58 +02:00
Matej Zrimšek
d8d54232c3
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
2017-06-02 19:08:51 +02:00
Matej Zrimšek
73aaef0949
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
5c9a453439
Added permissions for deleting and renaming of repositories. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
9a7048cc7a
Code formatting updated for repositories. [SCI-1269]
2017-06-02 17:50:34 +02:00
