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
2268 commits 77 branches 180 tags 167 MiB
Commit graph

2268 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
e067c88a55 Merge pull request #476 from Ducz0r/lm-add-addon-generator 
Add addon generator to generators
 2017-02-09 08:58:59 +01:00
Luka Murn
1c5c7a50fd Update README.md in addons generator 2017-02-08 11:15:36 +01:00
Luka Murn
5b448a4d4c Please the Hound! 2017-02-08 10:53:38 +01:00
Luka Murn
98c41052db Add addons-ready Dockerfile 2017-02-07 14:01:19 +01:00
okriuchykhin
c2a69982aa Merge pull request #471 from okriuchykhin/ok_SCI_936 
Adds datatable to all teams page [SCI-936]
 2017-02-07 10:33:33 +01:00
okriuchykhin
e2de3c92e7 Merge pull request #472 from okriuchykhin/ok_SCI_984 
Check that user is a member of a team when switching to it [SCI-984]
 2017-02-07 09:36:46 +01:00
okriuchykhin
53ff6a2893 Merge pull request #473 from okriuchykhin/ok_SCI_997 
Fix smart annotation is missing at editing column with smart annotation [SCI-997]
 2017-02-07 09:33:40 +01:00
Luka Murn
62e3eff87e Add addon generator 2017-02-07 09:30:28 +01:00
Oleksii Kriuchykhin
80dbc669d0 Simplify all teams dt definition [SCI-936] 2017-02-06 17:17:48 +01:00
Oleksii Kriuchykhin
449f4479e9 Fix code style issues [SCI-936] 2017-02-06 17:08:20 +01:00
mlorb
2d41ae7bf8 Merge pull request #474 from ZmagoD/zd_SCI_930_val2 
adds hook to team name in the invitation template [fixes SCI-930]
 2017-02-06 16:05:41 +01:00
zmagod
c99a540eb3 adds hook to team name in the invitation template [fixes SCI-930] 2017-02-03 16:53:42 +01:00
Oleksii Kriuchykhin
916ed2572a Fix smart annotation is missing at editing column with smart annotation [SCI-997] 2017-02-03 16:42:38 +01:00
Oleksii Kriuchykhin
cc6b518c7f Check that user is a member of a team when switching to it [SCI-984] 2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin
62535a01bd Move teams datatable js code into separate file [SCI-936] 2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin
8b105aa030 Add override hooks [SCI-936] 2017-02-02 23:35:47 +01:00
Zmago Devetak
65bbd81497 Merge pull request #469 from ZmagoD/zd_SCI_929 
Adds hook in user settings navigation
 2017-02-02 15:01:37 +01:00
mlorb
970d99e6e3 Merge pull request #465 from mlorb/ml_sci_937 
Redesign of individual team page [SCI-937]
 2017-02-02 11:15:55 +01:00
okriuchykhin
6c28ab0b4c Merge pull request #466 from okriuchykhin/ok_SCI_934 
Make sciNote work for users without any teams [SCI_934]
 2017-02-02 11:03:40 +01:00
mlorb
5510fa7751 rename data-hooks in team view 2017-02-02 10:36:23 +01:00
Oleksii Kriuchykhin
db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
zmagod
bb42bd04a5 adds hook in user settings navigation 2017-02-01 17:10:22 +01:00
Mojca Lorber
86351ce17d add data-hooks for billing 2017-02-01 15:01:54 +01:00
Mojca Lorber
d3e0eca44e redesign individual team page 2017-02-01 14:44:47 +01:00
Oleksii Kriuchykhin
031741d122 Disable protocols link if user has no teams [SCI-934] 2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin
c119b7c014 Make sciNote work for users without any teams [SCI_934] 2017-02-01 14:16:26 +01:00
Zmago Devetak
5c9954bb89 Merge pull request #450 from ZmagoD/zd_SCI_939 
Refactor "organizations" to "teams"
 2017-02-01 13:12:02 +01:00
okriuchykhin
067b9452a4 Merge pull request #464 from okriuchykhin/ok_SCI_935 
Add config option to enable/disable users registration [SCI-935]
 2017-02-01 09:36:36 +01:00
Luka Murn
059f9cfb25 Merge pull request #468 from biosistemika/hotfix-1.7.2 
Change URLs to sciNote help pages [SCI-978]
 2017-01-31 16:15:39 +01:00
Luka Murn
ec799520d4 Forgot to add en.yml 2017-01-31 16:05:13 +01:00
Luka Murn
50b8588cbf Version bump to 1.7.2 2017-01-31 15:49:58 +01:00
Luka Murn
db75231617 Update URLs to sciNote support pages 
Closes SCI-978.
 2017-01-31 15:48:56 +01:00
zmagod
8ffff47c43 fixes hound vol2 2017-01-31 13:59:27 +01:00
zmagod
be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin
b35e7e70ba Enable user registration by default [SCI-935] 2017-01-31 11:10:46 +01:00
Oleksii Kriuchykhin
d1e69438de Add config option to enable/disable users registration [SCI-935] 2017-01-30 15:04:02 +01:00
mlorb
bc8c4c3c6c Merge pull request #463 from mlorb/ml_sci_965 
Fix step does not save if table is without content [SCI-965]
 2017-01-30 11:08:21 +01:00
Mojca Lorber
b291553d01 fix hound 2017-01-27 16:36:03 +01:00
Mojca Lorber
d5021fad2c fix step does not save if table is without content 2017-01-27 16:25:11 +01:00
okriuchykhin
9909f9dcff Merge pull request #456 from okriuchykhin/ok_SCI_951 
Fix missing preview images in task and protocol management [SCI-951]
 2017-01-27 14:42:41 +01:00
okriuchykhin
c6fe0003f4 Merge pull request #458 from okriuchykhin/ok_SCI_957 
Fix protocol table filtering by keywords [SCI-957]
 2017-01-27 14:19:53 +01:00
okriuchykhin
53e09bd50a Merge pull request #457 from okriuchykhin/ok_SCI_955 
Fix comments re-initialization after edit of the results [SCI-955]
 2017-01-27 11:50:52 +01:00
zmagod
e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
zmagod
61b260fb8a fixes bug in protocol management 2017-01-27 11:01:44 +01:00
zmagod
0a6bb958a5 renamed organization to teams in migrations/rake tasks 2017-01-27 10:39:57 +01:00
mlorb
77236f161b Merge pull request #461 from mlorb/ml_sci_952 
Fix bug with avatar in smart annotations [SCI-952]
 2017-01-27 10:08:53 +01:00
Luka Murn
2c3be391a8 Merge pull request #462 from ZmagoD/zd_SCI_962_vol2 
fix edit action
 2017-01-26 17:25:57 +01:00
Luka Murn
36f25e98f1 Merge pull request #459 from okriuchykhin/ok_SCI_943 
Fix RTF toolbar init after eding new step [SCI-943]
 2017-01-26 17:25:41 +01:00
zmagod
30912c514e fix edit action 2017-01-26 17:24:24 +01:00
Mojca Lorber
5bed5f0f4a fix bug with avatar in smart annotations 2017-01-26 17:15:00 +01:00