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
Luka Murn
998519066c
Remove unneeded localized Strings
2017-10-24 10:00:10 +02:00
Luka Murn
823ed75898
Add file validators, refactor a bit
2017-10-24 09:40:55 +02:00
Luka Murn
c026b60790
Update Profile page to use validation
2017-10-23 18:04:20 +02:00
Luka Murn
ceb11c143f
Change edit team name & description modals to use new validation
2017-10-23 17:55:28 +02:00
Luka Murn
463d17ace1
Add first version of reusable validation form elements
...
Implemented on new team page.
2017-10-23 17:55:28 +02:00
zmagod
f76dc29e61
fix change user role [fixes SCI-1669]
2017-10-23 15:48:12 +02:00
zmagod
545cf50993
removes modalContaine, move leaveTeamModal under teams
2017-10-23 15:02:04 +02:00
Luka Murn
82f982e983
Merge branch 'rails-5.1' into decoupling-settings-page
...
Conflicts:
Gemfile
Gemfile.lock
2017-10-23 10:59:10 +02:00
zmagod
7d6d95630d
add flow and fix api request in updateTeamNameModal component
2017-10-23 10:11:39 +02:00
zmagod
7cf43a299a
adds flow in updateTeamDescriptionModal
2017-10-23 09:59:05 +02:00
Luka Murn
6c2c5aff17
Additional fixes required by latest merge from master
2017-10-23 09:51:13 +02:00
Luka Murn
8254153bb9
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
app/models/connection.rb
app/models/experiment.rb
app/models/my_module.rb
2017-10-23 08:57:57 +02:00
Zmago Devetak
a0eaec214b
Merge pull request #821 from ZmagoD/zd_SCI_1572
...
Implement integration test: profile.feature + initial setup
2017-10-20 20:17:37 +02:00
mlorb
550c5ad6f6
add integration test for signup.feature
2017-10-20 14:48:47 +02:00
Zanz2
03e40017e4
Updated local
2017-10-19 19:58:18 +02:00
okriuchykhin
44733fefda
Merge pull request #839 from okriuchykhin/ok_SCI_1609
...
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 16:26:36 +02:00
zmagod
e3e3f4c75d
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-19 16:06:40 +02:00
Zmago Devetak
a677ef06c7
Merge pull request #837 from ZmagoD/zd_SCI_1703
...
adds page titles [fixes SCI-1703]
2017-10-19 15:50:16 +02:00
zmagod
09e4e23e3d
fixes typos
2017-10-19 15:48:21 +02:00
zmagod
7943bfda13
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-19 14:01:26 +02:00
zmagod
5e5d7ea2dd
fix page title locales
2017-10-19 12:50:33 +02:00
zmagod
fb0ba702e1
add HOC for page title
2017-10-19 12:37:17 +02:00
Oleksii Kriuchykhin
631b41cdaa
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 11:38:23 +02:00
zmagod
92061628a0
adds @Ducz0r suggestions
2017-10-19 10:35:53 +02:00
Zanz2
ae9ac46472
Put the two blocks of code into seperate partials
2017-10-19 00:13:35 +02:00
zmagod
063ac4ea0b
increase polling interval [fixes SCI-1705]
2017-10-18 16:35:02 +02:00
zmagod
d324ea3c12
fixes flow error
2017-10-18 16:28:19 +02:00
zmagod
a6ea56540f
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-18 16:21:59 +02:00
zmagod
0a46d50e4b
split custom types in multiple files
2017-10-18 16:14:45 +02:00
Zmago Devetak
6702265b1e
Merge pull request #835 from ZmagoD/zd_SCI_1706
...
disables invite user button if no emails present [fixes SCI-1706]
2017-10-18 15:48:48 +02:00
zmagod
3558e20454
follow @Ducz0r suggestions
2017-10-18 15:37:13 +02:00
zmagod
2f68a90eff
adds page titles [fixes SCI-1703]
2017-10-18 15:23:46 +02:00
mlorb
a7ebaaed87
Merge pull request #824 from mlorb/ml-sci-1700
...
Fixes closing of notification modal window [SCI-1700]
2017-10-18 15:01:59 +02:00
zmagod
d2c3827289
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-18 14:15:28 +02:00
Zmago Devetak
10d5b573ee
Merge pull request #834 from ZmagoD/zd_SCI_1684
...
fixes accept invitation bug [fixes SCI-1684]
2017-10-18 14:10:08 +02:00
Zmago Devetak
fd755eedf0
Merge pull request #832 from ZmagoD/zd_SCI_1560
...
adds label under protocols keywords input [fixes SCI-1560]
2017-10-18 14:06:13 +02:00
zmagod
5afd65d2b1
fixes active tab bug, opt-in flow [fixes SCI-1688]
2017-10-18 13:59:52 +02:00
mlorb
5e9a1408f2
fix banana bug
2017-10-18 13:41:58 +02:00
zmagod
6a5bafd07b
fix hound
2017-10-18 08:42:48 +02:00
zmagod
3179a7abf5
disables invite user button if no emails present [fixes SCI-1706]
2017-10-18 08:37:58 +02:00
Zanz2
67b09adaeb
Fixed last few rubocop errors
2017-10-17 19:43:46 +02:00
Zanz2
6cf775a4b1
Refactored code, made html render on preview too
2017-10-17 19:27:20 +02:00
okriuchykhin
8e90e041b9
Merge pull request #825 from okriuchykhin/ok_SCI_1665
...
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-17 17:26:00 +02:00
zmagod
c554bc5c18
fixes accept invitation bug [fixes SCI-1684]
2017-10-17 16:00:26 +02:00
mlorb
6c6aa53904
add new team to redux
2017-10-17 15:52:18 +02:00
Oleksii Kriuchykhin
cd0aba1896
Change any? to empty? [SCI-1665]
2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin
c8d2ae70fa
Move duplicated code to service [SCI-1665]
2017-10-17 14:46:16 +02:00
zmagod
30d091dc65
adds label under protocols keywords input [fixes SCI-1560]
2017-10-17 14:10:56 +02:00
mlorb
a4a2c79959
Merge pull request #829 from mlorb/ml-sci-1691
...
Fixes some text style and default input values [SCI-1691]
2017-10-17 13:45:07 +02:00
mlorb
67585a4c6e
Merge pull request #827 from mlorb/ml-sci-1702
...
Add search to one team page [SCI-1702]
2017-10-17 13:43:01 +02:00
mlorb
1a15c5fa4f
Merge pull request #823 from mlorb/ml-sci-1636-v2
...
Removes focus from "add team members" button after… [SCI-1636]
2017-10-17 13:28:35 +02:00
mlorb
7f3c34b930
Merge pull request #822 from mlorb/ml-sci-1633
...
Fixes time zone style [SCI-1633]
2017-10-17 13:21:02 +02:00
Luka Murn
4e06b5c397
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
2017-10-17 13:17:49 +02:00
Luka Murn
4d8f2665d3
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
2017-10-17 13:10:02 +02:00
mlorb
21b13f0e2c
fixes some text style and default input values
2017-10-17 10:57:14 +02:00
zmagod
952c4e8195
fixes bug with remove user modal [fixes SCI-1699]
2017-10-17 09:55:04 +02:00
zmagod
6fe48a07ae
fix hound, add custom hook for webpacker:compile
2017-10-16 17:02:35 +02:00
zmagod
c5978f2d86
adds cucumber test for profile page [fixes SCI-1572]
2017-10-16 16:21:52 +02:00
okriuchykhin
66e9e60c9d
Merge pull request #826 from okriuchykhin/ok_SCI_1689
...
Use case insensitive sample types and groups in import [SCI-1689]
2017-10-16 13:32:04 +02:00
mlorb
b92fd6be35
add search to one team page
2017-10-16 13:10:46 +02:00
Luka Murn
2fb2b90da3
Merge pull request #820 from Ducz0r/lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675]
2017-10-16 13:05:43 +02:00
Oleksii Kriuchykhin
d266034406
Use case insensitive sample types and groups in import [SCI-1689]
2017-10-13 17:15:51 +02:00
mlorb
dafa4a6f1f
fixes closing of notification modal window
2017-10-13 10:46:58 +02:00
Zanz2
e72c1bebcb
deleted comments
2017-10-12 19:18:22 +02:00
Zanz2
8d0d6f0502
refactored methods
2017-10-12 19:10:16 +02:00
okriuchykhin
db9a031581
Merge pull request #813 from okriuchykhin/ok_SCI_1642
...
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
Zanz2
21036a1081
Deleted unnecesarry if's
2017-10-12 17:22:02 +02:00
Zanz2
414a15872c
Made seperate method for steps mapping
2017-10-12 17:15:43 +02:00
zmagod
bdc1051cbb
cleanup
2017-10-12 17:05:04 +02:00
zmagod
e5ebedb428
fix errors with polyfill
2017-10-12 16:49:33 +02:00
gazvoda
88f03a0706
Merge pull request #735 from gazvoda/lg-SCI-1249-v2
...
Truncate checklist items in activity modal [fixes SCI-1249]
2017-10-12 15:58:05 +02:00
mlorb
f19c0defd6
remove focus from add team members button after the invite users modal closes
2017-10-12 15:28:00 +02:00
mlorb
ed80d849aa
remove double css file import and move data-tables style to the component
2017-10-12 14:54:40 +02:00
mlorb
6cc3c2df95
fixes time zone styling
2017-10-12 14:45:08 +02:00
Oleksii Kriuchykhin
56f52ebfa7
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-12 14:43:25 +02:00
zmagod
dccf4e34ff
fix cucumber settings
2017-10-12 13:50:48 +02:00
Zanz2
5d667f146e
Moved .js form reset and made a standalone description method
2017-10-11 17:59:09 +02:00
Oleksii Kriuchykhin
9a8e33c6d7
Small fixes [SCI-1642]
2017-10-11 17:24:31 +02:00
zmagod
3740e89ca0
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1572
2017-10-11 15:20:09 +02:00
zmagod
abe0b8adcc
tweak tweak
2017-10-11 15:20:03 +02:00
Luka Murn
fe89b942e7
Add Add-ons page to User -> Settings -> Account
...
Closes SCI-1675.
2017-10-11 14:15:37 +02:00
zmagod
f71ff8589d
changes testing image
2017-10-11 09:51:20 +02:00
okriuchykhin
0d3cb3a129
Merge pull request #814 from okriuchykhin/ok_GIOT_55
...
Remove GIOT sign-in button [GIOT-55]
2017-10-10 17:04:34 +02:00
mlorb
8bd698e5c3
Merge pull request #817 from mlorb/ml-sci-1632
...
Fixes buttons on my profile page [SCI-1632]
2017-10-10 16:30:50 +02:00
mlorb
7ca29b50a2
Merge pull request #816 from mlorb/ml-sci-1636
...
Fixes style errors on one team page [SCI-1636]
2017-10-10 16:23:50 +02:00
Zmago Devetak
e99791bd29
Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration
...
fixes webpack production build
2017-10-10 15:08:28 +02:00
zmagod
f12a645fa3
fix hound
2017-10-10 15:01:25 +02:00
zmagod
f00c36998d
removes unneeded style component
2017-10-10 14:51:46 +02:00
zmagod
a35ba0239a
fixes flow types
2017-10-10 14:48:46 +02:00
Zmago Devetak
d1c3d00c84
Merge pull request #807 from ZmagoD/zd_SCI_1629
...
adds bootstrap and font-awesome in webpacker build fixes the missing …
2017-10-10 14:09:52 +02:00
zmagod
c014742a88
fixes webpack production build
2017-10-10 14:08:23 +02:00
mlorb
fd859d7b7f
fixes buttons on my profile page
2017-10-10 13:25:44 +02:00
mlorb
7dae772822
fixes style errors on one team page
2017-10-10 11:32:13 +02:00
mlorb
25e6eb4511
Merge pull request #812 from mlorb/ml-sci-1634
...
Fix a few style error on All teams page [SCI-1634]
2017-10-09 14:59:57 +02:00
Oleksii Kriuchykhin
f8334b3d5b
Add editable field to task in tasks tree API call [GIOT-44]
2017-10-09 14:38:33 +02:00
mlorb
1049e0730e
implements @ZmagoD comments
2017-10-09 13:59:32 +02:00
Oleksii Kriuchykhin
bd26052110
Remove GIOT sign-in button [GIOT-55]
2017-10-09 11:56:46 +02:00
zmagod
fc585ebe11
refactor GlobalActivitiesModal constructor
2017-10-09 10:58:40 +02:00
zmagod
943339345a
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628
2017-10-09 10:41:36 +02:00
zmagod
2d1c849106
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629
2017-10-09 09:43:29 +02:00
zmagod
d85233cb2c
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566
2017-10-09 09:30:06 +02:00
zmagod
0a8ef8cd9d
removed unneeded import
2017-10-09 09:23:25 +02:00
zmagod
2a64d23a6e
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567
2017-10-09 09:14:58 +02:00
Zanz2
8720222ac2
Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper)
2017-10-07 22:45:01 +02:00
Zanz2
183c93d21b
Refactoring to git review specifications
2017-10-07 22:13:31 +02:00
Zanz2
9655c98566
Github review refactor
2017-10-07 20:47:05 +02:00
Zanz2
3a8092b663
Refactor and threw out useless comments
2017-10-07 18:05:09 +02:00
Zanz2
d52400f741
Refactored code according to review
2017-10-07 17:58:23 +02:00
Zanz2
2b9563ec6d
Added preview text to en.yml
2017-10-07 17:45:23 +02:00
Zanz2
f5b2ad0d34
Refactor github code review
2017-10-07 16:07:04 +02:00
Zanz2
66e5004e60
Changed import text to be inside en.yml, as said in the code review, deleted some blank lines
2017-10-07 15:56:43 +02:00
lenart
de3c18509f
Variable name changes, added comments to code [fixes SCI-1249]
2017-10-06 17:12:15 +02:00
zmagod
811b206392
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1641
2017-10-06 17:05:07 +02:00
zmagod
839eaf8e03
downgrade to react 15 since bootstrap-react is not fully compatible
2017-10-06 17:02:14 +02:00
zmagod
3321fc495c
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628
2017-10-06 15:54:52 +02:00
zmagod
8dfb5e2260
implements @mlorb suggestions
2017-10-06 15:22:01 +02:00
Oleksii Kriuchykhin
6820511ea0
Further canvas optimizations [SCI-1642]
2017-10-06 12:43:27 +02:00
zmagod
c3562e08e9
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566
2017-10-06 10:46:47 +02:00
zmagod
5a31df7204
adds @Ducz0r suggestions
2017-10-06 10:45:22 +02:00
zmagod
dea69014d0
fixes bug with password confirmation
2017-10-06 09:54:17 +02:00
Zanz2
48f03d6dfb
hound blank line fix
2017-10-05 18:41:58 +02:00
Zanz2
fc1cd73e1d
fixed hound blank line
2017-10-05 18:38:44 +02:00
Zanz2
9fd67019e0
Deleted unused file
2017-10-05 18:09:07 +02:00
Zanz2
64b72f4ad4
Fixed a bug, where if the url get query is nil (if you go directly to /protocols, it doesnt get the public type from url, now when it is nil it just defaults to public
2017-10-05 17:31:49 +02:00
Oleksii Kriuchykhin
b26b963e54
Optimize update canvas SQL and remove module group name [SCI-1642]
2017-10-05 16:19:25 +02:00
zmagod
c20f0c2d8a
fixes user_controller specs, adds user model specs for settings
2017-10-05 15:53:05 +02:00
zmagod
a020e23286
follow suggestions of @Ducz0r
2017-10-05 13:56:56 +02:00
zmagod
754627efe7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-10-05 11:08:31 +02:00
zmagod
524e8bffbf
fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567]
2017-10-05 10:07:50 +02:00
mlorb
7db4bd1f5f
fix a few style error on All teams page
2017-10-05 10:05:55 +02:00
mlorb
91e2a6bab2
Merge pull request #787 from mlorb/ml-sci-1561
...
Fix bug with tinyMCE text validaton [SCI-1561]
2017-10-05 08:39:22 +02:00
okriuchykhin
2c5d913048
Merge pull request #804 from okriuchykhin/ok_SCI_1482
...
Improve memory utilization in PDF report generator [SCI-1482]
2017-10-04 17:51:28 +02:00
mlorb
fcea55c2a1
Merge pull request #808 from mlorb/ml-sci-1631
...
Fix rounded style of buttons and fix invite users to a team style errors [SCI-1631]
2017-10-04 14:57:45 +02:00
zmagod
14bae8def5
trigger redirect to root page on team switch [fixes SCI-1641]
2017-10-04 14:42:38 +02:00
zmagod
4380a65caf
fixes activities key [fixes SCI-1628]
2017-10-04 13:45:52 +02:00
zmagod
e9568bcd47
optin flow in activities modal
2017-10-04 11:35:32 +02:00
zmagod
84f279de22
setup flow
2017-10-04 09:16:17 +02:00
mlorb
83f06361f2
fix rounded style of buttons and fix invite users to a team style errors
2017-10-03 17:33:30 +02:00
zmagod
ce6613ac63
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629
2017-10-03 16:05:45 +02:00
zmagod
55332e2957
adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629]
2017-10-03 16:01:33 +02:00
Luka Murn
f8fc2737d5
Merge pull request #803 from Ducz0r/lm-sci-1599
...
Add global flash notifications/alerts [SCI-1599]
2017-10-03 11:15:27 +02:00
Luka Murn
2964579638
Fix Zmago's comments
2017-10-03 11:14:47 +02:00
Luka Murn
8ba7ed5884
Change the generation to be done using Redux (instead of this.window...)
2017-10-02 19:25:04 +02:00
zmagod
ef1025e0ee
fixes hound
2017-10-02 18:11:54 +02:00
zmagod
3dc3ed906f
fixes bug with embedded images [fixes SCI.1624]
2017-10-02 18:06:42 +02:00
zmagod
182e3dcc37
added colors constants
2017-10-02 14:56:49 +02:00
zmagod
edf4443995
added notification alert [fixes SCI-1566]
2017-10-02 14:51:54 +02:00
Oleksii Kriuchykhin
6824f9a8bc
Improve memory utulization in PDF report generator [SCI-1482]
2017-10-02 11:29:22 +02:00
Luka Murn
cbf2e3cc3f
Hound is love, Hound is life
2017-09-28 20:07:11 +02:00
Luka Murn
a0db8fcf9d
Some codestyle fixes
2017-09-28 19:49:25 +02:00
Luka Murn
6951755a92
Add animation, multiple alerts, make them float
2017-09-28 19:39:17 +02:00
zmagod
9de8592858
fixed edit image on hover action
2017-09-28 17:13:04 +02:00
zmagod
f492234f89
fixes hound allerts
2017-09-28 17:00:11 +02:00
zmagod
cb4bacc372
refactor preferences page [fixes SCI-1564]
2017-09-28 16:53:51 +02:00
zmagod
c8c8afdd1d
update react-bootstrap
2017-09-28 15:00:54 +02:00
mlorb
c358f8fa0c
write unit tests for invite users
2017-09-28 14:49:33 +02:00
Luka Murn
f6c7e854ad
Update main application, slight refactor
2017-09-27 17:59:04 +02:00
Luka Murn
a46f50af21
Remove FlashMessages component
2017-09-27 17:34:45 +02:00
Luka Murn
82d672293a
First WIP version of FlashMessages & Alert components
2017-09-27 17:29:04 +02:00
zmagod
26b526d61b
adds getter and setters for user settings
2017-09-27 14:38:52 +02:00
zmagod
66269d68ff
fixed image upload
2017-09-27 09:17:09 +02:00
zmagod
e2aa0d7515
fixes user profile
2017-09-26 17:29:11 +02:00
Zanz2
b23ca33e73
Deleted todo-list comments :D
2017-09-26 16:46:17 +02:00
Zanz2
c72cf6320a
Finished rubocop refactoring
2017-09-26 16:19:09 +02:00
Zanz2
3074acbc0d
Made javascript code nicer
2017-09-26 13:31:24 +02:00
Zanz2
055746bfd9
Rubocop beautified code v2
2017-09-26 13:21:48 +02:00
Zanz2
ad1847256c
Rubocop beautified code
2017-09-26 13:20:55 +02:00
Zanz2
8d961c934a
Rubocop refactored part of the controller code
2017-09-26 13:17:00 +02:00
Zanz2
2bfe8f0b95
Testing why rubocop gives errors
2017-09-25 15:27:24 +02:00
Zanz2
79e065a811
Fixed a mistake in the fix that made it not render the preview
2017-09-25 14:39:43 +02:00
Zanz2
292c1e3c31
Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first
2017-09-25 14:14:27 +02:00
Zanz2
11b2ef3112
Made code nicer, hopefully not unintentionally breaking something
2017-09-25 13:53:32 +02:00
Luka Murn
05e627e976
Fix missing value in delayed_uploader_tutorial
...
Closes OPENSCI-26.
2017-09-22 17:10:53 +02:00
zmagod
1a7f8fc857
added frontend validations
2017-09-22 16:59:38 +02:00
Zanz2
549346bb0a
Deleted a warning that was out of place
2017-09-22 16:13:06 +02:00
Zanz2
dd4d4072e8
Made code more aesthetic
2017-09-22 16:02:56 +02:00
Zanz2
6ebdea5dce
Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)
2017-09-22 15:12:29 +02:00
Zanz2
4051c0b06b
Deleted old unused files i spotted on github
2017-09-22 13:28:38 +02:00
Zanz2
6a07aa28e4
Accidentally removed this line after reviewing git changes, adding it back
2017-09-22 13:11:49 +02:00
Zanz2
deef790951
added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions
2017-09-22 11:56:50 +02:00
mlorb
4ef7b57f31
fix error handeling
2017-09-22 09:57:41 +02:00
mlorb
9d96bf668a
fix error handeling, refactoring
2017-09-21 16:42:56 +02:00
Zanz2
1dbb03e22d
Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer
2017-09-21 16:05:33 +02:00
Zanz2
df8cbc2741
vastly improved protocol preview styling to look more like documentation specifications
2017-09-21 13:46:52 +02:00
zmagod
39025769ec
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-09-21 13:45:27 +02:00
zmagod
ed2beefc08
fixed profile info inputs
2017-09-21 13:42:49 +02:00
mlorb
ac3601bd2e
hound
2017-09-21 10:56:17 +02:00
mlorb
55772a80ab
fix hound and refactor
2017-09-21 10:45:36 +02:00
mlorb
48c8922604
adds invite users modal
2017-09-21 10:45:35 +02:00
Zanz2
8da72eb64a
made code look nicer
2017-09-21 09:29:13 +02:00
Zanz2
f48833c47a
added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();
2017-09-21 08:40:05 +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
5429f6bbbd
Fix @ZmagoD's remarks
2017-09-21 08:06:11 +02:00
Zanz2
d59234a1e3
minor changes, working on refresh after submit
2017-09-20 16:04:52 +02:00
Zanz2
72c707ae88
protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit
2017-09-20 15:31:10 +02:00
zmagod
c636ca4276
refactor user preferences and profile page
2017-09-20 11:17:59 +02:00
Luka Murn
416ccf905d
Minor fix
2017-09-20 10:53:38 +02:00
Zanz2
7b85d74a23
added jquery code to reset file selector selected file after it is canceled in the preview modal
2017-09-20 09:32:31 +02:00
Zanz2
3812b2e64b
Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore
2017-09-20 08:58:00 +02:00
Zanz2
ea8f3e822d
Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone
2017-09-20 08:38:34 +02:00
Luka Murn
6e993f41b8
Indentation error
2017-09-19 16:59:19 +02:00
Luka Murn
869c3593a3
Hound is love, Hound is life
2017-09-19 16:56:39 +02:00
Luka Murn
decdce17fa
Fix rebasing problems
2017-09-19 16:47:55 +02:00
Luka Murn
44877a13a5
Refactor services on backend. New team page is now working
2017-09-19 16:32:21 +02:00
Luka Murn
80c05e50ec
Semi-working version of create new team form
2017-09-19 16:30:26 +02:00
Zanz2
ed64ce814a
i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript
2017-09-19 16:07:54 +02:00
Zanz2
7aba782639
optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show
2017-09-19 15:02:16 +02:00
Luka Murn
df44976fc6
Save input values into component state
2017-09-19 14:07:17 +02:00
Luka Murn
0108d9ea19
Finish new team GUI
2017-09-19 14:04:46 +02:00
Luka Murn
28cb9643d9
Blank new team page with breadcrumbs
2017-09-19 14:04:46 +02:00
zmagod
40af99c57f
fix hound v2
2017-09-19 13:36:51 +02:00
zmagod
8416ccc5c2
fixes hound alerts
2017-09-19 13:33:43 +02:00
zmagod
88928be2d3
fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622]
2017-09-19 13:08:08 +02:00
zmagod
015026926d
refactor
2017-09-18 15:46:24 +02:00
zmagod
f0a8275559
fixes merge conflicts
2017-09-18 15:36:33 +02:00
zmagod
b9492daa69
fixes changeTeam method
2017-09-18 15:16:07 +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
39c9b708bd
Merge pull request #780 from programmertoni/td_SCI_1565
...
Td sci 1565
2017-09-18 11:37:19 +02:00
zmagod
40359c5c73
fixed edit name modal
2017-09-15 16:34:05 +02:00
Zanz2
f861b1fc52
Configured the controller,the main task ahead is to figure out how to import all of the data i have available
2017-09-15 15:52:55 +02:00
zmagod
83647d81b4
adds edit team name modal
2017-09-15 14:00:48 +02:00
Zanz2
d85e02730d
Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc
2017-09-15 12:19:58 +02:00
Zanz2
175aa16a7d
Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this
2017-09-14 15:52:44 +02:00
Zanz2
5d6cc341ed
added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done
2017-09-14 14:42:04 +02:00
zmagod
1a00b53034
adds user_team tests
2017-09-14 13:11:19 +02:00
Toni Dezman
d38f4343f2
Decupling redux part 1
2017-09-14 11:46:49 +02:00
Zanz2
d6d1f9d490
changed second modal preview styling to fit its specifications
2017-09-14 11:46:41 +02:00
Zanz2
29b9d50363
Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer
2017-09-14 11:30:53 +02:00
zmagod
705d07f60e
adds remove team action
2017-09-13 17:11:51 +02:00
Zanz2
9fc91aac32
added protocols io upload preview modal
2017-09-13 16:04:16 +02:00
Zanz2
b7432b336a
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
2017-09-13 15:15:08 +02:00
zmagod
1b3b3dfea9
adds team members update role functionality
2017-09-12 17:30:13 +02:00
Žan Žagar
706031dacb
added model and controler, model should go to services while the controller should go to protocols controller
2017-09-12 15:25:22 +02:00
Žan Žagar
2a7a2b8fa1
Changed some minor button text and fixed a local error
2017-09-12 09:26:22 +02:00
Žan Žagar
62350d0d42
Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later
2017-09-11 16:03:33 +02:00
Žan Žagar
9b640c5df8
Dropdown menu works, need to add backend code for the second button
2017-09-11 15:28:48 +02:00
Žan Žagar
0f4dadefa9
prvi (star gumb) v dropdownu sedaj deluje
2017-09-11 15:23:09 +02:00
Žan Žagar
f668f60237
dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni
2017-09-11 15:22:22 +02:00
Žan Žagar
31e8c107fd
dodav na pravi branch te file
2017-09-11 14:35:00 +02:00
Toni Dezman
1cd9cd92fc
adds global spinner
2017-09-11 14:30:49 +02:00
Jure Grabnar
b4a13dffe3
init commit, dodav na protocols index gumb z dropdown
2017-09-11 13:07:22 +02:00
Mojca Lorber
a0f7030a70
fix bug with tinyMCE text validaton
2017-09-07 14:54:12 +02:00
Toni Dezman
67d617deb5
adds hound_bot's and zmagos suggestions
2017-09-07 13:40:53 +02:00
Mojca Lorber
0e14420193
fix bugs with importing samples
2017-09-06 14:41:14 +02:00
Toni Dezman
185039bc99
adds suggestions from code review
2017-09-04 15:00:26 +02:00
zmagod
9c01ab414c
refactor leave team
2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin
fc0e2d2172
Add validation for uid uniqness [GIOT-29]
2017-09-01 17:00:13 +02:00
Oleksii Kriuchykhin
a927c2832d
Improve error logging [GIOT-31]
2017-09-01 16:36:45 +02:00
zmagod
91d2d8a935
adds team details view
2017-08-31 15:56:55 +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
Oleksii Kriuchykhin
c3fceb90df
Backport API to Rails-4 [SCI-1579]
2017-08-30 13:30:41 +02:00
zmagod
ee054f91b8
adds bullet gem [fixes SCI-1578]
2017-08-30 09:29:45 +02:00
Toni Dezman
c82dfa502a
adds errors in client_api for users_controller
2017-08-29 13:14:52 +02:00
zmagod
ec86691659
fixed tests
2017-08-29 12:04:00 +02:00
zmagod
c54dd9473e
adds controller spec for leave team [fixes SCI-1497]
2017-08-29 11:56:46 +02:00
zmagod
478bd491ff
added pagination and sorting to team tables
2017-08-28 17:05:09 +02:00
zmagod
5ea464b675
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497
2017-08-28 09:36:29 +02:00
zmagod
0cc00f292a
adds leave button to modal
2017-08-28 09:36:21 +02:00
Toni Dezman
ea9a195f09
email and password action/redusers work
2017-08-26 14:07:31 +02:00
Toni Dezman
eb0641d76a
InputEnabled submits form with ENTER
2017-08-26 13:04:36 +02:00
zmagod
7b5b4c957c
adds formated messages in modal
2017-08-25 16:40:23 +02:00
zmagod
db16da7bd6
adds custom query to fetch teams data
2017-08-25 16:07:37 +02:00
Toni Dezman
ccd14f6b50
adds apis for full_name and initials input fields
2017-08-25 14:45:02 +02:00
Toni Dezman
989be6563f
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-25 09:06:38 +02:00
zmagod
34be62a648
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3
2017-08-25 08:58:20 +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
Toni Dezman
4ea4c30e29
extracts route magic strings to routes constants
2017-08-25 08:20:40 +02:00
Toni Dezman
3c6f66ebd3
Merge branch 'decoupling-settings-page' into td_SCI_1494_v2
2017-08-24 10:23:30 +02:00
Toni Dezman
8a7154fa47
changes disabled switches code
2017-08-24 09:37:06 +02:00
Toni Dezman
de5136f9cb
fixes navigation container
2017-08-24 09:22:37 +02:00
Toni Dezman
309e52b806
extracts navigation to <MainNav /> component
2017-08-24 08:56:17 +02:00
Toni Dezman
12db6e790f
removes styles from time-zone and changes clicking on switches
2017-08-24 08:35:55 +02:00
Toni Dezman
b02117ea67
implements code review suggestions
2017-08-23 11:20:10 +02:00
Luka Murn
39bb8ecdab
Fix code
2017-08-23 10:54:54 +02:00
Toni Dezman
1dfd7a0cee
adds i18n and 404 page
2017-08-22 15:54:47 +02:00
zmagod
94403a545c
add labels to navigation items [fixes SCI-1493]
2017-08-22 14:00:28 +02:00
zmagod
3a2a1205e3
style global activities
2017-08-22 13:20:06 +02:00
Toni Dezman
42d5e67581
moves components to nicer folder structure
2017-08-22 12:56:29 +02:00
Toni Dezman
bda9704e10
changess to settings/app.jsx
2017-08-22 10:11:47 +02:00
Toni Dezman
d1583a86f5
adds SettingsProfile
2017-08-22 10:08:16 +02:00
Toni Dezman
b29df328d9
some additional styles
2017-08-22 09:49:23 +02:00
Toni Dezman
dc746cbf6f
a lot of styles for Settings page
2017-08-22 09:49:02 +02:00
Toni Dezman
5352791d46
styles to icons in Notifications
2017-08-22 09:47:36 +02:00
Toni Dezman
3c20ef5fea
fixes TimeZone dropdown position: relative issue
2017-08-22 09:47:20 +02:00
Toni Dezman
3e6d45e82f
adds Notification Switches
2017-08-22 09:46:59 +02:00
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
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
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
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
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
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
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
zmagod
be42cd2204
refactor
2017-08-07 13:51:22 +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
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
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
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
Toni Dezman
9a1cf53046
Merge pull request #758 from programmertoni/td_SCI_1492
...
Td sci 1492
2017-07-29 05:44:47 +02:00
Toni Dezman
f76512f364
adds hound recomendations for react/settings_controller.rb
2017-07-28 12:53:15 +02:00
Matej Zrimšek
07fea16d26
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
2017-07-28 12:01:11 +02:00
Toni Dezman
ffda8b259b
adds Redux and changes to index.jsx page
2017-07-28 10:52:25 +02:00
zmagod
b69ec22dfe
fixes failing tests [fixes SCI-1470]
2017-07-28 10:14:50 +02:00
Toni Dezman
1673d43993
adds react/settings controller and react/layout
2017-07-27 15:26:03 +02:00
Toni Dezman
d781ff9b2d
removes unnecessary code from packs/settings/index.jsx
2017-07-27 14:22:28 +02:00
Toni Dezman
0f4286d5d1
adds Settings index react page
2017-07-27 14:21:27 +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
okriuchykhin
af4b310754
Add ordering for column mappings in repositories
2017-07-26 13:35:54 +02:00
Oleksii Kriuchykhin
6a43483a2f
Fix adding and editing repository items [SCI-1519]
2017-07-26 11:22:26 +02:00
okriuchykhin
38f254ae9b
Merge pull request #749 from ZmagoD/zd_SCI_1487
...
don't hide modal [fixes SCI-1487]
2017-07-25 14:35:10 +02:00
zmagod
dfc8ea7fbf
don't hide modal [fixes SCI-1487]
2017-07-25 14:33:41 +02:00
okriuchykhin
532153b9cb
Merge pull request #747 from okriuchykhin/ok_SCI_101
...
Improve samples import speed [SCI-101]
2017-07-25 14:10:45 +02:00
Oleksii Kriuchykhin
efd03db6db
Further samples import improvement [SCI-101]
2017-07-25 10:56:07 +02:00
Matej Zrimšek
ad0dce921b
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
2017-07-24 18:12:41 +02:00
Oleksii Kriuchykhin
67b0c78593
Improve samples import speed [SCI-101]
2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin
6d56e6b72e
Remove redundant self [SCI-1487]
2017-07-20 11:51:42 +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
Zmago Devetak
77893e6bcb
Merge pull request #743 from ZmagoD/zd_SCI_1483
...
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 12:01:42 +02:00
zmagod
506e47a595
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 09:45:36 +02:00
Oleksii Kriuchykhin
ba35717243
Fix babel and eslint config [SCI-1461]
2017-07-13 14:11:01 +02:00
Mojca Lorber
739f8b5b4e
remove redundant rollback call
2017-07-13 13:49:26 +02:00
Mojca Lorber
ec76873e95
fix sorting by assigned causes ajax error
2017-07-13 11:41:19 +02:00
Oleksii Kriuchykhin
b8e93ee883
Add Webpacker and React [SCI-1461]
2017-07-12 16:41:55 +02:00
Zmago Devetak
69919359f1
Merge pull request #738 from ZmagoD/zd_SCI_1452
...
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-12 14:50:29 +02:00
Nbernot
2a3e830a3c
Merge pull request #732 from biosistemika/business_users
...
Business users [SCI-1428, SCI-1447]
2017-07-11 13:34:56 +02:00
Nbernot
d746ae2549
Removes parentheses around if conditions
2017-07-11 13:33:47 +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
zmagod
baaec67399
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-10 16:22:32 +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
lenart
58e2575c75
Truncate checklist items in activity modal [fixes SCI-1249]
2017-07-07 15:56:16 +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
zmagod
750c82a80f
setup testing tools [fixes SCI-1400]
2017-07-06 09:07:05 +02:00
Nejc Bernot
d917cf3340
Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST
2017-07-05 11:52:36 +02:00
Nejc Bernot
803934e07d
Changes the host for the download and redirect paths
2017-07-05 10:23:10 +02:00
Nejc Bernot
91fe7fe4ad
Changes the completely NOT ruby code
2017-07-04 17:13:59 +02:00
Luka Murn
e3b9c1c644
Woops, almost forgot on this one
2017-07-04 15:00:14 +02:00
Luka Murn
8d68769d09
Hound is Love, Hound is Life
2017-07-04 14:47:58 +02:00
Luka Murn
91cddce8a6
Fixes DEPRECATION WARNING-s for Rails 5.1.2
...
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).
Closes SCI-1427.
2017-07-04 14:35:51 +02:00
Nejc Bernot
bd9904adb3
Adds support for business servers
...
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
2017-07-04 14:27:43 +02:00
Zmago Devetak
53a1dd14b7
Merge pull request #718 from ZmagoD/zd_SCI_1129_v3
...
Fixes error message [fixes SCI-1129]
2017-07-04 11:16:36 +02:00
Zmago Devetak
5f4006fe4a
Merge pull request #723 from ZmagoD/zd_SCI_1408
...
Fixes bugs on canvas [fixes SCI-1408]
2017-07-04 11:16:04 +02:00
okriuchykhin
75c887ce7d
Merge pull request #721 from okriuchykhin/ok_SCI_1412
...
Fix activities [SCI-1412]
2017-07-04 10:59:08 +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
mlorb
1b2884c1b7
Merge pull request #722 from mlorb/ml-sci-1396
...
Fix bugs on projects page [SCI-1396]
2017-07-03 15:37:16 +02:00
Oleksii Kriuchykhin
b234c07c13
Fix datatables [SCI-1409]
2017-07-03 15:33:50 +02:00
zmagod
311270ff49
refactor
2017-07-03 15:32:02 +02:00
Zmago Devetak
76ab8d0d3c
Merge pull request #728 from ZmagoD/testing-addons
...
Testing addons
2017-07-03 15:11:33 +02:00
okriuchykhin
4740564a40
Merge pull request #727 from okriuchykhin/ok_SCI_1445
...
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:55:24 +02:00
Oleksii Kriuchykhin
4c6690e59b
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:53:15 +02:00
lenart
74e723d5d5
Changed data hook name and form id [SCI-1430]
2017-07-03 11:28:35 +02:00
Oleksii Kriuchykhin
5c39b90b2d
Fix activities button misbehaviour with turbolinks [SCI-1412]
2017-06-30 16:33:52 +02:00
zmagod
bc33883c3c
first run fixing addons
2017-06-30 10:23:28 +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
zmagod
68cfac4a38
adds images into assets folder
2017-06-29 11:04:31 +02:00
zmagod
fd13921720
fixes repeat tutorial [fixes SCI-1410]
2017-06-29 11:00:50 +02:00
zmagod
bef5a085c4
Fixes bugs on canvas [fixes SCI-1408]
2017-06-29 10:29:41 +02:00
okriuchykhin
f56e972ce6
Merge pull request #720 from okriuchykhin/ok_SCI_1411
...
Fix global search [SCI-1411]
2017-06-29 09:55:56 +02:00
Mojca Lorber
21b4ba7627
fix bugs on projects page
2017-06-28 17:15:09 +02:00
Oleksii Kriuchykhin
e474cda03a
Fix activities [SCI-1412]
2017-06-28 16:49:50 +02:00
Oleksii Kriuchykhin
21cce4baa0
Fix global search [SCI-1411]
2017-06-28 15:44:18 +02:00
Zmago Devetak
502eb5c211
fixes tabs
2017-06-28 15:40:15 +02:00
zmagod
d8a3fdea20
fixes hound
2017-06-28 15:29:10 +02:00
zmagod
525c9770ac
fixes experiment page [fixes SCI-1395]
2017-06-28 15:21:32 +02:00
zmagod
a9f38962bc
Fixes error message [fixes SCI-1129]
2017-06-28 11:17:50 +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
zmagod
71aa05bb0e
refactor
2017-06-27 14:58:49 +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
okriuchykhin
ee2cc006af
Merge pull request #712 from okriuchykhin/ok_SCI_1404
...
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-27 09:22:43 +02:00
okriuchykhin
8ae479b370
Merge pull request #713 from okriuchykhin/ok_SCI_1399
...
Remove spinner after samples import error [SCI-1399]
2017-06-27 09:22:21 +02:00
Oleksii Kriuchykhin
938896981d
Remove spinner after samples import error [SCI-1399]
2017-06-26 16:51:58 +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
f2f57de264
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin
fc72453a5b
Fix hound warning [SCI-1356]
2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +02:00
zmagod
819f47b450
setup sciNote for Rails 5.1
2017-06-23 15:19:08 +02:00
zmagod
75507107fd
migrate to 4.2.9
2017-06-23 08:50:12 +02:00
Zmago Devetak
f9e04e80b4
Merge pull request #705 from ZmagoD/zd_SCI_1393
...
removes imported repository row if the row value is not valid [fixes …
2017-06-22 17:50:02 +02:00
Zmago Devetak
cffac82e88
Merge pull request #704 from ZmagoD/zd_SCI_1392
...
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 17:47:15 +02:00
Zmago Devetak
514c6c0d53
Merge pull request #706 from ZmagoD/zd_SCI_1385
...
fixes row dupplication [fixes SCI-1385]
2017-06-22 17:47:00 +02:00
zmagod
7367435c6d
refactor
2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19
fix update repository_row
2017-06-22 17:29:17 +02:00
zmagod
590135b9b3
refactor
2017-06-22 17:26:11 +02:00
zmagod
1690d8ebe3
removed reload on hide modal
2017-06-22 16:47:50 +02:00
zmagod
2b2f513366
fixes export pdf error on production
2017-06-22 16:40:50 +02:00
zmagod
e7328c2e20
fixes row dupplication [fixes SCI-1385]
2017-06-22 16:01:37 +02:00
zmagod
703be13fb0
removes imported repository row if the row value is not valid [fixes SCI-1393]
2017-06-22 15:21:36 +02:00
zmagod
a2e1aa5b36
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 14:43:01 +02:00
Mojca Lorber
1ba32e19cb
allign no. of pages and showing entries per page
2017-06-22 14:23:03 +02:00
zmagod
28129ebb73
refactor
2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
18fd5b00ba
fix hound
2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
mz3944
568e41f5fa
Merge pull request #701 from mz3944/mz-SCI-1383
...
Removed empty first column of repository export file [SCI-1383]
2017-06-21 10:57:46 +02:00
Matej Zrimšek
d907819de5
Removed byebug calls. [SCI-1383]
2017-06-21 10:49:00 +02:00
mz3944
d19bfc8fd8
Merge pull request #700 from mz3944/mz-SCI-1386
...
Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]
2017-06-21 10:40:37 +02:00
mz3944
2ad27289c9
Merge pull request #699 from mz3944/mz-SCI-1378
...
Change repository icon on reports [SCI-1378]
2017-06-21 10:40:16 +02:00
mz3944
4d5136270a
Merge pull request #698 from mz3944/mz-SCI-1384
...
Fixed AJAX error when deleting custom columns in repository table [SCI-1384]
2017-06-21 10:39:53 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c
Removed empty first column of repository export file. [SCI-1383]
2017-06-20 18:40:41 +02:00
Matej Zrimšek
ce97d18e78
Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386]
2017-06-20 17:51:51 +02:00
Matej Zrimšek
d49524a26f
Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]
2017-06-20 16:10:50 +02:00
Oleksii Kriuchykhin
115ce91d8d
Handle column mappings in task repository [SCI-1381]
2017-06-20 15:58:52 +02:00
Matej Zrimšek
6c7987681c
Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]
2017-06-20 14:52:41 +02:00
Oleksii Kriuchykhin
9a9f8b9c41
Fix total number of records in task repository [SCI-1381]
2017-06-19 16:45:57 +02:00
mlorb
14429a270c
Merge pull request #689 from mlorb/ml_sci_1354
...
Truncate and display text in tooltip in custom repository fields [SCI-1354]
2017-06-19 15:50:38 +02:00
Mojca Lorber
730c4738d5
fix tooltip in edit mode
2017-06-19 15:49:31 +02:00
Mojca Lorber
39dd6daabb
small fixes
2017-06-19 15:30:38 +02:00
mlorb
122ac7971f
Merge pull request #692 from mlorb/ml_sci_1348
...
Fix cog position on repositories page [SCI-1348]
2017-06-19 15:16:01 +02:00
mlorb
9a7669bf2a
remove empty line
2017-06-19 15:15:27 +02:00
mlorb
ff02c45f5f
Merge pull request #695 from mlorb/ml_sci_1353
...
Retain the same word case in repositories dropdown [SCI-1353]
2017-06-19 14:48:58 +02:00
mlorb
733f6267db
Merge pull request #696 from mlorb/ml_sci_1380
...
Fix ordering of repositories on task [SCI-1380]
2017-06-19 14:28:00 +02:00
mlorb
7cbc8a2f95
Merge pull request #694 from mlorb/ml_sci_1347
...
Fix flash when deleting samples of other users [SCI-1347]
2017-06-19 14:19:57 +02:00
mlorb
beaba6a92b
Merge pull request #693 from mlorb/ml_sci_1351_v3
...
Fix error msg when editing empty cell in repositories [SCI-1351]
2017-06-19 14:19:27 +02:00
zmagod
70fa681519
split the import service
2017-06-19 14:05:37 +02:00
Mojca Lorber
4c3036af87
fix ordering of repositoris on task
2017-06-19 10:53:18 +02:00
Mojca Lorber
f77b1aa4e8
retain the same word case in repositories dropdown
2017-06-19 10:32:12 +02:00
Mojca Lorber
9b941fe374
fix flash when deleting samples of other users
2017-06-16 17:12:04 +02:00
mz3944
e027a871e9
Merge pull request #691 from mz3944/mz-SCI-1357-v2
...
Repository management - filter on custom columns [SCI-1357]
2017-06-16 16:04:47 +02:00
Matej Zrimšek
6b284d8c89
Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357]
2017-06-16 16:02:31 +02:00
mlorb
49ce08f1f5
Merge pull request #688 from mlorb/ml_sci_1375
...
Fix no repository name in activity bug [SCI-1375]
2017-06-16 15:13:42 +02:00
Mojca Lorber
1b683bc70e
fix error msg when editing empty cell in repositories
2017-06-16 15:09:04 +02:00
Matej Zrimšek
1f0eeeaecb
Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357]
2017-06-16 14:31:31 +02:00
okriuchykhin
05ea00a5d3
Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2
...
Fix bug when reordering column to the first position in repositories [SCI-1346]
2017-06-16 14:29:08 +02:00
Mojca Lorber
b6f146f177
fix cog position on repositories page
2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin
94d74b8101
Make assigned column always visible in repositories [SCI-1346]
2017-06-16 11:47:41 +02:00
Mojca Lorber
a195c9a5af
truncate and display text in tooltip in custom repository fields
2017-06-15 15:08:33 +02:00
Luka Murn
3df034ff21
Merge pull request #687 from mz3944/mz-SCI-1357
...
Repository management - filter on custom columns [SCI-1357]
2017-06-15 13:30:42 +02:00
Mojca Lorber
ea455d3596
fix no repository name in activity bug
2017-06-15 09:43:10 +02:00
Matej Zrimšek
bae1e298d7
Fixed repositories search to only search the current repository. [SCI-1357]
2017-06-14 19:49:08 +02:00
Matej Zrimšek
092e82c722
Date search fix for repositories. [SCI-1357]
2017-06-14 19:36:15 +02:00
Matej Zrimšek
e38947b1f8
Minor repository search refactoring. [SCI-1357]
2017-06-14 19:28:53 +02:00
Matej Zrimšek
be4a8d494a
Search functionality added to custom columns of custom repositories. [SCI-1357]
2017-06-14 19:28:12 +02:00
mlorb
6e203d2f15
Merge pull request #685 from mlorb/ml_sci_1373
...
Fix bug with audit trail - ajax error [SCI-1373]
2017-06-14 17:59:34 +02:00
Zmago Devetak
ab24414bfe
Merge pull request #686 from ZmagoD/zd_SCI_1371
...
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:59:24 +02:00
zmagod
5d6fba7153
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:35:41 +02:00
okriuchykhin
374270bb10
Merge pull request #684 from okriuchykhin/ok_SCI_1349
...
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 15:15:03 +02:00
Mojca Lorber
107aa76e55
fix bug with audit trail - ajax error
2017-06-14 14:48:22 +02:00
Oleksii Kriuchykhin
13fdbf8850
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 14:29:59 +02:00
Mojca Lorber
e6ec184dba
fix multiple errors handling on fields in repositories tables
2017-06-14 13:09:23 +02:00
zmagod
2d3b5f4308
refactor
2017-06-14 10:55:24 +02:00
okriuchykhin
da87a41c86
Merge pull request #680 from okriuchykhin/ok_SCI_1365
...
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-14 10:19:09 +02:00
zmagod
6dd85d6c39
fixes drag'n drop bug in results on safari [fixes SCI-1370]
2017-06-14 09:45:49 +02:00
zmagod
cee052fc19
added service object
2017-06-14 09:11:20 +02:00
Matej Zrimšek
cea6d15d3e
Fixed Hound warning. [SCI-1351]
2017-06-13 18:15:47 +02:00
Matej Zrimšek
1bc46fe0cb
Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351]
2017-06-13 18:12:42 +02:00
Mojca Lorber
849b269d87
fix errors in repo table
2017-06-13 16:56:34 +02:00
Oleksii Kriuchykhin
2e98433abc
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-13 16:56:28 +02:00
okriuchykhin
97a94ff4a3
Merge pull request #679 from okriuchykhin/ok_SCI_1345
...
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 15:47:44 +02:00
mlorb
074a47aae1
Merge pull request #675 from mlorb/ml_sci_1272
...
Fix permissions [SCI-1272]
2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin
2d693a3fb7
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 10:33:08 +02:00
Luka Murn
2e2f07bf58
Merge pull request #668 from Ducz0r/lm-sci-1335
...
Fix sidebar for repositories [SCI-1335]
2017-06-13 09:37:33 +02:00
Zmago Devetak
f3f1a68070
Merge pull request #667 from ZmagoD/zd_SCI_1338
...
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-13 09:33:04 +02:00
Zmago Devetak
19adddbfdb
Merge pull request #666 from ZmagoD/zd_SCI_1337
...
truncate long repository names [fixes SCI-1337]
2017-06-13 09:32:43 +02:00
Zmago Devetak
21577cd0e9
Merge pull request #664 from ZmagoD/zd_SCI_1315
...
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-13 09:32:26 +02:00
Oleksii Kriuchykhin
4b0d7acabe
Fix search when viewing only assigned repository records [SCI-1342]
2017-06-13 09:11:27 +02:00
Luka Murn
c3d289291f
Fix case statement
...
Closes SCI-1335.
2017-06-13 09:09:07 +02:00
okriuchykhin
d88de4009a
Merge pull request #674 from okriuchykhin/ok_SCI_1346
...
Fix reordering columns to the first position [SCI-1346]
2017-06-13 09:01:10 +02:00
okriuchykhin
56c3b891a5
Merge pull request #673 from okriuchykhin/ok_SCI_1350
...
Fix row selection info after record deletion [SCI-1350]
2017-06-13 09:00:48 +02:00
okriuchykhin
05c77e7298
Merge pull request #672 from okriuchykhin/ok_SCI_1341
...
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-13 09:00:33 +02:00
mlorb
d0d7dc7468
Merge pull request #677 from mlorb/ml_sci_1344
...
Change custom repositories icon [SCI-1344]
2017-06-13 08:57:22 +02:00
Zmago Devetak
6cdf37041f
Merge pull request #663 from ZmagoD/zd_SCI_1328
...
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-13 08:57:09 +02:00
Luka Murn
28f78a0c6c
Merge pull request #670 from Ducz0r/lm-sci-1340
...
Fix assigned repository rows in task display [SCI-1340]
2017-06-13 08:55:55 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
Mojca Lorber
faa6456e28
change custom repositories icon
2017-06-12 18:00:28 +02:00
Matej Zrimšek
e3db79b3cc
Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275]
2017-06-12 17:49:42 +02:00
Mojca Lorber
9108102b42
fix permissions
2017-06-12 17:34:36 +02:00
Oleksii Kriuchykhin
248fd7be06
Fix reordering columns to the first position [SCI-1346]
2017-06-12 17:16:49 +02:00
Oleksii Kriuchykhin
c081cda5f3
Fix row selection info after record deletion [SCI-1350]
2017-06-12 10:23:18 +02:00
Oleksii Kriuchykhin
aa42ca6b8b
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-12 10:07:16 +02:00
Matej Zrimšek
4ea8972a6c
Fixed rebasing mistake. [SCI-1275]
2017-06-09 19:48:20 +02:00
Matej Zrimšek
514aa6214b
Repository records minor JS refactoring. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
29b721365a
Moved export form to proper place in the code. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
f46d8f6970
Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
773a55ffac
Fixed CSV export of repository records. [SCI-1275]
2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3
Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository
2017-06-09 19:44:28 +02:00
rekonder
ede744849b
Export repository [aj-SCI-1275]
2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
Luka Murn
90ca6d9a76
Fix assigned repository rows in task display
...
Closes SCI-1340.
2017-06-09 13:50:13 +02:00
Luka Murn
481a48c953
Hound is love, Hound is life
2017-06-09 12:51:33 +02:00
Luka Murn
cfb734704e
Fix sidebar for repositories
...
Closes SCI-1335.
2017-06-09 12:49:23 +02:00
zmagod
d1977d0773
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-09 11:42:38 +02:00
zmagod
ee9eaea47c
truncate long repository names [fixes SCI-1337]
2017-06-09 11:20:57 +02:00
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
zmagod
33b996ffee
refactor
2017-06-09 09:49:57 +02:00
Luka Murn
7bb1af3692
Minor JS fix
2017-06-08 15:28:26 +02:00
Luka Murn
c7c3c46d9d
Fix dropdown
2017-06-08 15:26:57 +02:00
Mojca Lorber
be52af4e4f
fix rename/delete/copy modals not working
2017-06-08 15:13:00 +02:00
Mojca Lorber
0004c2b7d5
fix selection of tab after redirection
2017-06-08 14:17:27 +02:00
zmagod
5f8606c9c5
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-08 14:03:06 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +02:00
zmagod
e45c2ce560
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-08 13:41:27 +02:00
Luka Murn
810599bef2
Fix en.yml localization bug
2017-06-08 13:36:37 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f
Merge pull request #659 from Ducz0r/lm-sci-1279
...
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Luka Murn
b94d2c5c03
Implement 'copy' method on Repository object
2017-06-07 18:28:07 +02:00
Luka Murn
0aee11d6d8
Hound is love, Hound is life #2
2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d
Hound is love, Hound is life
2017-06-07 18:22:15 +02:00
Matej Zrimšek
77a225ec31
Added toggle between assigned and all repository records. [SCI-1276]
2017-06-07 18:13:25 +02:00
Luka Murn
9e45d197df
Change some stuff for repos to work, fix some bugs
...
Closes SCI-1279.
2017-06-07 18:07:49 +02:00
Luka Murn
02dd6636ba
Allow saving & editing of reports with repository elements
...
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Luka Murn
b5f6d1da94
Allow custom repositories to be added to reports
2017-06-07 16:54:32 +02:00
Luka Murn
bb20d2661f
Add association between repository rows & my modules
2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin
c18bba9fbe
Fix rebase errors [SCI-1274]
2017-06-07 15:50:22 +02:00
Oleksii Kriuchykhin
ad8dd6d740
PR fixes [SCI-1274]
2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
353c27da15
rename method
2017-06-07 13:51:16 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106
renaming
2017-06-06 15:50:43 +02:00
Mojca Lorber
dde714d78f
fix hound
2017-06-06 13:33:57 +02:00
Mojca Lorber
39dda1ad5d
refactoring
2017-06-06 13:18:44 +02:00
ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d
code changes after rebasing
2017-06-06 11:10:55 +02:00
Mojca Lorber
da98788031
small code fixes
2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
Luka Murn
eb95ec74a3
Merge pull request #654 from Ducz0r/lm-sci-1323
...
Fix bug with protocol preview modal not working in protocol repo [SCI-1323]
2017-06-06 08:02:33 +02:00
Luka Murn
f382c04f01
Refactor JS code a bit
...
Closes SCI-1323.
2017-06-06 08:02:01 +02:00
Luka Murn
62d97f6e64
Merge pull request #655 from Ducz0r/lm-sci-1321
...
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
2017-06-06 07:59:24 +02:00
Luka Murn
f298ec54e7
Code beautification per @zmagod's request
...
Closes SCI-1321.
2017-06-06 07:58:46 +02:00
Matej Zrimšek
afce3010ef
After repository deletion, the next selected repository is the first one. [SCI-1269]
2017-06-05 17:56:09 +02:00
Luka Murn
8c7aebbb88
Fix bug with TinyMCE not working for steps with nil description
...
Closes SCI-1321.
2017-06-05 17:43:03 +02:00
Matej Zrimšek
419d638163
Renamed reposiotry edit and destroy permission helper. [fix 1269]
2017-06-05 17:36:26 +02:00
Luka Murn
1712fc0611
Fix bug with protocol preview modal not working in protocol repo
...
Closes SCI-1323.
2017-06-05 17:10:13 +02:00
mlorb
3dc83cfe05
Merge pull request #650 from mlorb/ml_sci_1286
...
Fix bug with titles truncate in activities [SCI-1286]
2017-06-05 16:27:44 +02:00
Mojca Lorber
27d3a5097b
fix hound
2017-06-05 16:07:21 +02:00
Matej Zrimšek
2c6ad4aa05
Refactored modal popups for repositories to make them general. [fix 1269]
2017-06-05 14:13:24 +02:00
zmagod
ab4961ddb1
adds overlay partial
2017-06-05 11:31:05 +02:00
zmagod
67d902db52
refactor
2017-06-05 10:43:58 +02:00
Matej Zrimšek
5aba15e220
Made repository names case insensitive. [fix 1269]
2017-06-05 10:38:04 +02:00
Matej Zrimšek
f012779780
Renamed before_action for repository edit and destroy action. [fix 1269]
2017-06-05 10:02:16 +02:00
Matej Zrimšek
d8d54232c3
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
2017-06-02 19:08:51 +02:00
Matej Zrimšek
73aaef0949
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
c82fd66146
Removed unneeded utility JS function. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
5c9a453439
Added permissions for deleting and renaming of repositories. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
9a7048cc7a
Code formatting updated for repositories. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
f8258812ef
Repository remove and rename refactoring. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
21a72da84f
Added rename logic and improved remove logic. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
cdaac6a01b
Added remove repository modal logic. [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
791bb934ca
Remove repository modal logic (WIP). [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
b92a760a5c
Added dropdown GUI for editing repository. [SCI-1269]
2017-06-02 17:47:28 +02:00
zmagod
1c021b11db
adds drag and drop files upload to steps [fixes SCI-1310]
2017-06-02 16:34:09 +02:00
ajugo
a9bd86352d
Step: wrong last columns of table [fixes SCI-405] ( #600 )
...
* Step: wrong last two columns of table after add table results [fixes SCI-405]
* Changing double quotes to single
* Adding empty line back
2017-06-01 15:52:02 +02:00
Mojca Lorber
7c2b657b0e
fix bug with special characters when truncating activities titles
2017-06-01 15:10:26 +02:00
Mojca Lorber
d88b21fb5e
truncate all titles in activities
2017-06-01 15:09:01 +02:00
okriuchykhin
c88fc84538
Merge pull request #633 from okriuchykhin/ok_SCI_960_v2
...
Add smart annotations in sample info modal [SCI-960]
2017-05-31 11:31:14 +02:00
Luka Murn
fcc3995049
Merge pull request #647 from biosistemika/master
...
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
zmagod
6e1f93dd11
minor fix
2017-05-29 14:47:05 +02:00
zmagod
b527afd12b
generates samples csv file in background job [fixes SCI-1278]
2017-05-29 14:42:55 +02:00
mz3944
689587c4fc
Merge pull request #643 from mz3944/mz-SCI-1305
...
Handled user removal from the team for user smart annotation [fixes SCI-1305]
2017-05-29 12:52:19 +02:00
Zmago Devetak
1df6265326
Merge pull request #627 from ZmagoD/zd_SCI_1280
...
prevent to duplicate new step [fixes SCI-1280]
2017-05-29 09:55:22 +02:00
mz3944
d83dcac894
Merge pull request #642 from mz3944/mz-SCI-1291
...
Fixed permission error while cloning workflows. [fixes SCI-1291]
2017-05-29 09:53:33 +02:00
zmagod
5806cb8e67
removes unneeded animateSpinner call
2017-05-29 09:10:11 +02:00
Matej Zrimšek
19ffd77d32
Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]
2017-05-26 18:14:15 +02:00
Matej Zrimšek
853096634d
Fixed permission error while cloning workflows. [fixes SCI-1291]
2017-05-26 11:14:50 +02:00
Oleksii Kriuchykhin
157b1630b9
Add missing include for sinitize_input [SCI-1309]
2017-05-25 16:28:06 +02:00
Mojca Lorber
c3051421b2
change truncate function
2017-05-25 11:01:24 +02:00
Mojca Lorber
8540f88b7e
small fix - renaming of ids and hrefs
2017-05-25 10:06:48 +02:00
Oleksii Kriuchykhin
7310763184
Add missing include [SCI-1306]
2017-05-25 08:57:50 +02:00
mlorb
58ac457d38
fix merge bug
2017-05-23 11:32:02 +02:00
mlorb
872f712be8
Merge branch 'custom-repositories' into ml_sci_1266_v2
2017-05-23 11:05:25 +02:00
mz3944
6b8c8deb16
Merge pull request #634 from mz3944/mz-SCI-414
...
Uncompleted steps not added to Reports
2017-05-23 09:58:05 +02:00
mz3944
9fe3b717c8
Merge pull request #626 from mz3944/mz-SCI-487
...
Simplify "Add contents to report" popup
2017-05-23 09:57:39 +02:00
Oleksii Kriuchykhin
b223646f07
Small improvements [SCI-1273]
2017-05-23 08:53:53 +02:00
Mojca Lorber
a716a0b1db
change breadcrumbs on protocol managements page
2017-05-22 17:58:42 +02:00
Mojca Lorber
9ae615264d
add global repositories screen - tab control
2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin
e99e3edb7b
Add repositories dropdown to task navigation [SCI-1273]
2017-05-18 14:21:00 +02:00
ajugo
1abaefce4f
At importing large sample file, error flash message appears [fixes SCI-903] ( #625 )
...
* At importing large sample file, error flash message appears [fixes SCI-903]
* Changing double quotes to single
* Adding animatedSpinner
2017-05-18 09:19:44 +02:00
Matej Zrimšek
20265ddd69
Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]
2017-05-17 18:18:57 +02:00
Oleksii Kriuchykhin
bbf6d38c50
Fix error handling in result_assets [SCI-1288]
2017-05-17 15:14:35 +02:00
Matej Zrimšek
f78c80b148
Added possibility to add uncompleted steps to report. [closes SCI-414]
2017-05-17 13:25:21 +02:00
Oleksii Kriuchykhin
7f713b4293
Add smart annotations in sample info modal [SCI-960]
2017-05-17 13:06:21 +02:00
Oleksii Kriuchykhin
85e81e9ea2
Improve repository models and migration [SCI-1267]
2017-05-17 10:04:07 +02:00
Oleksii Kriuchykhin
f28df506f9
Fix bug in counting search results for assets [SCI-1284]
2017-05-17 09:08:40 +02:00
Oleksii Kriuchykhin
0dc0c7d096
Add validation of text_value length [SCI-1267]
2017-05-16 15:57:21 +02:00
Oleksii Kriuchykhin
72a651c7de
Add migrations and models for custom repositories [SCI-1267]
2017-05-16 15:27:36 +02:00
zmagod
b21923cf98
prevent to duplicate new step [fixes SCI-1280]
2017-05-16 11:52:07 +02:00
gazvoda
f6bd39ec70
Merge pull request #604 from gazvoda/lg-SCI-1145
...
Added migration to remove updated_at from Activity [fixes SCI-1145]
2017-05-16 08:49:10 +01:00
Matej Zrimšek
2c6f888cbc
Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]
2017-05-15 18:56:41 +02:00
Matej Zrimšek
79ec3b5e4c
Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
901558c733
Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
ba693c65a8
Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
dbb79ebab1
Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Matej Zrimšek
b97cb91840
Refactoring of modal for adding content to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Matej Zrimšek
27cfd55ea5
Simplified popup modal for adding contents to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Zmago Devetak
18e11fde59
Merge pull request #616 from ZmagoD/zd_SCI_1248
...
Prevent double input fields (results)
2017-05-15 16:27:03 +02:00
Zmago Devetak
39203a16f4
Merge pull request #622 from ZmagoD/zd_SCI_1261
...
fixes remove user action on project [fixes SCI-1261]
2017-05-15 15:28:39 +02:00
Zmago Devetak
a151bbdd7d
Merge pull request #623 from ZmagoD/zd_SCI_974
...
adds persistence to experiments order in project overview [fixes SCI-…
2017-05-15 15:28:18 +02:00
zmagod
9bec7dd96e
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248
2017-05-15 14:49:37 +02:00
okriuchykhin
16325db1c6
Merge pull request #621 from okriuchykhin/ok_SCI_1263
...
Fix sorting in reports [SCI-1263]
2017-05-15 09:57:35 +02:00
zmagod
c35e2a4860
adds persistence to experiments order in project overview [fixes SCI-974]
2017-05-15 09:54:37 +02:00
okriuchykhin
9f9691de59
Merge pull request #620 from okriuchykhin/ok_SCI_452
...
Disable turbolinks on search links to fix JS errors [SCI-452]
2017-05-12 17:02:29 +02:00
okriuchykhin
8e523782d9
Merge pull request #619 from okriuchykhin/ok_SCI_617
...
Fixes error when cloning experiments with long names [SCI-617]
2017-05-12 16:53:38 +02:00
okriuchykhin
a8bbc3c3ba
Merge pull request #615 from okriuchykhin/ok_SCI_1008
...
Fix task and step ordering in reports [SCI-1008]
2017-05-12 16:44:57 +02:00
zmagod
b6367981c7
fixes remove user action on project [fixes SCI-1261]
2017-05-12 16:18:53 +02:00
Oleksii Kriuchykhin
5a2d618b1d
Fix sorting in reports [SCI-1263]
2017-05-12 16:04:19 +02:00
zmagod
d34b2520b5
refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]
2017-05-12 15:59:58 +02:00
Oleksii Kriuchykhin
ad39d09a53
Disable turbolinks on search links to fix JS errors [SCI-452]
2017-05-12 13:23:29 +02:00
Oleksii Kriuchykhin
79efb34191
Fixes error when clonning experiments with long names [SCI-617]
2017-05-12 11:07:11 +02:00
Zmago Devetak
0dc4addd6c
fix typo
2017-05-12 10:10:50 +02:00
zmagod
070a829c49
change new results hendlers
2017-05-12 10:02:33 +02:00
Oleksii Kriuchykhin
bb8c7c342c
Add additional info to samples info modal [SCI-960]
2017-05-11 22:20:06 +02:00
zmagod
81a3cb0a41
adds results js code in modules
2017-05-11 16:54:28 +02:00
Oleksii Kriuchykhin
5d55720aad
Fix steps ordering in reports [SCI-1008]
2017-05-11 15:56:33 +02:00
Oleksii Kriuchykhin
0ef9c7eff6
Fix task ordering in reports [SCI-1008]
2017-05-11 15:30:19 +02:00
okriuchykhin
ab0d882be1
Merge pull request #614 from okriuchykhin/ok_SCI_1254
...
Fix step actions in reports [SCI-1254]
2017-05-11 14:44:36 +02:00
Zmago Devetak
9911c0d148
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
...
replace all ActionController::Base.helpers.sanitize calls with custom…
2017-05-11 14:30:26 +02:00
Oleksii Kriuchykhin
fe134419a3
Fix step actions in reports [SCI-1254]
2017-05-11 13:51:43 +02:00
mlorb
219921ee33
Merge pull request #612 from mlorb/ml_sci_1250
...
Fix sample page bugs when editing column name [SCI-1250]
2017-05-11 13:48:20 +02:00
okriuchykhin
328c9292b1
Merge pull request #606 from okriuchykhin/ok_SCI_1235
...
Fix error messages display during file upload in steps and results [SCI-1235]
2017-05-11 13:00:36 +02:00
zmagod
80a0af8c9f
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
2017-05-11 11:36:47 +02:00
Mojca Lorber
86bc6adc2a
fix lost column updated name at sample page and bug with another user not able to view column dropdown
2017-05-11 11:16:12 +02:00
okriuchykhin
f239238064
Merge pull request #611 from okriuchykhin/ok_SCI_1252
...
Fix root_url method unavailable in application_helper [SCI-1252]
2017-05-11 11:15:00 +02:00
okriuchykhin
15f19b73fb
Merge pull request #610 from okriuchykhin/ok_SCI_1253
...
Add notifications counter badge to project card [SCI-1253]
2017-05-11 11:11:09 +02:00
okriuchykhin
000ca26452
Merge pull request #607 from okriuchykhin/ok_SCI_1243
...
Add specific classes to task card for analytics [SCI-1243]
2017-05-11 11:10:05 +02:00
osboxes.org
8c83b3a196
Added updated_at values and unnecessary migration rollback [fixes SCI-1145]
2017-05-11 11:08:36 +02:00
Oleksii Kriuchykhin
229693ec61
Fix root_url method unavailable in application_helper [SCI-1252]
2017-05-10 18:15:08 +02:00
Oleksii Kriuchykhin
a5926726ce
Add notifications counter badge to project card [SCI-1253]
2017-05-10 17:28:37 +02:00
Zmago Devetak
cb79a405c3
Merge pull request #609 from ZmagoD/zd_SCI_1248_v2
...
fixes input sanitize method [fixes SCI-1248]
2017-05-10 15:36:57 +02:00
zmagod
511f39e093
add constants
2017-05-10 15:33:33 +02:00
zmagod
2081e0a94b
Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1
2017-05-10 15:14:17 +02:00
zmagod
10db322307
fixes input sanitize method [fixes SCI-1248]
2017-05-10 14:57:11 +02:00
zmagod
a4032f5cc6
first run
2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin
08e7f09d07
Add specific classes to task card for analytics [SCI-1243]
2017-05-10 10:33:34 +02:00
okriuchykhin
f46c0dfaef
Merge pull request #603 from okriuchykhin/ok_SCI_152_v2
...
Improve view of badges on experiment canvas [SCI-152]
2017-05-10 09:46:02 +02:00
Zmago Devetak
ff0f85fce8
Merge pull request #592 from ZmagoD/zd_SCI_160
...
removes TempFile after 7 days [fixes SCI-160]
2017-05-10 09:32:18 +02:00
Zmago Devetak
13570ba5cb
Merge pull request #602 from ZmagoD/zd_SCI_1247
...
fixes pdf export and image size [fixes SCI-1247]
2017-05-10 09:31:55 +02:00
Oleksii Kriuchykhin
52ad5ecdc2
Fix error messages display during file upload in steps and results [SCI-1235]
2017-05-09 17:13:47 +02:00
Zmago Devetak
cd503580b2
Merge pull request #599 from ZmagoD/zd_SCI_1241
...
fix samples bug [SCI-1241]
2017-05-09 15:55:43 +02:00
mlorb
078eb7789f
Merge pull request #605 from mlorb/ml_sci_fix_bug_with_avatar_in_system_log
...
Fix bug with avatar in system log
2017-05-09 14:57:07 +02:00
Mojca Lorber
7ca62a16bb
fix hound
2017-05-09 14:55:23 +02:00
Mojca Lorber
e1475fbfef
fix bug with avatar in system log
2017-05-09 14:40:02 +02:00
Oleksii Kriuchykhin
620a989a2f
Improve view of badges on experiment canvas [SCI-152]
2017-05-09 14:07:23 +02:00
zmagod
04ee24d553
refactor
2017-05-09 14:05:21 +02:00
zmagod
2d69896897
fixes pdf export and image size [fixes SCI-1247]
2017-05-09 13:59:59 +02:00
zmagod
df13478186
fix samples bug [SCI-1241]
2017-05-09 11:25:00 +02:00
okriuchykhin
ccc640f2bc
Merge pull request #593 from okriuchykhin/ok_SCI_1158
...
Add advanced search options [SCI-1158]
2017-05-09 10:23:34 +02:00
okriuchykhin
bd0b930382
Merge pull request #598 from okriuchykhin/ok_SCI_152
...
Add counters for users and comments on canvas [SCI-152]
2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin
7a61f5813c
Add comments to the code [SCI-152]
2017-05-09 10:22:01 +02:00
Oleksii Kriuchykhin
bd5a48b9c8
Improve code style [SCI-1158]
2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin
344b9c290a
Add counters for users and comments on canvas [SCI-152]
2017-05-08 17:32:55 +02:00
okriuchykhin
f292dab3b5
Merge pull request #594 from okriuchykhin/ok_SCI_1029_v2
...
Change color of loading animation in reports [SCI-1029]
2017-05-08 13:35:00 +02:00
Zmago Devetak
4b816f5322
Merge pull request #568 from ZmagoD/zd_SCI_1119
...
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
zmagod
d6f303581f
refactor
2017-05-08 12:56:33 +02:00
Oleksii Kriuchykhin
3f60439948
Change color of loading animation in reports [SCI-1029]
2017-05-08 11:02:51 +02:00
ajugo
2973ead765
Missing files, comments, checklist in steps [fixes SCI-1224] ( #591 )
...
* Missing files, comments, checklist in steps [fixes SCI-1224]
* Code fixes
2017-05-08 10:44:15 +02:00
Zmago Devetak
e47bf8f013
Merge pull request #582 from ZmagoD/zd_SCI_1051
...
fix reports pdf for user annotation [SCI-1051]
2017-05-08 10:24:40 +02:00
Oleksii Kriuchykhin
a3f847a232
Fix hound [SCI-1158]
2017-05-08 10:22:54 +02:00
Oleksii Kriuchykhin
0ee7e11620
Add advanced search options [SCI-1158]
2017-05-05 16:41:23 +02:00
mlorb
4c85ac7bf5
Merge pull request #588 from mlorb/ml_sci_191
...
Add information how many samples are selected [SCI-191]
2017-05-05 15:24:16 +02:00
Zmago Devetak
de3d1172c1
Merge pull request #584 from ZmagoD/zd_SCI_1200
...
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-05 14:57:27 +02:00
Zmago Devetak
28042d11e1
Merge pull request #589 from ZmagoD/zd_SCI_488
...
adds label to step in report [fixes SCI-488]
2017-05-05 14:56:01 +02:00
zmagod
f079a097c5
removes TempFile after 7 days [fixes SCI-160]
2017-05-05 14:54:22 +02:00
Zmago Devetak
f3415abe3e
Merge pull request #587 from ZmagoD/zd_SCI_1233
...
fixes bug with empty checklist item [fixes SCI-1233]
2017-05-05 10:11:52 +02:00
zmagod
b22350136f
adds label to step in report [fixes SCI-488]
2017-05-05 09:45:18 +02:00
Mojca Lorber
45baba1803
fix zmago the hound
2017-05-04 16:46:52 +02:00
Mojca Lorber
ad9497a638
add information how many samples are selected
2017-05-04 16:30:29 +02:00
zmagod
f784844472
fixes bug with empty checklist item [fixes SCI-1233]
2017-05-04 16:15:00 +02:00
zmagod
8d0c22327b
adds asc order to checklists [fixes SCI-1228]
2017-05-04 15:17:34 +02:00
zmagod
acc5594f1b
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-04 12:41:22 +02:00
Mojca Lorber
f8f6a5f63a
fix bug edit canvas not working and fix positioning of cloned task/workflow
2017-05-04 10:54:50 +02:00
zmagod
289a148332
refactor
2017-05-03 15:33:23 +02:00
zmagod
5b58824ec0
refactor
2017-05-03 15:30:08 +02:00
ajugo
41df727e57
Merge pull request #569 from rekonder/aj-SCI-1130
...
Fix error with close on reports
2017-05-03 12:27:42 +02:00
ajugo
081aa4aea7
Merge pull request #570 from rekonder/aj-SCI-1088
...
My profile - avatar size fix [SCI-1088]
2017-05-03 12:27:05 +02:00
Zmago Devetak
cc6c2942c2
Merge pull request #574 from ZmagoD/zd_SCI_1194_v2
...
prevent to get nil as a param in checklist_item_annotation method [fi…
2017-05-03 10:56:21 +02:00
zmagod
d5abb52909
refactor
2017-05-03 10:55:11 +02:00
zmagod
1b618e88e5
fix reports pdf for user annotation [SCI-1051]
2017-05-03 10:50:43 +02:00
mz3944
ca72133e2b
Merge pull request #579 from gazvoda/lg-SCI-1214
...
Tab Teams is highlighted when in Audit trails [fixes SCI-1214]
2017-04-28 12:08:32 +02:00
osboxes.org
21a39fc704
Code indentation corrected [fixes SCI-1214]
2017-04-28 10:31:14 +01:00
osboxes.org
f72802f9f2
Tab Teams is highlighted when in Audit trails [fixes SCI-1214]
2017-04-26 16:31:44 +01:00
okriuchykhin
dbd9da916b
Merge pull request #577 from okriuchykhin/ok_SCI_1029
...
Change color of turbolinks progress bar [SCI-1029]
2017-04-26 15:05:44 +02:00
Oleksii Kriuchykhin
d3fb688fce
Change color of turbolinks progress bar [SCI-1029]
2017-04-26 15:04:29 +02:00
okriuchykhin
3735bbb0f8
Merge pull request #578 from okriuchykhin/ok_SCI_1128
...
Fix dowload of export zip files from local storage [SCI-1128]
2017-04-26 13:44:30 +02:00
okriuchykhin
5ec41c0d0a
Merge pull request #576 from okriuchykhin/ok_SCI_763
...
Add additional sanitization to search parameters in datatables [SCI-763]
2017-04-26 13:44:15 +02:00
Zmago Devetak
9704b3ffd4
Merge pull request #572 from ZmagoD/zd_SCI_1192_ver2
...
make search for users case insensitive [fixes SCI-1192]
2017-04-26 13:34:16 +02:00
zmagod
0e383109a1
refactor query
2017-04-26 13:32:03 +02:00
Oleksii Kriuchykhin
cf7d0ea248
Fix dowloand of export zip files from local storage [SCI-1128]
2017-04-26 13:23:30 +02:00
Oleksii Kriuchykhin
9055894d07
Add additional sanitization to search parameters in datatables [SCI-763]
2017-04-25 17:37:42 +02:00
zmagod
0456393317
prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194]
2017-04-25 16:22:10 +02:00
Matej Zrimšek
8ad52354eb
Used locales instead of hardcoded values for intro.js tutorial popup.
2017-04-25 16:03:50 +02:00
Matej Zrimšek
e8bc9542cc
Removed some unneeded intro.js tutorial code.
2017-04-25 16:03:50 +02:00
Matej Zrimšek
a6573bd508
Next button is now always focused when navigating through tutorial steps. [fixes SCI-719]
2017-04-25 16:03:50 +02:00
Matej Zrimšek
a5cffd06f3
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
2017-04-25 16:03:50 +02:00
zmagod
615bbb9967
make search for users case insensitive [fixes SCI-1192]
2017-04-25 15:33:51 +02:00
mlorb
b930af0033
Merge pull request #571 from mlorb/ml_sci_316
...
Remove behavior of not allowing the empty tables in steps [SCI-316]
2017-04-25 15:30:30 +02:00
Luka Murn
92159b734f
Merge pull request #559 from Ducz0r/lm-sci-1175-fix
...
Fix encoding when cloning tables [SCI-1175]
2017-04-25 14:38:34 +02:00
zmagod
ed24448817
adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203]
2017-04-25 14:24:05 +02:00
zmagod
1fefeee3d1
adds team space related methods
2017-04-25 13:44:31 +02:00
Mojca Lorber
49574e7a06
remove behavior of not allowing the empty tables in steps
2017-04-25 10:21:16 +02:00
rekonder
b93edac3b9
My profile - avatar size fixes [SCI-1088]
2017-04-25 10:02:00 +02:00
zmagod
86c6ae3b03
display tinyMCE images in reports
2017-04-25 09:53:35 +02:00
zmagod
66f43803c0
refactor, fix user annotation bug
2017-04-24 16:22:25 +02:00
rekonder
dc46a7b650
Fix error with close on reports
2017-04-24 16:02:30 +02:00
zmagod
55c8c498e2
add image upload functionality to result text
2017-04-24 12:28:27 +02:00
mlorb
54f1c7b3e8
Merge pull request #566 from mlorb/ml_sci_365
...
New experiment redirection [SCI-365]
2017-04-24 08:55:55 +02:00
zmagod
550f563666
working version for steps first run
2017-04-21 16:09:04 +02:00
Mojca Lorber
3aa1225e16
fix hound
2017-04-20 18:14:12 +02:00
Mojca Lorber
cf00ecd62e
new experiment redirection
2017-04-20 17:55:28 +02:00
Mojca Lorber
0bae4657f6
add experiment level to user smart annotation notification
2017-04-20 13:21:02 +02:00
Mojca Lorber
b1e939e715
add experiment to activities
2017-04-20 13:16:11 +02:00
Mojca Lorber
c13b8ab270
styling
2017-04-20 13:16:11 +02:00
Mojca Lorber
1606e2163c
add experiment level to notifications
2017-04-20 13:16:11 +02:00
Matej Zrimšek
314e8fcbd2
Added :inverse_of reference for all specific comment models. [fixes SCI-1207]
2017-04-19 23:38:23 +02:00
zmagod
0757563d02
adds step tiny_mce asset relation
2017-04-19 17:22:57 +02:00
mz3944
a0b5a94d67
Merge pull request #564 from mz3944/mz-SCI-856
...
Case insensitive email invitation
2017-04-19 09:36:46 +02:00
zmagod
37be04c09c
add tiny_mce controller
2017-04-19 09:13:16 +02:00
zmagod
c25df63a14
add tinymce img importer and refactor input sanitize helper
2017-04-19 09:11:52 +02:00
Luka Murn
9479b65140
Hopefully fixes the encoding issues with audit trails
...
Closes SCI-1175.
2017-04-19 08:35:04 +02:00
Matej Zrimšek
bafdbf4082
Email is now case insensitive when inviting users by it. [fixes SCI-856]
2017-04-18 18:01:29 +02:00
Matej Zrimšek
57b6b9402d
Experiment description is inside of box for every supported browser. [fixes SCI-860]
2017-04-18 16:44:01 +02:00
Luka Murn
6a7e383316
Please the Hound
2017-04-18 15:38:11 +02:00
mz3944
0ebf294844
Merge pull request #562 from mz3944/mz-SCI-1187
...
Added general locale for cases when a name is optional and is not spe…
2017-04-18 15:26:35 +02:00
Matej Zrimšek
a889174938
Name of result tables should be nil, as it can't be specified. [fixes SCI-1187]
2017-04-18 15:08:13 +02:00
okriuchykhin
3d805d529d
Merge pull request #554 from okriuchykhin/ok_SCI_877
...
Add image preview to protocol repository [SCI-877]
2017-04-18 08:58:39 +02:00
Oleksii Kriuchykhin
4fac6484b5
Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]
2017-04-14 16:05:35 +02:00
Zmago Devetak
e1a30cc17c
Merge pull request #558 from ZmagoD/zd_SCI_1192
...
fixes broken users search method for smart annotation [fixes SCI-1192]
2017-04-14 15:38:33 +02:00
zmagod
8af3858209
fix hound
2017-04-14 11:13:58 +02:00
Luka Murn
9c28608fbf
Fix encoding when cloning tables
...
Closes SCI-1175.
2017-04-13 17:00:27 +02:00
zmagod
9ee971c24b
fixes broken users search method for smart annotation [fixes SCI-1192]
2017-04-13 16:14:12 +02:00
Zmago Devetak
cb1ad9e0be
Merge pull request #555 from ZmagoD/zd_SCI_1103
...
adds additional explanations [fixes SCI-1103]
2017-04-13 15:15:08 +02:00
zmagod
0987cf8abc
fixes hound alerts
2017-04-13 14:55:18 +02:00
Zmago Devetak
40af0df882
Merge pull request #551 from ZmagoD/zd_SCI_1189
...
fixes the user_name field in csv export [fixes SCI-1189]
2017-04-13 14:36:44 +02:00
zmagod
a6183af63d
fix method_missing again
2017-04-13 14:34:58 +02:00
mlorb
ddc0e86c92
Merge pull request #556 from mlorb/ml_sci_1174
...
Fix bug with changing user own role from admin to normal user [SCI-1174]
2017-04-13 14:33:58 +02:00
Zmago Devetak
ec60044949
Merge pull request #548 from ZmagoD/zd_SCI_1129_v2
...
Disables annimateSpiner in result assets actions
2017-04-13 14:06:50 +02:00
zmagod
0534bce1ed
adds super in method_missing
2017-04-13 14:03:56 +02:00
zmagod
241af0620a
fixes hound alerts
2017-04-13 13:27:43 +02:00
zmagod
b6daf2648b
refactor zip_export
2017-04-13 13:01:05 +02:00
zmagod
f104444a0c
adds additional explanations [fixes SCI-1103]
2017-04-12 16:56:47 +02:00
Mojca Lorber
27c661d7c4
fix bug with changing user own role from admin to normal user
2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin
181d981a51
Add image preview to protocol repository [SCI-877]
2017-04-12 16:05:38 +02:00
mlorb
2932052628
Merge pull request #549 from mlorb/ml_sci_1172
...
Fix overlapping text in audit trail table [SCI-1172, SCI-1181]
2017-04-12 15:10:48 +02:00
okriuchykhin
0fe84c4e24
Merge pull request #550 from okriuchykhin/ok_SCI_1157
...
Improve speed of search [SCI-1157]
2017-04-12 13:11:26 +02:00
Zmago Devetak
9c31239318
Merge pull request #552 from biosistemika/release-1.9.0
...
Release 1.9.1
2017-04-12 13:08:37 +02:00
zmagod
f4fdb840d8
fixes the user_name field in csv export [fixes SCI-1189]
2017-04-12 09:05:54 +02:00
Oleksii Kriuchykhin
07d658ab82
Improve speed of search [SCI-1157]
2017-04-11 14:55:44 +02:00
Mojca Lorber
b09c18a9bc
fix overlaping text in audit trail table
2017-04-11 14:29:31 +02:00
zmagod
929d8aab5e
disables annimateSpiner in result assets actions
2017-04-10 15:40:36 +02:00
Zmago Devetak
91793c295a
Merge pull request #542 from ZmagoD/zd_SCI_825
...
Smart annotations and Notifications
2017-04-10 15:10:17 +02:00
zmagod
90faeec410
fixes typos and protocol step links
2017-04-10 11:21:28 +02:00
Zmago Devetak
ccb6cd0c8c
Merge pull request #546 from ZmagoD/zd_SCI_1185
...
adds input_sanitizer helper in app mailer [fixes SCI-1185]
2017-04-10 09:12:03 +02:00
Luka Murn
cd4664e4d0
Merge pull request #544 from Ducz0r/lm-sci-794-fix
...
Only require jquery-ui-sortable on samples page [SCI-794]
2017-04-10 07:44:57 +02:00
mz3944
2c78d10768
Merge pull request #532 from biosistemika/mz-SCI-1150
...
Fixed so that file deletion callbacks are triggered
2017-04-07 15:18:43 +02:00
zmagod
122e638b7e
adds input_sanitizer helper in app mailer [fixes SCI-1185]
2017-04-07 15:01:26 +02:00
Luka Murn
becdd687a6
Only require jquery-ui-sortable on samples page
...
(hopefully) closes SCI-794.
2017-04-07 13:05:22 +02:00
zmagod
9610c5f5a0
fix info dropdown links [fixes SCI-1141]
2017-04-07 11:31:09 +02:00
Matej Zrimšek
1447a34dc7
Files didn't get deleted in previous commit. [fixes SCI-1150]
2017-04-06 16:59:34 +02:00
okriuchykhin
aa776aaa71
Merge pull request #541 from okriuchykhin/ok_SCI_615
...
Fix moving of the steps after adding a new one [SCI-615]
2017-04-06 15:50:01 +02:00
zmagod
e77df92017
fix samples_controller
2017-04-06 15:26:24 +02:00
zmagod
9bb1bb3f9b
refactor [fixes SCI-825]
2017-04-06 15:08:03 +02:00
zmagod
439cd0cd89
add notification to experiments
2017-04-06 14:55:18 +02:00
zmagod
046b608018
add notification for my_module/project comments
2017-04-06 14:07:22 +02:00
zmagod
b398bb7516
add step annotations methods in steps_action concerns
2017-04-06 13:06:20 +02:00
zmagod
f16607579f
refactor steps annotation
2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin
5c0197220d
Fix moving of the steps after adding a new one [SCI-615]
2017-04-06 12:53:21 +02:00
Matej Zrimšek
e72184d10d
Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150]
2017-04-06 11:34:03 +02:00
mlorb
4855111dcb
Merge pull request #540 from mlorb/ml_sci_1089_v2
...
Remove ERROR from message [SCI-1089]
2017-04-06 10:44:20 +02:00
zmagod
bb437bd8c5
adds notification to results annotation
2017-04-06 09:33:49 +02:00
zmagod
d331911ffe
completed step annotations
2017-04-06 08:42:16 +02:00
mlorb
e9441559d3
Merge pull request #538 from mlorb/ml_sci_1044_vol3
...
Change helper method for user info popover
2017-04-05 17:04:30 +02:00
Mojca Lorber
5e62046627
remove ERROR from message
2017-04-05 14:40:55 +02:00
mlorb
7730493ef4
Merge pull request #535 from biosistemika/ml_sci_1044_vol2
...
Fix bug with constants
2017-04-04 15:46:50 +02:00
Mojca Lorber
b222a34a97
fix hound
2017-04-04 15:38:16 +02:00
Mojca Lorber
a0fe47a05d
change helper method for user info popover
2017-04-04 15:22:41 +02:00
okriuchykhin
8cff0a9a5b
Merge pull request #534 from okriuchykhin/ok_SCI_1127_v2
...
Add user popover method for users [SCI-1127]
2017-04-04 14:36:16 +02:00
zmagod
99c116f257
first run
2017-04-04 09:19:43 +02:00
Mojca Lorber
715fafe58c
fix bug with constants
2017-04-03 17:07:58 +02:00
Oleksii Kriuchykhin
2faa137f67
Add user popover method for users [SCI-1127]
2017-04-03 15:10:00 +02:00
zmagod
e1ee53eeb5
generates query in background worker
2017-04-03 13:37:54 +02:00
mlorb
317739af1e
Merge pull request #530 from biosistemika/ml_sci_1044
...
Add data-hook and yadcf-filter plug-in [SCI-1044]
2017-03-31 14:00:23 +02:00
Mojca Lorber
a2c1ed6994
fix constants
2017-03-31 13:53:18 +02:00
Mojca Lorber
503ee5b62e
change place of data-hook
2017-03-30 17:21:29 +02:00
Oleksii Kriuchykhin
42ccefe2ce
Remove logs table and old unused logging code [SCI-1127]
2017-03-30 11:47:57 +02:00
Mojca Lorber
9458f391e5
add data-hook and yadcf-filter plug-in
2017-03-29 15:59:51 +02:00
Zmago Devetak
2b35b34eb8
Merge pull request #529 from ZmagoD/zd_SCI_1135
...
fixes alert messages in samples [fixes SCI-1135]
2017-03-29 14:57:11 +02:00
Zmago Devetak
0019fd19ea
Merge pull request #525 from ZmagoD/zd_SCI_765
...
Export large files - utility class
2017-03-29 11:55:51 +02:00
zmagod
0096f9dc14
refactor
2017-03-29 09:32:23 +02:00
okriuchykhin
05a49e5a82
Merge pull request #528 from okriuchykhin/ok_SCI_1133
...
Fix secondary navigation on Mac [SCI-1133]
2017-03-29 09:30:34 +02:00
zmagod
9ce95470b3
fixes alert messages in samples [fixes SCI-1135]
2017-03-28 15:14:05 +02:00
Oleksii Kriuchykhin
391c5af267
Fix secondary navigation on Mac [SCI-1133]
2017-03-28 14:36:52 +02:00
zmagod
7039420f99
add hook to canvas module actions
2017-03-28 10:43:39 +02:00
zmagod
0996c14449
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
2017-03-27 10:41:58 +02:00
zmagod
2235fd3fb7
adds view if download expires
2017-03-27 10:38:28 +02:00
mlorb
3beb179f87
Merge pull request #514 from biosistemika/ml_sci_1089
...
Add error messages to sample group/type edit/delete actions [SCI-1089]
2017-03-27 09:57:32 +02:00
zmagod
239a44c26b
change send to public_send
2017-03-24 16:25:50 +01:00
zmagod
4635a3320d
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-24 16:09:28 +01:00
okriuchykhin
71dc6921fb
Merge pull request #524 from okriuchykhin/ok_SCI_1046
...
Add team_id field to assets and tables [SCI-1046]
2017-03-24 14:48:16 +01:00
Oleksii Kriuchykhin
d2c8e9a395
Set team for assets and tables in generators [SCI-1046]
2017-03-24 14:46:20 +01:00
Zmago Devetak
804fb2fec9
Merge pull request #519 from ZmagoD/zd_SCI_1092_v2
...
adds hooks in team switch [fixes SCI-1092]
2017-03-24 12:56:52 +01:00
zmagod
b352ef1600
removed unneeded method
2017-03-24 12:53:33 +01:00
zmagod
023b3213e8
fixes email link [fixes SCI-765]
2017-03-24 12:10:07 +01:00
zmagod
94732c6d18
adds delayed zip generator
2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin
2edebb282a
Add team_id field to assets and tables [SCI-1046]
2017-03-23 10:36:55 +01:00
zmagod
4385c68f5f
adds zip_export utility first run
2017-03-21 16:15:11 +01:00
okriuchykhin
33544ec91d
Merge pull request #521 from okriuchykhin/ok_SCI_1087
...
Move flash message creation JS code to helper method [SCI-1087]
2017-03-20 15:35:21 +01:00
Zmago Devetak
38299d9f67
Merge pull request #522 from ZmagoD/zd_SCI_1111
...
fixes breadcrumbs in office file [fixes SCI-1111]
2017-03-20 13:53:29 +01:00
zmagod
d8955d1a78
fixes breadcrumbs in office file [fixes SCI-1111]
2017-03-20 13:48:45 +01:00
Oleksii Kriuchykhin
c715902058
Move flash message creation JS code to helper method [SCI-1087]
2017-03-17 17:58:53 +01:00
Mojca Lorber
83fa8570d7
refactoring
2017-03-17 17:52:15 +01:00
zmagod
c244e69e81
fixed report comments bug [fixes SCI-1100]
2017-03-17 16:59:40 +01:00
zmagod
5cc6cd094e
refactor
2017-03-17 16:47:58 +01:00
zmagod
95a0f596b7
adds file link
2017-03-17 16:40:57 +01:00
zmagod
70f17a924e
adds hooks in team switch [fixes SCI-1092]
2017-03-17 16:10:22 +01:00
zmagod
52878e0989
fixed wopi buttons [fixes SCI-1110]
2017-03-16 15:38:11 +01:00
zmagod
307fef17d8
fixes owner id if empty
2017-03-15 18:01:15 +01:00
Zmago Devetak
1afb4c9a42
Merge pull request #515 from ZmagoD/file_owner_id_bug
...
fixes bug with wopi contorller
2017-03-15 17:40:07 +01:00
zmagod
c5156f5ca3
fixes bug with wopi contorller
2017-03-15 17:33:36 +01:00
Mojca Lorber
4792bd87b9
fix error message when editing custom column on locked task
2017-03-15 14:09:44 +01:00
Mojca Lorber
7a4e3201e7
add error messages to sample group/type edit/delete actions
2017-03-14 17:32:25 +01:00
zmagod
5d372851d3
fixes reports comment bug [fixes SCI-1100]
2017-03-14 16:24:02 +01:00
zmagod
856a4611c6
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-14 15:58:08 +01:00
zmagod
15b1712a3d
fixes bug with organization
2017-03-14 13:29:59 +01:00
zmagod
b821fff4a5
adds non breaking space between file name and buttons
2017-03-13 14:14:44 +01:00
zmagod
df2abe5d17
fixed typo
2017-03-13 13:51:31 +01:00
zmagod
7b16e5643e
fix assets preprocesor for wopi files
2017-03-13 13:20:49 +01:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
mlorb
39e1ac4b26
Merge pull request #512 from biosistemika/ml_sci_1074
...
Fix permissions for experiment actions [SCI-1074]
2017-03-10 11:44:27 +01:00
okriuchykhin
2a33391f4b
Merge pull request #511 from okriuchykhin/ok_SCI_1090
...
Refactoring of the comments using STI [SCI-1090]
2017-03-10 10:50:43 +01:00
Mojca Lorber
1ba5f1748f
fix permissions for experiment actions
2017-03-09 17:45:34 +01:00
Oleksii Kriuchykhin
456934464a
Remove unneeded validation calls [SCI-1090]
2017-03-09 17:20:27 +01:00
zmagod
1d42d46c02
fixes bug with step comments
2017-03-09 16:02:52 +01:00
Luka Murn
ae96223437
Fix rake db:add_user task
2017-03-09 15:37:15 +01:00
zmagod
3057965940
fix bug with filenames
2017-03-09 11:48:50 +01:00
zmagod
9939d8df06
refactor
2017-03-09 10:51:54 +01:00
Luka Murn
1e3a697a91
Merge pull request #508 from biosistemika/lm-sci-838-fix
...
Open edit/view Office files in new browser tab/window [SCI-838]
2017-03-09 10:39:16 +01:00
zmagod
49f91184da
fixes locals
2017-03-09 09:55:15 +01:00
Luka Murn
a4bf5516a5
Merge pull request #505 from Ducz0r/lm-sci-1082-fix
...
Minor change [SCI-1082]
2017-03-09 08:58:14 +01:00
Luka Murn
0e8f5f8e99
Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix
...
Conflicts:
app/views/my_modules/_state_buttons.html.erb
2017-03-09 08:44:09 +01:00
zmagod
f78ef8c82a
fixes hound
2017-03-08 14:41:42 +01:00
zmagod
5c2e9a4b04
adds extends and fixes report methods
2017-03-08 14:14:03 +01:00
Luka Murn
800df7a26b
Also make button icons work when rendering them via JS
...
Closes SCI-1073.
2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Luka Murn
7c9aa2e476
Hide complete&uncomplete task buttons if user cannot do it
...
Closes SCI-1091.
2017-03-06 16:01:04 +01:00
Luka Murn
86a800a84e
Open edit/view Office files in new browser tab/window
...
Closes SCI-838.
2017-03-06 14:12:18 +01:00
Luka Murn
473487faec
Add HTML <head><title> to edit, view file pages
...
Closes SCI-1049.
2017-03-06 13:55:07 +01:00
Luka Murn
4ddb139911
Fix padding of state buttons
...
Closes SCI-1073.
2017-03-03 16:36:52 +01:00
Luka Murn
42b773f180
Merge pull request #504 from Ducz0r/lm-sci-1078-fix
...
Fix sample type groups edit color script [SCI-1078]
2017-03-02 13:09:51 +01:00
Luka Murn
043613782e
Minor change
2017-03-02 13:04:13 +01:00
Luka Murn
808fdf6744
Merge pull request #502 from Ducz0r/lm-sci-1073-fix
...
Fix protocol state buttons a bit [SCI-1073]
2017-03-02 09:02:52 +01:00
Luka Murn
7a48da2e94
Merge pull request #501 from Ducz0r/lm-sci-1057-fix
...
Canvas should now properly work again [SCI-1057]
2017-03-02 09:01:51 +01:00
Luka Murn
3599537e42
Fix sample type groups edit color script so it works properly now
...
Closes SCI-1078.
2017-03-01 09:09:44 +01:00
Oleksii Kriuchykhin
4868ec5331
Remove task completion duplicated code [SCI-1075]
2017-02-28 17:07:59 +01:00
Luka Murn
3d7f09bde6
Fix protocol state buttons a bit
...
Closes SCI-1073.
2017-02-28 14:35:12 +01:00
Luka Murn
2252b46afc
Canvas should now properly work again
...
Closes SCI-1057.
2017-02-28 10:41:55 +01:00
zmagod
e1b3dcc2ba
adds enum extends to report element part of SCI-1003
2017-02-27 13:53:46 +01:00
Luka Murn
fecfc9e41d
Merge pull request #498 from biosistemika/release-1.8.1
...
Release 1.8.1
2017-02-23 14:57:30 +01:00
Luka Murn
dc89c160be
Fix a bug with team page not working from user task modal
2017-02-23 14:45:00 +01:00
Luka Murn
87599dca88
Merge branch 'lm-sci-1026-fix' into release-1.8.1
2017-02-23 13:55:41 +01:00
mlorb
a72a072fac
Merge pull request #495 from mlorb/ml_sci_948
...
Fix report - checklist items are in separate row than checkboxes [SCI-948]
2017-02-23 10:50:48 +01:00
okriuchykhin
986ad051a1
Merge pull request #496 from okriuchykhin/ok_SCI_873
...
Improve image scaling in image preview [SCI-873]
2017-02-23 09:30:56 +01:00
Oleksii Kriuchykhin
cb588ed378
Improve image scaling in image preview [SCI-873]
2017-02-22 16:55:57 +01:00
okriuchykhin
d30e149936
Merge pull request #493 from okriuchykhin/ok_SCI_739
...
Lower z-index value for notification count icon [SCI-739]
2017-02-22 16:48:39 +01:00
okriuchykhin
75792cde14
Merge pull request #492 from okriuchykhin/ok_SCI_759
...
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 16:25:16 +01:00
Mojca Lorber
f84611f558
fix report - checklist items are in separate row than checkboxes
2017-02-22 15:51:26 +01:00
Oleksii Kriuchykhin
a326fa374f
Lower z-index value for notification count icon [SCI-739]
2017-02-22 14:35:07 +01:00
Zmago Devetak
58f97fdb5b
Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook
...
adds hook for lock task action
2017-02-22 14:24:01 +01:00
Oleksii Kriuchykhin
35b0b33ddf
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 14:18:48 +01:00
mlorb
b65c716b79
Merge pull request #491 from biosistemika/ml_sci_1028_v2
...
Fix repeat tutorial is always created on the same team [SCI-1028]
2017-02-22 13:52:46 +01:00
Mojca Lorber
330fe9c291
fix repeat tutorial is always created on the same team
...
Closes SCI-1028.
2017-02-22 13:43:03 +01:00
mlorb
42e6a99911
Merge pull request #487 from mlorb/ml_sci_1032
...
Fix visual bug in edit avatar mode [SCI-1032]
2017-02-22 10:59:18 +01:00
mlorb
8c111db31a
Merge pull request #486 from mlorb/ml_sci_1033
...
Fix user has no teams view [SCI-1033]
2017-02-22 10:58:39 +01:00
zmagod
151dc79a81
adds hook for lock task action
2017-02-21 16:25:50 +01:00
Mojca Lorber
ac0988ef32
add data-hooks for remove manage teams button
2017-02-21 15:39:08 +01:00
Mojca Lorber
0fd41e8a6d
remove changes on user has no teams view
2017-02-21 15:12:58 +01:00
Oleksii Kriuchykhin
53ba9437b2
Fix circular dependency while loading Settings [SCI-1004]
2017-02-21 14:38:13 +01:00
mlorb
ea1711be83
Merge pull request #485 from mlorb/ml_sci_1001
...
Add data-hook for E-signature manifestation/display [SCI-1001]
2017-02-21 14:25:08 +01:00
mlorb
01d9f306a5
change div to span
2017-02-21 14:22:28 +01:00
Mojca Lorber
6b30f097f0
fix visual bug in edit avatar mode
2017-02-21 14:02:42 +01:00
okriuchykhin
95af5001ab
Merge pull request #484 from okriuchykhin/ok_SCI_1004
...
Add global settings base class [SCI-1004]
2017-02-21 13:20:24 +01:00
Mojca Lorber
90864a45a0
fix user has no teams view
2017-02-21 13:08:06 +01:00
Oleksii Kriuchykhin
7703db3386
Change implementation of the Settings base class [SCI-1004]
2017-02-21 13:07:10 +01:00
Luka Murn
6f1c19ae2d
Fix _user_dropdown.html.erb
2017-02-21 09:27:42 +01:00
Mojca Lorber
cb2127ee7f
add data-hook for E-signature manifestation/display
2017-02-20 18:03:55 +01:00
okriuchykhin
8e18ff44a6
Merge pull request #479 from okriuchykhin/ok_SCI_999
...
Add task complete/uncomplete functionality [SCI-999]
2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin
2aba0f46a6
Add global settings base class [SCI-1004]
2017-02-20 15:11:57 +01:00
Luka Murn
573f3c8d42
Merge pull request #483 from Ducz0r/lm-sci-1026-fix
...
Fix manage project users modal bug [SCI-1026]
2017-02-20 08:22:03 +01:00
Luka Murn
ce617894c5
Fix manage project users modal bug
...
Closes SCI-1026.
2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin
4fb5fa79af
Move task completion activity and notification creation to separate methods [SCI-999]
2017-02-16 13:36:05 +01:00
Oleksii Kriuchykhin
218e96b1f0
Code style fixes [SCI-999]
2017-02-16 11:45:07 +01:00
Zmago Devetak
c963674e49
Merge pull request #482 from ZmagoD/zd_SCI_987_vol2
...
fixes bug with user teams table [fixes SCI-987]
2017-02-15 13:30:25 +01:00
Luka Murn
164bd787e9
Merge pull request #481 from Ducz0r/lm-sci-958-fix
...
Team administrators are Viewers of all Projects in Team [SCI-958]
2017-02-15 10:40:52 +01:00
zmagod
836baa7412
fixes bug with user teams table [fixes SCI-987]
2017-02-15 10:06:21 +01:00
Nbernot
97584aabb3
Updated the lists of office online file extensions
...
Extended the list of file extensions that receive office online icons and 'open in' text.
2017-02-14 16:44:03 +01:00
Luka Murn
d097f0dd15
Merge pull request #477 from Ducz0r/lm-sci-928
...
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
2017-02-13 16:42:57 +01:00
Luka Murn
1b6f50647c
Please Hound
2017-02-13 16:40:27 +01:00
Luka Murn
b369177d1f
Merge pull request #480 from Ducz0r/lm-sci-964-fix
...
Fix system notification email links not working bug [SCI-964]
2017-02-13 16:31:04 +01:00
Oleksii Kriuchykhin
f97c20e9b5
Fix hound warnings [SCI-999]
2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin
78d5cbb223
Add links to task completion notification [SCI-999]
2017-02-13 14:51:21 +01:00
Luka Murn
86be639a7c
Please the Hound
2017-02-13 14:20:44 +01:00
Luka Murn
3313d14316
Fix search for administrators and projects
...
Closes SCI-958.
2017-02-13 14:15:53 +01:00
Luka Murn
c6ed73bc82
Allow team admins to see all projects, even hidden ones
2017-02-13 13:42:53 +01:00
Luka Murn
f93cc89624
Fix system notification email links not working bug
...
Closes SCI-964.
2017-02-10 15:13:33 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
3eb4faa44b
Fix task restore action
...
Closes SCI-991.
2017-02-10 14:08:56 +01:00
Luka Murn
280b7a0e75
Minor fix
2017-02-09 15:10:45 +01:00
Luka Murn
2a9f975c13
Some minor fixes
2017-02-09 14:58:11 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0
Move user profile to settings
2017-02-09 11:34:52 +01:00
Luka Murn
5cb3eb5e09
Refactor preferences -> move them to subcontroller, subroute
2017-02-09 11:07:16 +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
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
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
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
db75231617
Update URLs to sciNote support pages
...
Closes SCI-978.
2017-01-31 15:48:56 +01:00
zmagod
be5faad97c
fixes hound
2017-01-31 13:33:55 +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
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
zmagod
cec5f1333d
fixes RTE bug for new text results [fixes SCI-962]
2017-01-26 16:54:43 +01:00
Oleksii Kriuchykhin
100cc700c6
Fix RTF toolbar init after eding new step [SCI-943]
2017-01-26 16:37:44 +01:00
Luka Murn
3bf447b0f4
Fix bug where reCaptcha form wasn't working
2017-01-26 16:06:29 +01:00
Oleksii Kriuchykhin
17a53cbd7f
Fix protocol table filtering by keywords [SCI-957]
2017-01-26 15:52:46 +01:00
Oleksii Kriuchykhin
ff86184b24
Fix comments re-initialization after edit of the results [SCI-955]
2017-01-26 15:24:37 +01:00
Oleksii Kriuchykhin
0f860496a7
Fix image preview after saving of report [SCI-951]
2017-01-26 14:42:14 +01:00
Luka Murn
3e6d11a087
Merge pull request #455 from mlorb/ml_sci_944
...
Fix entering new smart anotations [SCI-944]
2017-01-26 14:06:35 +01:00
Mojca Lorber
13d1cc5171
fix entering new smart anotations
2017-01-26 13:50:32 +01:00
Oleksii Kriuchykhin
08aa882155
Fix generation of image previews after protocol loading from repo [SCI-951]
2017-01-26 13:19:59 +01:00
Luka Murn
0baaf12de3
Re-display images & checkboxes in PDF reports
...
Closes SCI-953.
2017-01-26 10:46:58 +01:00
Luka Murn
8c5a52417c
Merge pull request #445 from okriuchykhin/ok_SCI_940
...
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:49:38 +01:00
okriuchykhin
648d256dff
Merge pull request #448 from okriuchykhin/ok_SCI_945
...
Fix openning of protocol preview with images [SCI-945]
2017-01-25 17:27:01 +01:00
okriuchykhin
6610c75bfc
Merge pull request #452 from okriuchykhin/ok_SCI_949
...
Fix error when referencing deleted sample in SA [SCI-949]
2017-01-25 17:26:48 +01:00
Oleksii Kriuchykhin
c55f3cb99c
Add flag to disable simple_format in custom_auto_link [SCI-940]
2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
310d8c1920
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:18:19 +01:00
mlorb
bedef297c4
Merge pull request #453 from mlorb/ml_sci_950
...
Fix problem with protocol export [SCI-950]
2017-01-25 17:15:21 +01:00
okriuchykhin
4c0f68ffbd
Merge pull request #410 from okriuchykhin/ok_SCI_855
...
Improved tooltip handling in samples datatable V2 [SCI-855]
2017-01-25 16:19:52 +01:00
Mojca Lorber
99a40961fa
fix problem with protocol export
2017-01-25 16:12:48 +01:00
Oleksii Kriuchykhin
5fe9261595
Fix error when referencing deleted sample in SA [SCI-949]
2017-01-25 15:54:12 +01:00
zmagod
a507bb4d1f
hound
2017-01-25 15:40:35 +01:00
zmagod
1220466035
fixing hound
2017-01-25 15:00:14 +01:00
zmagod
afd8328e9c
rename ortanizations -> teams
2017-01-25 14:22:06 +01:00
Oleksii Kriuchykhin
ddd8bcf7b0
Prevent double initialization of popup [SCI-855]
2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin
96a9857dec
Add handling of popups in the end of the table [SCI-855]
2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin
fb49ce8be2
Improved tooltip handling in samples datatable [SCI-855]
2017-01-25 13:47:01 +01:00
Mojca Lorber
6905fc8c08
remove letter f
2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin
90e4b26c69
Fix openning of protocol preview with images [SCI-945]
2017-01-25 13:06:12 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
zmagod
8c035a1981
renames organization in assets
2017-01-25 12:12:27 +01:00
okriuchykhin
35b8638598
Merge pull request #446 from okriuchykhin/ok_SCI_902_v2
...
Add sanitization of group/type to sample edit [SCI-902]
2017-01-25 12:05:30 +01:00
zmagod
72e13beee3
renamed organizations in views
2017-01-25 12:01:23 +01:00
Mojca Lorber
2277af534c
fix table titles
2017-01-25 11:01:35 +01:00
zmagod
a6285f0431
renamed utilities
2017-01-25 10:24:50 +01:00
zmagod
9ae799d52c
rename organization/org/Organization to Team in datatables
2017-01-25 09:48:49 +01:00
zmagod
9d90b9b42a
rename Organization to Team in models
2017-01-24 17:08:48 +01:00
zmagod
c2c5616078
rename Organization to Team in controllers
2017-01-24 17:06:51 +01:00
Oleksii Kriuchykhin
fe6d6842c2
Add sanitization of group/type to sample edit [SCI-902]
2017-01-24 16:58:03 +01:00
zmagod
21c2f82582
rename controllers where org/organization
2017-01-24 16:57:14 +01:00
zmagod
a193850ae6
rename models where org/organization
2017-01-24 16:34:21 +01:00
Oleksii Kriuchykhin
365eef506c
Fixes merge conflicts with smart-annotations branch
2017-01-24 15:20:50 +01:00
okriuchykhin
f1483e4cad
Merge pull request #444 from okriuchykhin/ok_SCI_902_v2
...
Add sanitization to sample groups/types [SCI-902]
2017-01-24 14:44:55 +01:00
Oleksii Kriuchykhin
a04f05eeb3
Add sanitization to sample groups/types [SCI-902]
2017-01-24 14:39:54 +01:00
mlorb
02f314ce60
Merge pull request #443 from mlorb/ml_sci_919_v2
...
Remove table of content and customize link target [SCI-919]
2017-01-24 14:39:47 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
Mojca Lorber
4dc7998fdd
Remove table of content and customize link target
2017-01-24 13:10:01 +01:00
Zmago Devetak
40bf293ec7
Merge pull request #441 from ZmagoD/zd_SCI_924
...
adds smart annotation in task comments, refactor smart_annotation_par…
2017-01-24 11:18:41 +01:00
mlorb
4253e3de2b
Merge pull request #439 from mlorb/ml_sci_919
...
Remove functionalities from rich text formatting [SCI-919]
2017-01-24 11:03:34 +01:00
mz3944
34f832d123
Merge pull request #437 from mz3944/mz-sci-913
...
Added smart annotations when adding new sample in samples table [SCI-913]
2017-01-24 11:03:00 +01:00
okriuchykhin
7fa1f3d966
Merge pull request #438 from okriuchykhin/ok_SCI_921
...
Remove unneeded HTML scrubber in protocol importer [SCI-921]
2017-01-24 11:02:43 +01:00
Matej Zrimšek
b48e48e100
Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913]
2017-01-24 10:56:10 +01:00
zmagod
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +01:00
Matej Zrimšek
2e041d9e81
Added smart annotations when adding new sample in samples table. [SCI-913]
2017-01-24 10:23:26 +01:00
Oleksii Kriuchykhin
2434c73a0c
Remove unneeded HTML scrabber in protocol importer [SCI-921]
2017-01-24 09:52:38 +01:00
Mojca Lorber
eb40513ada
remove functionalities from rich text formatting
2017-01-24 09:44:37 +01:00
Oleksii Kriuchykhin
401b37956b
Simplify protocol export start [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
d555ba7905
Add export to protocol management page and code style improvements [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
14a6705b55
Implemented protocol export through Zip::OutputStream [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
1abd7fc574
Added xml schemas and zip gem [SCI-742]
2017-01-23 17:34:02 +01:00
Oleksii Kriuchykhin
69f31a62e7
Initial code commit [SCI-742]
2017-01-23 17:33:10 +01:00
Zmago Devetak
674999f987
Merge pull request #436 from ZmagoD/zd_SCI_922
...
fixed user without permissions bug [fixes SCI-922]
2017-01-23 17:25:07 +01:00
zmagod
20cde2654b
fixed user without permissions bug [fixes SCI-922]
2017-01-23 10:53:42 +01:00
zmagod
9c3bc8dac7
fixes checklist item user popover bug [fixes SCI-907]
2017-01-23 09:47:04 +01:00
mz3944
fd63a1de12
Merge pull request #432 from mlorb/ml-sci-fix-847
...
Add dynamic length for sample type/group field when adding new sample [SCI-847]
2017-01-20 15:46:34 +01:00
mlorb
2d073c8c04
Merge pull request #430 from mlorb/ml_sci_826
...
Display smart annotations in reports [SCi-826]
2017-01-20 13:49:40 +01:00
Mojca Lorber
8e02c2e025
add locale - fix
2017-01-20 13:37:07 +01:00
mz3944
18a2e4c423
Merge pull request #433 from mz3944/mz-sci-914
...
Edit of a sample in sample table does not work
2017-01-20 13:02:05 +01:00
Zmago Devetak
c1e7cc83a7
Merge pull request #434 from ZmagoD/zd_SCI_915
...
Text is deleted when entering smart annotation in rich text editor
2017-01-20 13:01:29 +01:00
Zmago Devetak
7bd368e002
Merge pull request #431 from ZmagoD/zd_add_code_highlight
...
Fixes code highlight and smart annotations experiments bug
2017-01-20 12:59:21 +01:00
mlorb
9a3c56de97
Merge pull request #421 from mlorb/ml_sci_540
...
Protocol steps/results - adding titles for tables [SCI-540]
2017-01-20 11:41:49 +01:00
zmagod
71453398b1
bugfix
2017-01-20 11:33:49 +01:00
zmagod
4f7d62e79d
removes unneeded annotations [fixes SCI-915]
2017-01-20 11:33:10 +01:00
Matej Zrimšek
5d65627808
Fixed sample editing in samples table. [SCI-914]
2017-01-20 11:10:17 +01:00
Mojca Lorber
3789769af3
add dynamic length for sample type/group field when adding new sample
2017-01-20 09:53:44 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +01:00
Mojca Lorber
6de83ff53b
fix hound
2017-01-19 15:58:40 +01:00
Mojca Lorber
4ea154410a
add to fields with rich text formatting
2017-01-19 15:27:24 +01:00
Matej Zrimšek
54f8b01341
Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]
2017-01-19 15:26:28 +01:00
Mojca Lorber
44de927cf4
display smart annotations in reports - without rich text fields
2017-01-19 14:22:54 +01:00
Oleksii Kriuchykhin
890c5e3c3d
Add “no results found” message in smart annotation [SCI-886]
2017-01-19 13:42:58 +01:00
Zmago Devetak
039a8d7da6
Merge pull request #426 from ZmagoD/zd_add_tinyMCE
...
Add tiny mce
2017-01-19 12:57:55 +01:00
zmagod
2cbb8ba41a
removed unneeded comments
2017-01-19 12:54:48 +01:00
mz3944
da604d2619
Merge pull request #427 from mz3944/mz-sci-908
...
Some smart annotations refactoring [SCI-908]
2017-01-19 12:15:20 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +01:00
Matej Zrimšek
5d86bbb812
Smart annotations improved documentation. [SCI-908]
2017-01-19 10:56:02 +01:00
Matej Zrimšek
fec83e8c45
Smart annotations refactoring. [SCI-908]
2017-01-19 10:55:43 +01:00
zmagod
2ccafdd670
bug fix
2017-01-19 10:12:01 +01:00
zmagod
27d3868f37
fix bugs
2017-01-19 09:40:39 +01:00
zmagod
88d7cb200e
removed quill
2017-01-18 23:06:14 +01:00
zmagod
65fa631b1c
adding tinyMce first run
2017-01-18 22:40:08 +01:00
okriuchykhin
18d329fb42
Merge pull request #423 from okriuchykhin/ok_SCI_896
...
Make search work for full names in smart annotations [SCI-896]
2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin
6555fd02b6
Make search work for full names in smart annotations [SCI-896]
2017-01-18 16:57:51 +01:00
okriuchykhin
7f6ceef9e9
Merge pull request #422 from okriuchykhin/ok_SCI_897
...
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 16:26:25 +01:00
mz3944
b5e38afb64
Merge pull request #416 from mz3944/mz-sci-884
...
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
2017-01-18 16:13:19 +01:00
Matej Zrimšek
dbbb709bf2
Smart annotations minor refactoring. [SCI-884, SCI-889]
2017-01-18 16:04:39 +01:00
Matej Zrimšek
24458fe590
Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]
2017-01-18 15:29:48 +01:00
Oleksii Kriuchykhin
e45749d3b2
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 14:46:53 +01:00
Mojca Lorber
f656a1093d
fix hound
2017-01-18 14:40:24 +01:00
Mojca Lorber
6155a458e7
update search
2017-01-18 14:22:19 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Mojca Lorber
3b92ab9f36
add names to tables from protocol steps in reports
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
okriuchykhin
8a220c2351
Merge pull request #414 from okriuchykhin/ok_SCI_887
...
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-18 13:50:22 +01:00
Oleksii Kriuchykhin
55d0e82fcd
Change If statement to ternary operator [SCI-887]
2017-01-18 13:43:21 +01:00
Oleksii Kriuchykhin
a490a12fb1
Add truncation of image description in the preview [SCI-873]
2017-01-18 13:28:56 +01:00
Luka Murn
cf72da5635
Merge branch 'improved-files-handling' into 'master'
...
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
2017-01-18 11:29:40 +01:00
okriuchykhin
9dfa30fbb4
Merge pull request #418 from okriuchykhin/ok_SCI_855_v2
...
Remove previous fix for popups [SCI-855]
2017-01-18 11:00:54 +01:00
Oleksii Kriuchykhin
12eb1df69f
Remove previous fix for popups [SCI-855]
2017-01-18 10:59:00 +01:00
Zmago Devetak
1b9f7db385
Merge pull request #405 from ZmagoD/zd_SCI_832
...
Visualization of User smart annotation after saving the field
2017-01-18 09:36:42 +01:00
okriuchykhin
781a68e0d5
Merge pull request #415 from okriuchykhin/ok_SCI_888
...
Add missed space in the string [SCI-888]
2017-01-18 09:34:51 +01:00
zmagod
cb0483a6e6
refactor
2017-01-18 08:34:29 +01:00
Oleksii Kriuchykhin
ea8f6a8c6b
Fix issue in report editor [SCI-102]
2017-01-17 14:21:59 +01:00
Matej Zrimšek
3085452ec9
Fixed some hound alerts. [SCI-884]
2017-01-17 11:04:16 +01:00
Matej Zrimšek
d3c33c9dca
Refactored smart annotation JS. [SCI-884]
2017-01-17 10:05:41 +01:00
Luka Murn
ffc2b56dff
Fix String quotes
2017-01-17 08:28:41 +01:00
Luka Murn
2f48409fdd
Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2
...
Fix filter not working correctly with hidden custom columns [SCI-813]
2017-01-17 08:17:52 +01:00
Oleksii Kriuchykhin
0ce71884a5
Add missed space in the string [SCI-888]
2017-01-16 17:09:41 +01:00
Oleksii Kriuchykhin
50edaef4ff
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-16 16:55:10 +01:00
Luka Murn
16955dcee6
Fix Hound errors.
2017-01-16 15:58:37 +01:00
Luka Murn
a2935c6620
Add sample info modal popup to sample smart annotations
...
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').
Closes SCI-892.
2017-01-16 15:52:02 +01:00
Matej Zrimšek
2877126dc6
Fixed selected search filter button style. [SCI-884]
2017-01-16 12:52:03 +01:00
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
