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

856 commits

Author SHA1 Message Date
zmagod dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
zmagod 3740e89ca0 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1572 2017-10-11 15:20:09 +02:00
zmagod abe0b8adcc tweak tweak 2017-10-11 15:20:03 +02:00
mlorb 8bd698e5c3 Merge pull request #817 from mlorb/ml-sci-1632 
Fixes buttons on my profile page [SCI-1632]
 2017-10-10 16:30:50 +02:00
mlorb 7ca29b50a2 Merge pull request #816 from mlorb/ml-sci-1636 
Fixes style errors on one team page [SCI-1636]
 2017-10-10 16:23:50 +02:00
Zmago Devetak e99791bd29 Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration 
fixes webpack production build
 2017-10-10 15:08:28 +02:00
zmagod f12a645fa3 fix hound 2017-10-10 15:01:25 +02:00
zmagod f00c36998d removes unneeded style component 2017-10-10 14:51:46 +02:00
zmagod a35ba0239a fixes flow types 2017-10-10 14:48:46 +02:00
Zmago Devetak d1c3d00c84 Merge pull request #807 from ZmagoD/zd_SCI_1629 
adds bootstrap and font-awesome in webpacker build fixes the missing …
 2017-10-10 14:09:52 +02:00
zmagod c014742a88 fixes webpack production build 2017-10-10 14:08:23 +02:00
mlorb fd859d7b7f fixes buttons on my profile page 2017-10-10 13:25:44 +02:00
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
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
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 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 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 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
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
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
zmagod 1a7f8fc857 added frontend validations 2017-09-22 16:59:38 +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 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 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
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
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
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
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 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 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
zmagod be42cd2204 refactor 2017-08-07 13:51:22 +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
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 ffda8b259b adds Redux and changes to index.jsx page 2017-07-28 10:52:25 +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
Oleksii Kriuchykhin ba35717243 Fix babel and eslint config [SCI-1461] 2017-07-13 14:11:01 +02:00
Oleksii Kriuchykhin b8e93ee883 Add Webpacker and React [SCI-1461] 2017-07-12 16:41:55 +02:00