scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
3564 commits 43 branches 185 tags 169 MiB
Commit graph

2830 commits

Author SHA1 Message Date
zanzdebian
8bd8c34c4d Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button) 2018-01-25 13:45:35 +01:00
mlorb
ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491 
Add notification for previous task has been completed [SCI-1491]
 2018-01-25 11:35:19 +01:00
Zmago Devetak
4716fc7752
Merge pull request #955 from biosistemika/decoupling 
Decoupling
 2018-01-25 11:33:06 +01:00
Zmago Devetak
1e407bd9c5
removes unneeded classes 2018-01-25 11:00:48 +01:00
Zmago Devetak
4b2098c0c4
removes unneeded permissions 2018-01-24 16:34:48 +01:00
zmagod
76b08e6ac9 add permissions in views 2018-01-24 13:59:57 +01:00
Zanz2
00ac774fde Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result 2018-01-24 13:40:13 +01:00
zmagod
9b836d04fa fixes per @mlorb 's request 2018-01-24 13:21:53 +01:00
Zanz2
7fe1c20ebe Finished the protocol reorder functions and implemented them 2018-01-24 09:31:43 +01:00
Zanz2
96253c1089 Made some functions to help solve reordering of the protocols io steps 2018-01-23 18:40:23 +01:00
Mojca Lorber
ac8b1769be add notification for previous task has been completed 2018-01-23 15:53:33 +01:00
zmagod
88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
okriuchykhin
a2896031ab
Merge pull request #951 from okriuchykhin/ok_SCI_1949 
Allow first user seeding from env variables [SCI-1949]
 2018-01-23 14:02:54 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
zmagod
259880c441 add permission helpers for view project and experiment 2018-01-23 08:52:10 +01:00
Oleksii Kriuchykhin
28be7c4fc4 Add health check endpoint to API controller [SCI-1970] 2018-01-22 16:52:48 +01:00
zmagod
ee7c646b1d update user settings controllers to new permission system [fixes SCI-1960] 2018-01-22 16:42:26 +01:00
okriuchykhin
73b56beae9
Merge pull request #950 from okriuchykhin/ok_SCI_1329 
Clear selected rows when changing pages on samples table[SCI-1329]
 2018-01-22 15:07:38 +01:00
Oleksii Kriuchykhin
959eddacda Clear selected rows when changing pages on samples table[SCI-1329] 2018-01-18 17:41:35 +01:00
Oleksii Kriuchykhin
df28503ec1 Fix fetching protocol name in protocol import [SCI-1951] 2018-01-18 17:25:20 +01:00
Oleksii Kriuchykhin
d1a515da90 Allow first user seeding from env variables [SCI-1949] 2018-01-18 16:23:33 +01:00
zmagod
2857857c24 fixes bug with navbar[SCI-1950] 2018-01-18 13:29:47 +01:00
Zmago Devetak
7b28bfa6d4
Merge pull request #937 from ZmagoD/feat/external-components-loader 
Enable loading of external React components
 2018-01-18 11:13:40 +01:00
okriuchykhin
aef80f86b5
Merge pull request #934 from okriuchykhin/ok_SCI_1931 
Fix protocol import button [SCI-1931]
 2018-01-18 10:30:19 +01:00
Adrian Oprea
f2f624cfa6 Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web:
  fix(AboutScinoteModal): Enable react optimizations
  Fix addons display in info modal [SCI-1875]
  Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version.
 2018-01-18 10:24:36 +02:00
Adrian Oprea
12fd630d0c fix(AboutScinoteModal): Enable react optimizations 
Children generated within a loop or by an iterator need to be passed
a unique `key` property so React can properly watch their updates and
perform the necessary actions.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-18 09:59:37 +02:00
Oleksii Kriuchykhin
91468faaf9 Fix addons display in info modal [SCI-1875] 2018-01-17 18:30:55 +01:00
Adrian Oprea
6d84790bdb Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
  fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
  Remove Addons info test from core [SCI-1875]
  Remove skip_on_import from repository_cell [SCI-1939]
  fixes bug with comment actions dropdown [fixes SCI-1938]
  fixes first element in global activities logs[fixes SCI-1866]
  Fix task repository row selector [SCI-1940]
  Fix repository item export [SCI-1945]
  Fix samples import [SCI-1946]
  adds first date to _list.html.erb view
  Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
  Fix repository records import [SCI-1939]
  Fix export samples button [SCI-1936]
  refactor
  adds additional tests for permissions controller
  fix HOC to recive objects
  fixes flow, and before_action in permissions_controller
  fixes per @duco 's request
  remove unneeded import
  add permissions endpoint on the API
  fix request
  ...
 2018-01-17 18:14:41 +02:00
