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

1985 commits

Author SHA1 Message Date
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
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