scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
2461 commits 31 branches 181 tags 166 MiB
Commit graph

2461 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
39bb8ecdab Fix code 2017-08-23 10:54:54 +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
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
f92641af14 Merge pull request #765 from biosistemika/revert-758-td_SCI_1492 
Revert "Td sci 1492"
 2017-08-07 11:48:54 +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
okriuchykhin
b52f9cb4d9 Merge pull request #763 from okriuchykhin/ok_SCI_1507 
Add core API using JWT authentication and tests for it [SCI-1507]
 2017-08-04 10:26:35 +02:00
Oleksii Kriuchykhin
35b643f34e Fix typo in config and code style improvements [SCI-1507] 2017-08-04 10:19:56 +02:00
zmagod
d707057aa4 fix eslint to work with airbnb standard 2017-08-04 09:39:42 +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
Luka Murn
6239e01536 Bump version to 1.12.3 2017-08-03 13:35:41 +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
mz3944
25f4095446 Merge pull request #756 from mz3944/mz_SCI_1524 
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
 2017-07-28 15:58:33 +02:00
zmagod
a46e28a85a fixes signup spec [fixes SCI-1471] 2017-07-28 15:37:28 +02:00
Toni Dezman
5a922b3f85 adds yarn.lock file 2017-07-28 14:15:15 +02:00
Toni Dezman
f76512f364 adds hound recomendations for react/settings_controller.rb 2017-07-28 12:53:15 +02:00
Zmago Devetak
bb63646203 Merge pull request #754 from ZmagoD/zd_SCI_1470 
fixes failing tests [fixes SCI-1470]
 2017-07-28 12:04:50 +02:00
zmagod
ca3e89ab62 fix hound 2017-07-28 12:03:44 +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
Toni Dezman
1ce787603e adds immutable.js 2017-07-27 14:06:09 +02:00
Toni Dezman
78f26525e9 Settings SPA works 2017-07-27 13:53:29 +02:00