Zmago Devetak
b4b6fddca3
Merge pull request #945 from ZmagoD/zd_SCI_1944 
fixes bug in the invitation_controller with full_name sanitization [f…
 2018-01-17 17:02:34 +01:00
Adrian Oprea
157969aa5e HACK: Comment out code which returns invalid data 
It seems like the backend is returning a weird response when queried for
addons. Once the backend issue is identified and fixed this should be
uncommented.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 17:54:35 +02:00
okriuchykhin
8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 
Remove Addons caption if no addons in info modal and fix linter packages
 2018-01-17 15:33:43 +01:00
zmagod
488dba378e fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944] 2018-01-17 15:06:43 +01:00
Zmago Devetak
26f7a94392
Merge pull request #943 from ZmagoD/zd_SCI_1866_v2 
fixes first element both in Rails part an React part off the application
 2018-01-17 14:12:52 +01:00
Zmago Devetak
b9e56c49ef
Merge pull request #944 from ZmagoD/zd_SCI_1938 
fixes bug with comment actions dropdown [fixes SCI-1938]
 2018-01-17 13:42:36 +01:00
Adrian Oprea
b559f3cbd4 refactor(Navigation): Use identifier instead of screenName 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:40:33 +02:00
Adrian Oprea
4b9013bcab refactor(massageConfiguration): Create response only when we have addons 
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-17 14:39:42 +02:00
okriuchykhin
38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939 
Fix repository records import [SCI-1939]
 2018-01-17 12:55:11 +01:00
Oleksii Kriuchykhin
819febb05b Remove skip_on_import from repository_cell [SCI-1939] 2018-01-17 12:54:32 +01:00
zmagod
5371f5a139 fixes bug with comment actions dropdown [fixes SCI-1938] 2018-01-17 12:54:21 +01:00
okriuchykhin
8ccb361525
Merge pull request #940 from okriuchykhin/ok_SCI_1946 
Fix samples import [SCI-1946]
 2018-01-17 12:51:35 +01:00
okriuchykhin
1692bdade7
Merge pull request #941 from okriuchykhin/ok_SCI_1945 
Fix repository item export [SCI-1945]
 2018-01-17 12:50:22 +01:00
okriuchykhin
2c2914f691
Merge pull request #942 from okriuchykhin/ok_SCI_1940 
Fix task repository row selector [SCI-1940]
 2018-01-17 12:50:11 +01:00
zmagod
0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin
74a62c41eb Fix task repository row selector [SCI-1940] 2018-01-17 11:21:41 +01:00
Oleksii Kriuchykhin
86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin
3c8d8e2fbb Fix samples import [SCI-1946] 2018-01-16 17:50:33 +01:00
Adrian Oprea
d71f6161e4 feat(Navigation): Enhance navigation with addons 
Use the withExtras HOC to add external functionality without embedding that knowledge in the core.
 2018-01-16 17:24:11 +02:00
Adrian Oprea
d7b63f5941 feat(massageConfiguration): Add data-transformation function 
The meta-configuration structure imposes we change the way `react-hijack` parses and pulls its data. Because that work is both error-prone and also time-consuming, we chose to implement a function that would "massage" the data so it fits the current way react-hijack expects it.
 2018-01-16 17:23:15 +02:00
Adrian Oprea
583efbc9c4 refactor(componentLoader): Add component path at module level 
Instead of forcing this knowledge on the add-on, we inserted it here. The benefit is that we are able to point the core to whatever directory we choose, without modifying each addon in turn.
 2018-01-16 17:19:56 +02:00
Adrian Oprea
350862b0cc feat: Re-export availableAddons 
This will probably be removed and the config will be exported through the main entrypoint.
 2018-01-16 17:18:46 +02:00
Adrian Oprea
f6f2bc4c3d feat: Create availableAddons empty config 
This configuration is populated on build-time with the available extras which expose a `client/` directory containing React code.
 2018-01-16 17:17:39 +02:00
zmagod
a931a1bc15 adds first date to _list.html.erb view 2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin
b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
Adrian Oprea
894e0afd0a feat(componentLoader): Add external component loader module 
For render hijacking to work, imports need to be peformed at core level.
This loader ensures that Webpack is able to resolve the paths to the
external components' code, without the need for extra loaders or custom
built plugins.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
 2018-01-16 10:14:35 +02:00
Oleksii Kriuchykhin
a64012237e Fix repository records import [SCI-1939] 2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin
79e1eaf145 Fix export samples button [SCI-1936] 2018-01-15 13:54:08 +01:00
Oleksii Kriuchykhin
deabd39a98 Fix protocol import button [SCI-1931] 2018-01-15 13:43:09 +01:00
okriuchykhin
00927be287
Merge pull request #932 from okriuchykhin/ok_SCI_1915 
Improve XLSX parsing with Roo [SCI-1915]
 2018-01-12 14:57:17 +01:00
