zmagod
|
66ee2af132
|
fix eslint import/no-unresolved errors reports [fixes SCI-1570]
|
2017-08-24 09:20:44 +02:00 |
|
Luka Murn
|
5ab524dbd3
|
Merge pull request #773 from Ducz0r/lm-sci-1496
Add basic datatables & datagrid [SCI-1496]
|
2017-08-24 09:02:57 +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 |
|
zmagod
|
afa05c8c14
|
fixed background worker in dev env
|
2017-08-23 17:10:45 +02:00 |
|
Toni Dezman
|
f1cad5d446
|
checkouts Gemfile.lock from decupling-settings-page
|
2017-08-23 13:19:45 +02:00 |
|
Toni Dezman
|
70cf62712d
|
adds Gemfile.lock file
|
2017-08-23 11:54:18 +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 |
|
Luka Murn
|
647c879c76
|
Merge pull request #769 from Ducz0r/lm-sci-1475
Refactor user settings into a jsonb field [SCI-1475]
|
2017-08-23 08:43:23 +02:00 |
|
Luka Murn
|
8e999e673a
|
Remove scinote-web.tgz from index
|
2017-08-23 08:40:47 +02:00 |
|
Luka Murn
|
67017d383c
|
Merge pull request #761 from Ducz0r/lm-add-versions-rake-file
Add versions Rake
|
2017-08-23 08:36:45 +02:00 |
|
Luka Murn
|
5ee7fd895c
|
Moved the arrays into json
|
2017-08-23 08:35:48 +02:00 |
|
Toni Dezman
|
1dfd7a0cee
|
adds i18n and 404 page
|
2017-08-22 15:54:47 +02:00 |
|
Luka Murn
|
b6eb46471a
|
Merge pull request #753 from Ducz0r/lm-remove-some-code
Remove some code we're no longer maintaining
|
2017-08-22 14:04:04 +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
|
692df427b2
|
adds wildcard for settings/*all to show react 404 page
|
2017-08-22 10:35:18 +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
|
1cabe84910
|
Merge pull request #774 from Ducz0r/lm-sci-1376
Update delayed_paperclip library [SCI-1376]
|
2017-08-22 09:23:30 +02:00 |
|
Luka Murn
|
90188c89c9
|
Update delayed_paperclip library
Closes SCI-1376.
|
2017-08-22 08:34:58 +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 |
|
Zmago Devetak
|
c52521b96f
|
Merge pull request #772 from ZmagoD/merge-rails-5.1-branch
Merge rails 5.1 branch
|
2017-08-21 13:54:44 +02:00 |
|
zmagod
|
ffda9fd45a
|
fixes es2015 error
|
2017-08-21 13:51:13 +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
|
efd105c499
|
Merge pull request #759 from ZmagoD/zd_SCI_1471
fixes signup spec [fixes SCI-1471]
|
2017-08-09 16:16:50 +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
|
202bc32a06
|
fix eslint
|
2017-08-09 16:14:39 +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 |
|