scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
11930 commits 77 branches 180 tags 167 MiB
Commit graph

11930 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Luka Murn
cf2b06d82f Merge pull request #760 from mz3944/mz-SCI-1481 
Fixed slow exporting of repositories - JS listeners which triggered f… [SCI-1481]
 2017-08-07 14:11:50 +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
Luka Murn
85634b2fb6 Add 'off' before setting export button to 'on' 2017-08-07 14:04:39 +02:00
Luka Murn
a9b74e3b95 Merge branch 'mz-SCI-1481' of https://github.com/mz3944/scinote-web into mz3944-mz-SCI-1481 2017-08-07 14:00:23 +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
Luka Murn
77fdaaeb2e Add versions Rake file 2017-08-03 11:28:33 +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
Matej Zrimšek
d90ca1b934 Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481] 2017-08-02 16:49:53 +02:00
lenart
6c5bc32f24 Revert incorrect changes from previous commit [SCI-1249] 2017-08-02 16:00:23 +02:00
lenart
e781dfc6a6 Truncate activity taking smart annotations into account fixes [SCI-1249] 2017-08-02 15:51:32 +02:00
zmagod
caae1e2fe8 adds intl, router, bootstrap to npm modules 2017-07-31 10:42:40 +02:00