Zmago Devetak
ebd354e4d5
Merge pull request #900 from ZmagoD/zd_SCI_1854 
adds premissions service to FE
 2018-01-12 14:24:28 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor 
Protocols.io code beautification and refactoring [SCI-1929]
 2018-01-12 12:34:00 +01:00
zmagod
371491c259 refactor 2018-01-12 11:38:52 +01:00
Zanz2
3c6d37ce64 Fixed according to PR review 2018-01-11 18:37:36 +01:00
Oleksii Kriuchykhin
2ddb0ea009 Improve XLSX parsing with Roo [SCI-1915] 2018-01-11 17:52:57 +01:00
mlorb
aba426091c add render 403 for create team permission 2018-01-10 10:47:45 +01:00
mlorb
6c4514f550 add create_teams permission checks 2018-01-09 15:28:27 +01:00
zmagod
0d7c116de1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-09 10:03:02 +01:00
zmagod
c5379896c0 fix HOC to recive objects 2018-01-08 16:28:20 +01:00
Zmago Devetak
4e4cae9a48
Merge pull request #927 from ZmagoD/zd_SCI_1867 
fix import protocol preview [fixes SCI-1867]
 2018-01-08 14:21:44 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866 
Wrong date at activity
 2018-01-08 14:20:26 +01:00
zmagod
c07f54a0c7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-08 08:38:14 +01:00
zmagod
7af4816ce8 removes js brakepoint 2018-01-05 17:13:39 +01:00
zmagod
455534ef9a fixes list keys 2018-01-05 17:11:38 +01:00
zmagod
eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb
fd6dfbd561 rename create_teams 2018-01-05 16:47:48 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797 
Permissions - refactor organization & team level permissions (core) [SCI-1797]
 2018-01-05 16:03:55 +01:00
mlorb
efb4ce289c fix and/or use 2018-01-05 15:52:41 +01:00
zmagod
3fae267547 fix import protocol preview [fixes SCI-1867] 2018-01-05 15:30:11 +01:00
mlorb
99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb
70ae14a9b8 refactor manage repository permissions again because of addons 2018-01-05 11:17:01 +01:00
mlorb
ec851caa80 refactor manage repository column permissions again because of addons 2018-01-05 10:43:59 +01:00
zmagod
be014000ab fixes flow-types 2018-01-05 09:59:08 +01:00
zmagod
862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
zmagod
0d72851bb5 fixes bug with displaying assign/unassign button [fixes SCI-1870] 2018-01-04 17:20:17 +01:00
okriuchykhin
4cdbecc3bc
Merge pull request #923 from okriuchykhin/ok_SCI_1869 
Add project/task path with tooltips to activities [SCI-1869]
 2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin
53f4db9352 Code refactoring [SCI-1869] 2018-01-04 14:56:16 +01:00
okriuchykhin
b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870 
Fix adding users to a task [SCI-1870]
 2018-01-04 14:14:05 +01:00
okriuchykhin
e49ffb61d4
Merge pull request #914 from okriuchykhin/ok_SCI_1873 
Fix repositories [SCI-1873]
 2018-01-04 13:33:30 +01:00
mlorb
abced181d5 refactor manage repository rows permissions again because of addons 2018-01-04 11:53:58 +01:00
Oleksii Kriuchykhin
070711917e Code fixes [SCI-1873] 2018-01-04 11:25:34 +01:00
zmagod
e0e3ef9359 fixes flow, and before_action in permissions_controller 2018-01-03 17:23:50 +01:00
okriuchykhin
d149facd50
Merge pull request #922 from okriuchykhin/ok_SCI_1875 
Fix about modal [SCI-1875]
 2018-01-03 17:00:29 +01:00
mlorb
0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
okriuchykhin
3d3b1d3a44
Merge pull request #921 from okriuchykhin/ok_SCI_1648 
Fix assign repository record button in tasks when one record is selected [SCI-1648]
 2018-01-03 16:28:34 +01:00
okriuchykhin
ac7746ae91
Merge pull request #916 from okriuchykhin/ok_SCI_1871 
Fix canvas update [SCI-1871]
 2018-01-03 15:47:10 +01:00
okriuchykhin
ff62a36788
Merge pull request #910 from okriuchykhin/ok_SCI_1838 
Change invite users to project link to new settings page [SCI-1838]
 2018-01-03 14:47:26 +01:00
okriuchykhin
b8fa3c4d51
Merge pull request #905 from okriuchykhin/ok_SCI_1865 
Add icons for different notification types in recent notification dropdown [SCI-1865]
 2018-01-03 14:23:53 +01:00
