scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
2491 commits 70 branches 179 tags 165 MiB
Commit graph

2491 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 5733d79943 Merge pull request #776 from programmertoni/td_SCI_1494_v2 
Settings Page
 2017-08-24 10:25:26 +02:00
Toni Dezman 3c6f66ebd3 Merge branch 'decoupling-settings-page' into td_SCI_1494_v2 2017-08-24 10:23:30 +02:00
Zmago Devetak f0a2b11a84 Merge pull request #777 from ZmagoD/zd_SCI_1570 
fix eslint import/no-unresolved errors reports [fixes SCI-1570]
 2017-08-24 09:53:27 +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
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
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
Toni Dezman 1dfd7a0cee adds i18n and 404 page 2017-08-22 15:54:47 +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 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
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
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
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 5115890d07 Merge pull request #766 from biosistemika/revert-763-ok_SCI_1507 
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
 2017-08-07 11:56:05 +02:00