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
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
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
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
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