zmagod
1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
mlorb
dc68b3068b fix Rails 5.1 bug with params 2018-01-03 13:19:56 +01:00
Oleksii Kriuchykhin
2e275d6d67 Add project/task path with tooltips to activities [SCI-1869] 2017-12-28 15:13:39 +01:00
Zanz2
7bad722553 Made small oversight and fixed it 2017-12-24 02:06:14 +01:00
Zanz2
83e1b04c7a Fixed pull request 2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin
89230bd730 Fix about modal [SCI-1875] 2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin
27008be50e Fix assign repository record button in tasks when one record is selected [SCI-1648] 2017-12-22 18:05:22 +01:00
okriuchykhin
0a6d0d1a47
Merge pull request #918 from okriuchykhin/ok_SCI_1893 
Fix invite users dropdown [SCI-1893]
 2017-12-22 16:58:49 +01:00
Oleksii Kriuchykhin
917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin
afb579bef1 Fix invite users dropdown [SCI-1893] 2017-12-21 16:49:10 +01:00
mlorb
0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin
49ae9bcd55 Fix adding users to a task [SCI-1870] 2017-12-20 13:44:21 +01:00
Oleksii Kriuchykhin
66869fe4cf Fix canvas update [SCI-1871] 2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin
512ee07bde Fix repositories [SCI-1873] 2017-12-19 17:53:45 +01:00
Oleksii Kriuchykhin
1a81a99ff0 Remove Creek XLSX parser gem as it causes conflicts [SCI-1891] 2017-12-19 16:17:11 +01:00
Luka Murn
cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
Zanz2
53561ffd84 Refactored according to PR 2017-12-15 20:39:15 +01:00
mlorb
bd7eda1506 fix failing tests 2017-12-14 14:18:18 +01:00
mlorb
2936770c01 refactor can view team users ATWHO permission 2017-12-14 14:18:18 +01:00
mlorb
5c790287ec refactor again manage user team permissions 2017-12-14 14:18:18 +01:00
mlorb
7c1ae6bc82 refactor manage repository permissions 2017-12-14 14:18:18 +01:00
mlorb
2918a9833d refactor manage repository column permissions 2017-12-14 14:18:18 +01:00
mlorb
3f5e9e60b7 refactor view repository permission 2017-12-14 14:18:18 +01:00
mlorb
079ac7a4d3 refactor manage repository row permissions 2017-12-14 14:18:18 +01:00
mlorb
740ecc674b refactor view repositories permission 2017-12-14 14:18:18 +01:00
mlorb
3ca51f097f refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions 2017-12-14 14:18:17 +01:00
mlorb
e577b363b2 byTheWay fix of Rails 5.1 bug 2017-12-14 14:18:17 +01:00
mlorb
29f9414839 refactor create project permission 2017-12-14 14:18:17 +01:00
mlorb
72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb
b09377cd8d refactor update sample permission 2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6 refactor view/export samples permission 2017-12-14 14:18:16 +01:00
mlorb
0d37f9c85a refactor clone protocol permission 2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
mlorb
806fcbce36 refactor update protocol in repository permission 2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e refactor read protocol in repository permission 2017-12-14 14:18:15 +01:00
mlorb
a3a494c3a2 fix banana: remove dead code which strangely reappeared, probably with some rebasing 2017-12-14 14:18:15 +01:00
mlorb
ccc2451494 refactor create sample permissions 2017-12-14 14:18:15 +01:00
mlorb
43c01b74b1 refactor create protocol permission 2017-12-14 14:18:14 +01:00
mlorb
11a3cd196c add create, update team permission and refactor 422 respond handling in controllers 2017-12-14 14:18:14 +01:00
mlorb
8893fd668d add create, update, delete user_team permission 2017-12-14 14:18:14 +01:00
mlorb
a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +01:00
zmagod
219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin
4ff6e87fed Change invite users to project link to new settings page [SCI-1838] 2017-12-14 11:22:28 +01:00
Oleksii Kriuchykhin
7bdc22ee80 Remove default property [SCI-1865] 2017-12-13 17:28:05 +01:00
Oleksii Kriuchykhin
6986d11cfe Add Flow types for notifications [SCI-1865] 2017-12-13 17:25:25 +01:00
zmagod
249d3d7698 fixes current timezone setup for activities 2017-12-13 16:48:31 +01:00
okriuchykhin
2fa7591f36
Merge pull request #903 from okriuchykhin/ok_SCI_1864 
Rename notifications settings accessor [SCI-1864]
 2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin
