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 |
|
Zanz2
|
e72c1bebcb
|
deleted comments
|
2017-10-12 19:18:22 +02:00 |
|
Zanz2
|
8d0d6f0502
|
refactored methods
|
2017-10-12 19:10:16 +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 |
|
Zanz2
|
21036a1081
|
Deleted unnecesarry if's
|
2017-10-12 17:22:02 +02:00 |
|
Zanz2
|
414a15872c
|
Made seperate method for steps mapping
|
2017-10-12 17:15:43 +02:00 |
|
gazvoda
|
88f03a0706
|
Merge pull request #735 from gazvoda/lg-SCI-1249-v2
Truncate checklist items in activity modal [fixes SCI-1249]
|
2017-10-12 15:58:05 +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 |
|
Luka Murn
|
fe89b942e7
|
Add Add-ons page to User -> Settings -> Account
Closes SCI-1675.
|
2017-10-11 14:15:37 +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 |
|
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
|
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
|
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 |
|
Oleksii Kriuchykhin
|
6820511ea0
|
Further canvas optimizations [SCI-1642]
|
2017-10-06 12:43:27 +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 |
|
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
|
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 |
|
zmagod
|
3dc3ed906f
|
fixes bug with embedded images [fixes SCI.1624]
|
2017-10-02 18:06:42 +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 |
|
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 |
|
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
|
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
|
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 |
|
zmagod
|
1a7f8fc857
|
added frontend validations
|
2017-09-22 16:59:38 +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
|
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
|
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 |
|
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
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|
zmagod
|
83647d81b4
|
adds edit team name modal
|
2017-09-15 14:00:48 +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
|
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 |
|
Toni Dezman
|
67d617deb5
|
adds hound_bot's and zmagos suggestions
|
2017-09-07 13:40:53 +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
|
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 |
|
Toni Dezman
|
ea9a195f09
|
email and password action/redusers work
|
2017-08-26 14:07:31 +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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
f76512f364
|
adds hound recomendations for react/settings_controller.rb
|
2017-07-28 12:53:15 +02:00 |
|
Toni Dezman
|
1673d43993
|
adds react/settings controller and react/layout
|
2017-07-27 15:26:03 +02:00 |
|
Oleksii Kriuchykhin
|
6a43483a2f
|
Fix adding and editing repository items [SCI-1519]
|
2017-07-26 11:22:26 +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
|
ece27b2652
|
Fix importing files with empty header cells and error messages improvements [SCI-1484]
|
2017-07-18 14:54:35 +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 |
|
Mojca Lorber
|
739f8b5b4e
|
remove redundant rollback call
|
2017-07-13 13:49:26 +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 |
|
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 |
|
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 |
|
okriuchykhin
|
75c887ce7d
|
Merge pull request #721 from okriuchykhin/ok_SCI_1412
Fix activities [SCI-1412]
|
2017-07-04 10:59:08 +02:00 |
|
zmagod
|
bc33883c3c
|
first run fixing addons
|
2017-06-30 10:23:28 +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 |
|
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
|
4060ba2ac3
|
Code style fixes [SCI-1356]
|
2017-06-27 13:23:51 +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
|
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
|
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
|
e7328c2e20
|
fixes row dupplication [fixes SCI-1385]
|
2017-06-22 16:01:37 +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 |
|
Matej Zrimšek
|
d907819de5
|
Removed byebug calls. [SCI-1383]
|
2017-06-21 10:49:00 +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 |
|
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
|
9b941fe374
|
fix flash when deleting samples of other users
|
2017-06-16 17:12:04 +02:00 |
|
Mojca Lorber
|
1b683bc70e
|
fix error msg when editing empty cell in repositories
|
2017-06-16 15:09:04 +02:00 |
|
Mojca Lorber
|
ea455d3596
|
fix no repository name in activity bug
|
2017-06-15 09:43:10 +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 |
|
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 |
|
mlorb
|
074a47aae1
|
Merge pull request #675 from mlorb/ml_sci_1272
Fix permissions [SCI-1272]
|
2017-06-13 10:51:04 +02:00 |
|
zmagod
|
a865253a2e
|
first run
|
2017-06-13 08:10:10 +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 |
|
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 |
|
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 |
|
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 |
|
Mojca Lorber
|
be52af4e4f
|
fix rename/delete/copy modals not working
|
2017-06-08 15:13:00 +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
|
61eb52f86f
|
Implement GUI for copying repositories
Closes SCI.1270.
|
2017-06-07 19:11:25 +02:00 |
|
Luka Murn
|
0aee11d6d8
|
Hound is love, Hound is life #2
|
2017-06-07 18:26:32 +02:00 |
|
Luka Murn
|
42f7b4f68d
|
Hound is love, Hound is life
|
2017-06-07 18:22:15 +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
|
c18bba9fbe
|
Fix rebase errors [SCI-1274]
|
2017-06-07 15:50:22 +02:00 |
|
Oleksii Kriuchykhin
|
ad8dd6d740
|
PR fixes [SCI-1274]
|
2017-06-07 15:23:25 +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
|
353c27da15
|
rename method
|
2017-06-07 13:51:16 +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
|
dde714d78f
|
fix hound
|
2017-06-06 13:33:57 +02:00 |
|
Mojca Lorber
|
39dda1ad5d
|
refactoring
|
2017-06-06 13:18:44 +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
|
afce3010ef
|
After repository deletion, the next selected repository is the first one. [SCI-1269]
|
2017-06-05 17:56:09 +02:00 |
|
Matej Zrimšek
|
419d638163
|
Renamed reposiotry edit and destroy permission helper. [fix 1269]
|
2017-06-05 17:36:26 +02:00 |
|
Matej Zrimšek
|
f012779780
|
Renamed before_action for repository edit and destroy action. [fix 1269]
|
2017-06-05 10:02:16 +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
|
21a72da84f
|
Added rename logic and improved remove logic. [SCI-1269]
|
2017-06-02 17:50:34 +02:00 |
|
Matej Zrimšek
|
cdaac6a01b
|
Added remove repository modal logic. [SCI-1269]
|
2017-06-02 17:50:33 +02:00 |
|
Matej Zrimšek
|
791bb934ca
|
Remove repository modal logic (WIP). [SCI-1269]
|
2017-06-02 17:50:33 +02:00 |
|
zmagod
|
1c021b11db
|
adds drag and drop files upload to steps [fixes SCI-1310]
|
2017-06-02 16:34:09 +02:00 |
|
Luka Murn
|
fcc3995049
|
Merge pull request #647 from biosistemika/master
Bring latest master changes into custom-repositories
|
2017-05-30 14:18:14 +02:00 |
|