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 |
|
mlorb
|
1049e0730e
|
implements @ZmagoD comments
|
2017-10-09 13:59:32 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
zmagod
|
83647d81b4
|
adds edit team name modal
|
2017-09-15 14:00:48 +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 |
|
zmagod
|
705d07f60e
|
adds remove team action
|
2017-09-13 17:11:51 +02:00 |
|
zmagod
|
1b3b3dfea9
|
adds team members update role functionality
|
2017-09-12 17:30:13 +02:00 |
|
Toni Dezman
|
1cd9cd92fc
|
adds global spinner
|
2017-09-11 14:30:49 +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 |
|
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 |
|
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 |
|