baf3151bb0 Fix notification settings accessors [SCI-1864] 2017-12-13 11:59:53 +01:00
zmagod
b106545d31 fixes per @duco 's request 2017-12-13 08:57:50 +01:00
Oleksii Kriuchykhin
ea63864b33 Add icons for different notification types in recent notification dropdown [SCI-1865] 2017-12-12 17:05:08 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step 
Fixes bug with embedded images [SCI-1624]
 2017-12-12 09:53:24 +01:00
Zanz2
1fc8b2a2b2 quick fix un-needed styling 2017-12-10 01:45:47 +01:00
Zanz2
11dc3be9d4 It is now possible to scroll down preview modal 2017-12-10 01:41:21 +01:00
Zanz2
d0a9198408 Fixed the styling 2017-12-10 01:20:08 +01:00
Oleksii Kriuchykhin
6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +01:00
Luka Murn
86ac07c69f
Merge pull request #902 from biosistemika/rails-5.1 
Merge rails-5.1 into decoupling-settings-page
 2017-12-07 09:25:11 +01:00
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747 
Improve server side assets validation display for steps [SCI-1747]
 2017-12-04 14:12:43 +01:00
zmagod
52e5cf7be8 remove unneeded import 2017-12-04 13:27:24 +01:00
zmagod
e01e7bebbf add permissions endpoint on the API 2017-12-04 13:25:48 +01:00
Zanz2
b0012ab936 Simplified repeating method calls 2017-12-03 16:50:06 +01:00
Zanz2
fcbd956d6e Finished code beautification 2017-12-03 01:17:49 +01:00
Zanz2
835ac6910f Code refactor part 1 2017-12-02 00:29:47 +01:00
Zmago Devetak
205d3b3d8f
Merge pull request #894 from ZmagoD/zd_SCI_1650 
Adds task to copy images [fixes SCI-1650]
 2017-12-01 17:32:09 +01:00
zmagod
b6a5ab5e6c fix request 2017-12-01 17:29:46 +01:00
zmagod
52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +01:00
Oleksii Kriuchykhin
373d7e8aa6 Clear selected files after successful upload [SCI-1747] 2017-12-01 11:51:22 +01:00
Oleksii Kriuchykhin
c4fe2b1c11 Fix jsPlumb library loading [SCI-1839] 2017-12-01 10:48:07 +01:00
okriuchykhin
16729ccd7d
Merge pull request #898 from okriuchykhin/ok_SCI_1838 
Fix assignment of users to projects [SCI-1838]
 2017-11-30 11:16:07 +01:00
okriuchykhin
9ed73702c5
Merge pull request #896 from okriuchykhin/ok_SCI_1837 
Fix Ajax calls with redirect [SCI-1837]
 2017-11-30 11:00:26 +01:00
Oleksii Kriuchykhin
194054d973 Fix assignment of users to projects [SCI-1838] 2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin
7bb52191cd Fix Ajax calls with redirect [SCI-1837] 2017-11-29 16:13:28 +01:00
Oleksii Kriuchykhin
745dac09a7 Improve clean-up of dropped files [SCI-1747] 2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin
6964ed2dbb Add initialization of the selectpicker on experiments actions [SCI-1840] 2017-11-28 16:34:30 +01:00
zmagod
7442684846 fix protocol preview, remove unneeded functions, fix copy paste tokens 2017-11-28 14:16:20 +01:00
Oleksii Kriuchykhin
e35031dd9a Small code fixies [SCI-1747] 2017-11-28 11:34:57 +01:00
zmagod
e233fbe1d8 fix image removing from tinymce 2017-11-28 11:01:07 +01:00
Zanz2
bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 
Fixed validations lengths and added workarounds for bugs [SCI-1833]
 2017-11-24 17:55:20 +01:00
zmagod
e69e9f6794 remove unneeded comment and add tiny_mce_asset regex in a constant 2017-11-24 17:04:01 +01:00
zmagod
066c782cd2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step 2017-11-24 16:29:32 +01:00
Zmago Devetak
027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651 
export and import RTE images
 2017-11-24 16:28:28 +01:00
Zmago Devetak
728f656472
update protocols_exporter.rb 2017-11-24 15:23:19 +01:00
Zmago Devetak
3cd7e6fdde
fix open method 2017-11-24 15:19:58 +01:00
Zanz2
0e574b2f15 removed un needed limits 2017-11-24 11:49:57 +01:00
zmagod
d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
Zanz2
e7e37939a9 quick fix to expected result losing html 2017-11-24 11:18:12 +01:00
Zanz2
dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
mlorb
9e7b75a880
Merge pull request #892 from mlorb/ml-sci-1215_v2 
Make background gray for paperclip images [SCI-1215]
 2017-11-23 17:32:09 +01:00
Mojca Lorber
0ffe476a54 make background gray for paperclip images 2017-11-23 14:35:42 +01:00
mlorb
c46d630f0b
Merge pull request #891 from mlorb/ml-sci-1617 
Add copying of TinyMce assets when cloning the protocol [SCI-1617]
 2017-11-23 14:31:29 +01:00
