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
2476 commits 31 branches 181 tags 166 MiB
Commit graph

775 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
1673d43993 adds react/settings controller and react/layout 2017-07-27 15:26:03 +02:00
Toni Dezman
0f4286d5d1 adds Settings index react page 2017-07-27 14:21:27 +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
Luka Murn
73a4cd1e4f Merge pull request #737 from Ducz0r/lm-sci-1450 
Add versioning modal & support to sciNote [SCI-1450]
 2017-07-11 09:47:51 +02:00
Oleksii Kriuchykhin
a6b80589f2 Fix default order of the columns in repositories [SCI-1445] 2017-07-10 15:32:18 +02:00
Luka Murn
3e80f761b8 Add "about" modal, prepare hooks, VERSION system for addons 
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
 2017-07-10 15:27:50 +02:00
Luka Murn
16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
Luka Murn
9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
 2017-07-06 15:12:15 +02:00
okriuchykhin
2e24e6b73a Merge pull request #725 from okriuchykhin/ok_SCI_1409 
Fix datatables [SCI-1409]
 2017-07-03 15:47:19 +02:00
Oleksii Kriuchykhin
b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
lenart
74e723d5d5 Changed data hook name and form id [SCI-1430] 2017-07-03 11:28:35 +02:00
lenart
8ec458db91 Added data hook and form id for GA tracking [SCI-1430] 2017-06-30 10:06:54 +02:00
Mojca Lorber
a3514bdaf0 fix restore action from archives pages 2017-06-29 16:14:25 +02:00
Mojca Lorber
4fb07e1e4f fix edit comments 2017-06-29 13:33:59 +02:00
Mojca Lorber
2ab74c8979 add user variable 2017-06-29 12:56:14 +02:00
Mojca Lorber
21b4ba7627 fix bugs on projects page 2017-06-28 17:15:09 +02:00
Matej Zrimšek
4dbf5b0f53 Fixed sample types page load error, when viewing them on a task level. [SCI-1419] 2017-06-27 16:28:25 +02:00
mlorb
025050a7cd Merge pull request #716 from mlorb/ml-sci-1420 
Add tooltips to navigation bar [SCI-1420]
 2017-06-27 14:52:07 +02:00
Mojca Lorber
d03be76f35 add tooltips to archive buttons 2017-06-27 14:48:45 +02:00
Mojca Lorber
0160956377 put all titles on links 2017-06-27 14:21:06 +02:00
Mojca Lorber
6bfb5e125c add tooltips to navigation bar 2017-06-27 13:46:49 +02:00
okriuchykhin
d126391940 Merge pull request #710 from okriuchykhin/ok_SCI_1356 
Add global search in custom repositories [SCI-1356]
 2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin
69231060b0 Fix checking of my_modules presence [SCI-1356] 2017-06-27 13:39:08 +02:00
Zmago Devetak
6c541602e7 Merge pull request #715 from ZmagoD/zd_SCI_1328_v2 
fixes smart annotations bug in reports [fixes SCI-1328]
 2017-06-27 13:34:29 +02:00
Oleksii Kriuchykhin
4060ba2ac3 Code style fixes [SCI-1356] 2017-06-27 13:23:51 +02:00
mz3944
ca59ac5e36 Merge pull request #714 from mz3944/mz-SCI-1402 
Missing error message when not selecting name in case of import repository file [SCI-1402]
 2017-06-27 11:54:26 +02:00
zmagod
7b9410f02f fixes smart annotations bug in reports [fixes SCI-1328] 2017-06-27 11:26:32 +02:00
Matej Zrimšek
f847b44067 Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
84556cf744 Fix naming of repository items in modal and messages [SCI-1404] 2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin
e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00