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

578 commits

Author SHA1 Message Date
zmagod 5a31df7204 adds @Ducz0r suggestions 2017-10-06 10:45:22 +02:00
zmagod edf4443995 added notification alert [fixes SCI-1566] 2017-10-02 14:51:54 +02:00
mlorb 9d96bf668a fix error handeling, refactoring 2017-09-21 16:42:56 +02:00
mlorb 48c8922604 adds invite users modal 2017-09-21 10:45:35 +02:00
Luka Murn e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-09-21 08:27:38 +02:00
Luka Murn 80c05e50ec Semi-working version of create new team form 2017-09-19 16:30:26 +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 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 185039bc99 adds suggestions from code review 2017-09-04 15:00:26 +02:00
zmagod 91d2d8a935 adds team details view 2017-08-31 15:56:55 +02:00
Toni Dezman c3f46d4877 adds hounds suggestions on improving the code 2017-08-31 13:24:57 +02:00
Toni Dezman 77a6a99513 fixes 404 request error 2017-08-31 13:03:15 +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 478bd491ff added pagination and sorting to team tables 2017-08-28 17:05:09 +02:00
Toni Dezman ea9a195f09 email and password action/redusers work 2017-08-26 14:07:31 +02:00
Toni Dezman ccd14f6b50 adds apis for full_name and initials input fields 2017-08-25 14:45:02 +02:00
zmagod 782daabce1 first run 2017-08-25 08:54:32 +02:00
Toni Dezman e4a704d063 namespaces client_api/users/user_controller.rb 2017-08-25 08:21:52 +02:00
Zmago Devetak 994b08fcfc Merge pull request #752 from ZmagoD/testin-rails-5-addons 
fix background worker bug
 2017-08-25 08:05:21 +02:00
zmagod afa05c8c14 fixed background worker in dev env 2017-08-23 17:10:45 +02:00
Toni Dezman 692df427b2 adds wildcard for settings/*all to show react 404 page 2017-08-22 10:35:18 +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
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 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
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 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
zmagod a46e28a85a fixes signup spec [fixes SCI-1471] 2017-07-28 15:37:28 +02:00
Luka Murn 03a7440136 Remove SkyLight stuff (we're not using it any more) 2017-07-27 14:26:44 +02:00
Toni Dezman 78f26525e9 Settings SPA works 2017-07-27 13:53:29 +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
zmagod c34e4a0814 fix background worker bug 2017-07-26 13:31:36 +02:00
Oleksii Kriuchykhin 6c33b46f6a Improve import of repository records plus tsv file import fixes [SCI-1487] 2017-07-20 11:44:10 +02:00
Zmago Devetak 7b898666da Merge pull request #745 from ZmagoD/zd_SCI_1485 
refactor repositories js files [fixes SCI-1485]
 2017-07-19 11:17:52 +02:00
Oleksii Kriuchykhin ece27b2652 Fix importing files with empty header cells and error messages improvements [SCI-1484] 2017-07-18 14:54:35 +02:00
zmagod a2b7bcda4c refactor repositories js files [fixes SCI-1485] 2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin 036ee390ed Fix error messages in repository import and uploading files starting with hyphen[SCI-1484] 2017-07-14 16:19:03 +02:00