Luka Murn
00fe267a2a Minor codestyle fixes 2017-11-23 11:33:39 +01:00
Zanz2
764e5259d1 Fixed last review, and a bug i found 2017-11-22 23:38:22 +01:00
Mojca Lorber
fe5828fa97 add copying of TinyMce assets when cloning the protocol 2017-11-22 16:47:21 +01:00
zmagod
afbeafb137 adds RTE images import, disables turbolinks on edit step actions 2017-11-22 16:28:14 +01:00
Zanz2
692ed62d6d made case statement nicer 2017-11-21 21:27:19 +01:00
Zanz2
f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
zmagod
91fec89cab adds tiny_mce_assets to protocol export 2017-11-21 16:30:48 +01:00
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Zanz2
8226322e92 Fixed open html tags on truncate 2017-11-21 11:42:42 +01:00
Zanz2
529d988cc3 closing html tags 2017-11-21 11:15:09 +01:00
Zanz2
d8c809ffd0 Reviewed pull request 2017-11-20 23:19:34 +01:00
Zanz2
e943df9176 fixed small rubocop error 2017-11-20 01:02:02 +01:00
Zanz2
cf66d94d45 Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields 2017-11-20 00:59:32 +01:00
Zanz2
99b16f339d New maximums, functions reworked 2017-11-17 15:16:17 +01:00
Zanz2
a6009806c4 Fixed some oversights 2017-11-17 02:56:16 +01:00
Zanz2
fa25a6785b Made the propper files and functionality for the text truncation to function 2017-11-17 02:43:32 +01:00
Zanz2
b2e1623cf1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784 2017-11-16 20:04:12 +01:00
Zanz2
c44465817d Added the functions and put in limitations from my validations files, changed controller name, added some locals 2017-11-16 20:03:44 +01:00
Luka Murn
d715eb06ef Add team & project role-related helper functions to User model 
This will be required later once we start using Canaid.
 2017-11-16 15:50:30 +01:00
Zanz2
1b540a75a1 Fixed to use .megabytes 2017-11-16 15:17:13 +01:00
Zanz2
e782f13a7d Merge branch 'master' of github.com:Zanz2/scinote-web into size_limit_small_SCI-1810 2017-11-16 15:14:01 +01:00
okriuchykhin
42f2d7e685
Merge pull request #883 from okriuchykhin/ok_SCI_1819 
Allow import of the sample with missing non mandatory fields [SCI-1819]
 2017-11-16 11:03:08 +01:00
mlorb
6c80c338e4
Merge pull request #880 from mlorb/ml-sci-1316 
Change text for avatar size on my profile page [SCI-1316]
 2017-11-16 10:43:23 +01:00
Zanz2
41c1193a78 Fixed unit error;Now when comparing file size, both are in bytes 2017-11-16 01:34:38 +01:00
Zanz2
4d65ad59fe
Merge pull request #878 from Zanz2/protocol_description_fix 
Found a bug; i forot to include protocol description in new preview modal
 2017-11-16 01:11:52 +01:00
Oleksii Kriuchykhin
f202687291 Allow import of the sample with missing non mandatory fields [SCI-1819] 2017-11-15 16:40:14 +01:00
Oleksii Kriuchykhin
84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
Mojca Lorber
ff998a6c98 change text for avatar size on my profile page 2017-11-15 14:21:04 +01:00
mlorb
47784e09a8
Merge pull request #867 from mlorb/ml-sci-1434 
Add explanation when copying custom repositories [SCI-1434]
 2017-11-15 11:34:02 +01:00
mlorb
06fc0eac5e
Merge pull request #868 from mlorb/ml-sci-1215 
Fix preview for images with transparent background [SCI-1215]
 2017-11-15 11:28:57 +01:00
mlorb
288e3ddcbd
Merge pull request #877 from mlorb/ml-sci-1190 
Fix bug when removing all keywords in protocol [SCI-1190]
 2017-11-15 11:22:18 +01:00
Zanz2
c3f6c2b34a Found a bug where i forot to include protocol description in preview modal and fixed it 2017-11-14 19:46:51 +01:00
Zanz2
bc00c4a28b
Merge pull request #874 from Zanz2/supported_file_1794 
Made button green and added .json to supported file [SCI-1794]
 2017-11-14 19:12:45 +01:00
Mojca Lorber
c2a5b52767 fix bug when removing all keywords in protocol 2017-11-14 15:04:37 +01:00
Zanz2
6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2
7ec8d7c2b2 Made button green and added .json to supported file 2017-11-14 11:46:19 +01:00
Zanz2
f35ab78849 Added some code to make the two seperate jira issues work together (protocol info and scinote tables 2017-11-14 00:56:39 +01:00
Mojca Lorber
f75a2710d5 fix preview for images with transparent background 2017-11-13 18:03:14 +01:00
Mojca Lorber
be74338d9f add explanation when copying custom repositories 2017-11-13 16:30:42 +01:00
Zmago Devetak
fe128dc53b
Merge pull request #865 from ZmagoD/zd_SCI_1761 
fixes password validations [fixes SCI-1761]
 2017-11-13 13:09:46 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import 
Protocols io import
 2017-11-13 11:53:28 +01:00
Zanz2
b265beb386
Merge pull request #864 from Zanz2/move_desc 
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
 2017-11-13 10:07:01 +01:00
Zanz2
23d3ffa5a4 Fixed PR 2017-11-12 15:48:45 +01:00
Zanz2
e26adc2905 Quick formatting fix 2017-11-12 15:41:50 +01:00
Zanz2
e7384ac38d Code review fixes, made seperate helper file 2017-11-12 15:31:04 +01:00
zmagod
26912a14d6 fixes password validations [fixes SCI-1761] 2017-11-10 12:59:37 +01:00
mlorb
fd743ec2d5 fix error with event not defined and add flowtype to ESLint 2017-11-10 09:30:55 +01:00
Zanz2
fa2c0fe556 merging 2017-11-09 18:55:17 +01:00
mlorb
dfb2689fbf
Merge pull request #860 from mlorb/ml-sci-1730 
Fix team table does not retain the number of teams per page bug [SCI-1730]
 2017-11-09 17:53:19 +01:00
Zanz2
812fa3f1d5 Hopefully this will resolve my merge problems 2017-11-09 17:42:17 +01:00
zmagod
327e27e123 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576 2017-11-09 15:55:10 +01:00
Zanz2
a40a63ae50 Made code more aesthetic 2017-11-09 15:38:06 +01:00
mlorb
b3e39697d5
Merge pull request #857 from mlorb/ml-sci-1575 
Implement login feature integration tests [SCI-1575]
 2017-11-09 13:48:57 +01:00
mlorb
b0fe792f9c fix ESLint class-methods-use-this error 2017-11-09 13:33:41 +01:00
mlorb
c7f5d6ed8c add state for number of teams per page 2017-11-09 13:29:14 +01:00
Zmago Devetak
7386974d64
Merge pull request #850 from ZmagoD/zd_SCI_1731 
add scenic gem, teams datatables sql view
 2017-11-09 11:37:20 +01:00
Zanz2
518eb09110 Deleted un needed error flash 2017-11-09 10:49:44 +01:00
Zanz2
4b837dbe9d Forgot flash fail messagges, now added them for file too big and general error 2017-11-09 10:49:44 +01:00
Zanz2
feb686b4ac Fixed alignement 2017-11-09 10:49:44 +01:00
Zanz2
8b247770ef Added the success flash alert 2017-11-09 10:49:44 +01:00
Zanz2
9086cd8b6b Jira branch code 2017-11-09 10:49:44 +01:00
zmagod
e0b6683a44 create view directory per @Ducz0r 's request 2017-11-09 10:06:53 +01:00
mlorb
4e92065ea0
Merge pull request #855 from mlorb/ml-sci-1633-v2 
Fix bug with import css styles [SCI-1633]
 2017-11-09 09:49:37 +01:00
zmagod
9eac014f1a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-09 09:05:22 +01:00
zmagod
e2af987b80 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568 2017-11-09 08:35:39 +01:00
zmagod
33ebe1f748 integration tests for forgot_password [fixes SCI-1576] 2017-11-08 16:23:52 +01:00
zmagod
b036452d8c adds background worker to cucumber tests 2017-11-08 11:59:01 +01:00
Luka Murn
dfa1c83c9f Merge branch 'lm-add-flow-to-validation' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-add-flow-to-validation 
Conflicts:
	flow-typed/npm/lodash_v4.x.x.js
 2017-11-08 09:33:29 +01:00
Luka Murn
0412c6f283 Update code per @ZmagoD's request 2017-11-07 17:30:15 +01:00
mlorb
157b1968cc implement login's feature integration tests 2017-11-07 17:18:41 +01:00
zmagod
f43492adff trigger an alert to on canvas save if page reload [fixes SCI-1610] 2017-11-07 15:08:26 +01:00
mlorb
df835fccb4 fix bug with import css styles 2017-11-07 11:09:30 +01:00
zmagod
3255d5cf7c code cleanup 2017-11-06 15:37:09 +01:00
zmagod
54e360bb52 fixes team switch 2017-11-06 15:14:17 +01:00
mlorb
126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json 
Scinote protocols IO base branch
 2017-11-06 14:53:01 +01:00
mlorb
bd569b9746 small changes 2017-11-06 11:34:25 +01:00
Zanz2
4354363215 rubocop refactor css 2017-11-03 16:46:03 +01:00
Zanz2
ac26b17ddf Rubocop refactor 2017-11-03 16:45:15 +01:00
Zanz2
aa03a889c7 Fixed PR review 2017-11-03 16:28:15 +01:00
mlorb
21e3c653eb add integration tests for single team feature 2017-11-03 10:48:09 +01:00
zmagod
5bc38414d1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731 2017-11-03 09:56:44 +01:00
Zmago Devetak
460bcd4980
Merge pull request #844 from ZmagoD/zd_SCI_1669 
Refactor all API server calls from react to go through the services
 2017-11-03 09:19:02 +01:00
Zanz2
096ee00e07 removed unnecessary html 2017-11-03 01:28:20 +01:00
Zanz2
6a4c38bbee Fixed table elements render bugs, now renders after shown event 2017-11-03 01:04:50 +01:00
Zmago Devetak
b1f4d578f0
Merge pull request #848 from ZmagoD/zd_SCI_1726_add_team_member_bug_fix 
fixes user invitation button [fixes SCI-1726]
 2017-11-02 16:50:42 +01:00
zmagod
618880aa30 follows @Ducz0r 's remarks 2017-11-02 16:49:09 +01:00
zmagod
e17f945d8a fix typos 2017-11-02 16:41:29 +01:00
zmagod
5ded818291 fixes failing cucumber tests 2017-11-02 16:24:11 +01:00
zmagod
5538805faa Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1669 2017-11-02 14:39:07 +01:00
zmagod
2118b31762 adds about sciNote modal 2017-11-02 13:23:57 +01:00
Luka Murn
329dd4f1b0 Onboard Flow onto validation components. 2017-10-30 14:13:36 +01:00
Zanz2
6fc1afe4c1 Trying to fix this messy table preview 2017-10-30 01:57:42 +01:00
Zanz2
de9a3a1d0d Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly 2017-10-28 23:57:29 +02:00
Zanz2
a167db11da Scinote table elements code 2017-10-28 20:20:19 +02:00
Zanz2
c291caaae3 Debbuging preive hot tables 2017-10-28 16:59:36 +02:00
Zanz2
2413dc251a Added new preview tables code 2017-10-28 02:19:22 +02:00
zmagod
e5a01f7a57 adds integration tests for about sciNote modal 2017-10-27 16:37:42 +02:00
okriuchykhin
2e0bf91467 Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675 
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
 2017-10-27 11:14:39 +02:00
zmagod
3158fc4a8a Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1723 2017-10-27 10:47:10 +02:00
zmagod
e0323a0a46 fixes failing tests 2017-10-27 09:35:39 +02:00
Zanz2
a732c8afa7 Code for protocol repository scinote table elements view 2017-10-26 17:28:27 +02:00
zmagod
3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod
d2ed415a25 Fixes per @okriuchykhin 's request 2017-10-26 10:42:18 +02:00
Zanz2
79e0a11054 Fixed before start and link not displaying in protocol description 2017-10-25 17:39:01 +02:00
Zanz2
a645bcb32d fixed oversight;Changed double quote to single 2017-10-25 17:21:05 +02:00
zmagod
5e6a4bb69a adds environment variable that disables/enables the creation of new team when user sign up 2017-10-25 15:29:04 +02:00
zmagod
c36fcb1fa4 fixes user invitation button [fixes SCI-1726] 2017-10-25 11:31:32 +02:00
Luka Murn
be2c3b807f Merge pull request #845 from Ducz0r/lm-sci-1670 
Input validation extracting to reusable service [SCI-1670]
 2017-10-25 09:42:33 +02:00
Zanz2
19b9da2e83 deleted comment 2017-10-24 19:44:34 +02:00
Zanz2
49501b3d3d Finished review refactor 2017-10-24 19:24:53 +02:00
zmagod
62dfd6a713 adds wait_for_ajax function to cucumber tests [fixes SCI-1723] 2017-10-24 15:39:06 +02:00
Luka Murn
a60e4c28bb Hound is love, Hound is life 2017-10-24 13:58:59 +02:00
Luka Murn
cbe3e67402 Codestyle refactor 2017-10-24 13:57:33 +02:00
Luka Murn
0eea1e3def Fixes per @ZmagoD's request 2017-10-24 13:49:33 +02:00
mlorb
324ecf1bb4 Merge pull request #843 from mlorb/ml-sci-1574 
Add integration test for signup.feature [SCI-1574]
 2017-10-24 10:05:28 +02:00