mlorb
|
9797712561
|
Merge pull request #997 from mlorb/ml-sci-2045
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
|
2018-02-15 14:51:40 +01:00 |
|
Matej Zrimšek
|
09c5e23adf
|
Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes.
|
2018-02-14 14:39:10 +01:00 |
|
Matej Zrimšek
|
d571ab2ed8
|
Fixed comments permissions for experiment level.
|
2018-02-14 14:39:10 +01:00 |
|
Matej Zrimšek
|
6b1fee4d30
|
Added/joined repository record assignment to task with sample assignmment to task.
|
2018-02-14 14:39:10 +01:00 |
|
Matej Zrimšek
|
4c87fb4a55
|
Fixed permission error when restoring task.
|
2018-02-14 14:39:09 +01:00 |
|
Matej Zrimšek
|
946f516171
|
Fixed permission error when moving a freshly cloned task.
|
2018-02-14 14:39:09 +01:00 |
|
Matej Zrimšek
|
d55734e501
|
Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view.
|
2018-02-14 14:39:07 +01:00 |
|
Matej Zrimšek
|
d7108f5a35
|
Fixed Hound warnings.
|
2018-02-14 14:39:07 +01:00 |
|
Matej Zrimšek
|
8ef6c8f91f
|
Refactored remaining experiment level permissions (and everything below it).
|
2018-02-14 14:39:07 +01:00 |
|
Matej Zrimšek
|
0706d16020
|
Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
1182ce5da1
|
Fixed experiment level permission checks in the controllers.
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
7938c2e036
|
Minor code style changes.
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
c5b798017e
|
Minor Hound warning fixes.
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
d6e7ef465c
|
Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
854333b0e6
|
Grouped permissions for experiment with canaid gem (WIP).
|
2018-02-14 14:19:00 +01:00 |
|
Matej Zrimšek
|
d058c371d4
|
Readded project archive permission.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
e36ec69ca9
|
Project level permissions refactoring (mostly names).
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
93536afcd5
|
Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
13e9a2a132
|
Corrected some project level permissions; minor refactoring.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
a21343a819
|
Fixing and refactoring project permissions in controllers.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
279da20060
|
Fixed Hound warnings.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
d423700e84
|
Used permissions where they were missing.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
321ddc2916
|
Grouped existing project permissions and used 'canaid' gem.
|
2018-02-14 13:09:45 +01:00 |
|
mlorb
|
8d0ac93c80
|
add check to start work on next task notification if recent changes notification is switched off
|
2018-02-13 11:01:45 +01:00 |
|
Zmago Devetak
|
027297d46a
|
Merge pull request #985 from ZmagoD/zd_SCI_2008
fixes bug with assets upload on task result page,
|
2018-02-12 11:40:44 +01:00 |
|
okriuchykhin
|
e7fb1bc716
|
Merge pull request #967 from okriuchykhin/ok_SCI_1966
Merge gilson-iot-rails4 to master [SCI-1966]
|
2018-02-12 11:02:17 +01:00 |
|
Zmago Devetak
|
e400514020
|
Merge pull request #981 from ZmagoD/zd_SCI_2026
fixes bug with step table update [fixes SCI-2026]
|
2018-02-07 14:35:15 +01:00 |
|
Zanz2
|
ef0733b886
|
Merge pull request #988 from Zanz2/red_error_msg_sci1993
Accidentally deleted this off master, identical to the branch before [SCI-1993]
|
2018-02-07 13:08:45 +01:00 |
|
Zanz2
|
367eff6401
|
re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches
|
2018-02-07 11:17:53 +01:00 |
|
mlorb
|
e151c963e1
|
fix error on task activity
|
2018-02-06 16:34:16 +01:00 |
|
zmagod
|
2ad4eb3488
|
fix bug with checklists
|
2018-02-06 16:15:10 +01:00 |
|
zmagod
|
75cc9d11df
|
fix error on checklists
|
2018-02-06 16:06:15 +01:00 |
|
zmagod
|
bd1345d560
|
fixes bug with assets upload on task result page,
adds ctrl+v listener to upload images from clipboard, adds image preview modal
|
2018-02-06 15:39:19 +01:00 |
|
Zanz2
|
83e9550feb
|
Merge pull request #966 from Zanz2/images_not_imported_SCI1807
Images not imported [SCI-1807]
|
2018-02-06 14:33:35 +01:00 |
|
Zanz2
|
dac59cf4d0
|
Refactored to PR, deleted unrelated things
|
2018-02-06 09:06:33 +01:00 |
|
zmagod
|
b48fa3f231
|
fixes bug with step table update [fixes SCI-2026]
|
2018-02-05 17:32:38 +01:00 |
|
zmagod
|
25dcfe66ae
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960
|
2018-02-01 16:04:05 +01:00 |
|
Zanz2
|
e8f6dc0d24
|
Merge pull request #962 from Zanz2/missing_error_SCI1993
A red error messagge is now displayed when not selecting protocol [SCI-1993]
|
2018-01-26 16:00:15 +01:00 |
|
Oleksii Kriuchykhin
|
7c14800570
|
Change base class for API controller [SCI-1966]
|
2018-01-26 13:34:38 +01:00 |
|
Zanz2
|
e041426a09
|
Merge pull request #964 from Zanz2/steps_order_SCI1816
Steps order fix [SCI-1816]
|
2018-01-26 11:32:28 +01:00 |
|
okriuchykhin
|
94f604ae17
|
Merge pull request #961 from okriuchykhin/ok_SCI_1994
Actually return 404 when requested asset doesn't exist [SCI-1994]
|
2018-01-26 11:14:59 +01:00 |
|
Zanz2
|
4ee51959eb
|
fixed hound
|
2018-01-26 09:56:59 +01:00 |
|
Zanz2
|
346f9feaef
|
Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html
|
2018-01-26 09:34:58 +01:00 |
|
Zanz2
|
24e772d7e5
|
Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816
|
2018-01-26 08:26:38 +01:00 |
|
Zanz2
|
fc541147c8
|
A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone
|
2018-01-25 15:54:38 +01:00 |
|
okriuchykhin
|
0b1f43c1c5
|
Merge pull request #954 from okriuchykhin/ok_SCI_1970
Add health check endpoint to API controller [SCI-1970]
|
2018-01-25 14:33:37 +01:00 |
|
Oleksii Kriuchykhin
|
7dd9121072
|
Actually return 404 when requested asset doesn't exist [SCI-1994]
|
2018-01-25 14:30:04 +01:00 |
|
mlorb
|
ab2955c9bb
|
Merge pull request #956 from mlorb/ml-sci-1491
Add notification for previous task has been completed [SCI-1491]
|
2018-01-25 11:35:19 +01:00 |
|
zmagod
|
9b836d04fa
|
fixes per @mlorb 's request
|
2018-01-24 13:21:53 +01:00 |
|
Zanz2
|
7fe1c20ebe
|
Finished the protocol reorder functions and implemented them
|
2018-01-24 09:31:43 +01:00 |
|
Mojca Lorber
|
ac8b1769be
|
add notification for previous task has been completed
|
2018-01-23 15:53:33 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +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 |
|
Oleksii Kriuchykhin
|
91468faaf9
|
Fix addons display in info modal [SCI-1875]
|
2018-01-17 18:30:55 +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 |
|
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
|
3c8d8e2fbb
|
Fix samples import [SCI-1946]
|
2018-01-16 17:50:33 +01:00 |
|
Oleksii Kriuchykhin
|
a64012237e
|
Fix repository records import [SCI-1939]
|
2018-01-15 18:01:35 +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 |
|
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
|
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
|
eb8124ea5a
|
follow @duco 's suggestions
|
2018-01-05 17:08:00 +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
|
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
|
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 |
|
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 |
|
mlorb
|
abced181d5
|
refactor manage repository rows permissions again because of addons
|
2018-01-04 11:53:58 +01:00 |
|
zmagod
|
e0e3ef9359
|
fixes flow, and before_action in permissions_controller
|
2018-01-03 17:23:50 +01:00 |
|
mlorb
|
0c519b8f03
|
refactor manage sample elements permissions again because of addons
|
2018-01-03 16:37:02 +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 |
|
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
|
512ee07bde
|
Fix repositories [SCI-1873]
|
2017-12-19 17:53:45 +01:00 |
|
Luka Murn
|
cf291bf887
|
Merge branch 'gilson-iot-rails4'
Conflicts:
Gemfile.lock
|
2017-12-19 10:56:39 +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 |
|
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 |
|
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 |
|
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
|
e01e7bebbf
|
add permissions endpoint on the API
|
2017-12-04 13:25:48 +01:00 |
|
Zanz2
|
835ac6910f
|
Code refactor part 1
|
2017-12-02 00:29:47 +01:00 |
|
zmagod
|
52b278fe78
|
adds premissions service to FE
|
2017-12-01 17:15:15 +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 |
|
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 |
|
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
|
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 |
|
Zanz2
|
dc5904aed9
|
Fixed this jira issue and added workarounds for bugs
|
2017-11-24 01:45:40 +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
|
d8c809ffd0
|
Reviewed pull request
|
2017-11-20 23:19:34 +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
|
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 |
|
Zanz2
|
1b540a75a1
|
Fixed to use .megabytes
|
2017-11-16 15:17:13 +01:00 |
|
Zanz2
|
41c1193a78
|
Fixed unit error;Now when comparing file size, both are in bytes
|
2017-11-16 01:34:38 +01:00 |
|
Oleksii Kriuchykhin
|
84f4aba213
|
Pull latest master into gilson-iot-rails4
|
2017-11-15 15:15:26 +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 |
|
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
|
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 |
|
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
|
e7384ac38d
|
Code review fixes, made seperate helper file
|
2017-11-12 15:31:04 +01:00 |
|
Zanz2
|
fa2c0fe556
|
merging
|
2017-11-09 18:55:17 +01:00 |
|
Zanz2
|
812fa3f1d5
|
Hopefully this will resolve my merge problems
|
2017-11-09 17:42:17 +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
|
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 |
|
Zanz2
|
aa03a889c7
|
Fixed PR review
|
2017-11-03 16:28:15 +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 |
|
zmagod
|
2118b31762
|
adds about sciNote modal
|
2017-11-02 13:23:57 +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
|
2413dc251a
|
Added new preview tables code
|
2017-10-28 02:19:22 +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 |
|
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 |
|
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 |
|
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 |
|
Luka Murn
|
c026b60790
|
Update Profile page to use validation
|
2017-10-23 18:04:20 +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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
631b41cdaa
|
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
|
2017-10-19 11:38:23 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
56f52ebfa7
|
Optimize memory usage in samples/repositories import [SCI-1665]
|
2017-10-12 14:43:25 +02:00 |
|
Zanz2
|
5d667f146e
|
Moved .js form reset and made a standalone description method
|
2017-10-11 17:59:09 +02:00 |
|
Luka Murn
|
fe89b942e7
|
Add Add-ons page to User -> Settings -> Account
Closes SCI-1675.
|
2017-10-11 14:15:37 +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 |
|
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
|
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
|
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 |
|
Oleksii Kriuchykhin
|
6820511ea0
|
Further canvas optimizations [SCI-1642]
|
2017-10-06 12:43:27 +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 |
|
Oleksii Kriuchykhin
|
b26b963e54
|
Optimize update canvas SQL and remove module group name [SCI-1642]
|
2017-10-05 16:19:25 +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 |
|
zmagod
|
3dc3ed906f
|
fixes bug with embedded images [fixes SCI.1624]
|
2017-10-02 18:06:42 +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 |
|
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 |
|
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
|
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
|
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 |
|
zmagod
|
1a7f8fc857
|
added frontend validations
|
2017-09-22 16:59:38 +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
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Toni Dezman
|
d38f4343f2
|
Decupling redux part 1
|
2017-09-14 11:46:49 +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 |
|
Toni Dezman
|
67d617deb5
|
adds hound_bot's and zmagos suggestions
|
2017-09-07 13:40:53 +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
|
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 |
|
Toni Dezman
|
ea9a195f09
|
email and password action/redusers work
|
2017-08-26 14:07:31 +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
|
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 |
|
zmagod
|
685cb42aac
|
fixes repository, protocols link, adds csfr token to request headers
|
2017-08-21 15:30:54 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
f76512f364
|
adds hound recomendations for react/settings_controller.rb
|
2017-07-28 12:53:15 +02:00 |
|
Toni Dezman
|
1673d43993
|
adds react/settings controller and react/layout
|
2017-07-27 15:26:03 +02:00 |
|
Oleksii Kriuchykhin
|
6a43483a2f
|
Fix adding and editing repository items [SCI-1519]
|
2017-07-26 11:22:26 +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
|
ece27b2652
|
Fix importing files with empty header cells and error messages improvements [SCI-1484]
|
2017-07-18 14:54:35 +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 |
|
Mojca Lorber
|
739f8b5b4e
|
remove redundant rollback call
|
2017-07-13 13:49:26 +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 |
|
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 |
|
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 |
|
okriuchykhin
|
75c887ce7d
|
Merge pull request #721 from okriuchykhin/ok_SCI_1412
Fix activities [SCI-1412]
|
2017-07-04 10:59:08 +02:00 |
|
zmagod
|
bc33883c3c
|
first run fixing addons
|
2017-06-30 10:23:28 +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 |
|
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
|
4060ba2ac3
|
Code style fixes [SCI-1356]
|
2017-06-27 13:23:51 +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
|
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
|
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
|
e7328c2e20
|
fixes row dupplication [fixes SCI-1385]
|
2017-06-22 16:01:37 +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 |
|
Matej Zrimšek
|
d907819de5
|
Removed byebug calls. [SCI-1383]
|
2017-06-21 10:49:00 +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 |
|
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
|
9b941fe374
|
fix flash when deleting samples of other users
|
2017-06-16 17:12:04 +02:00 |
|
Mojca Lorber
|
1b683bc70e
|
fix error msg when editing empty cell in repositories
|
2017-06-16 15:09:04 +02:00 |
|
Mojca Lorber
|
ea455d3596
|
fix no repository name in activity bug
|
2017-06-15 09:43:10 +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 |
|
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 |
|
mlorb
|
074a47aae1
|
Merge pull request #675 from mlorb/ml_sci_1272
Fix permissions [SCI-1272]
|
2017-06-13 10:51:04 +02:00 |
|
zmagod
|
a865253a2e
|
first run
|
2017-06-13 08:10:10 +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 |
|
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 |
|
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 |
|
Mojca Lorber
|
be52af4e4f
|
fix rename/delete/copy modals not working
|
2017-06-08 15:13:00 +02:00 |
|
Mojca Lorber
|
71c523c406
|
load tabs with javascript
|
2017-06-08 13:47:30 +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
|
61eb52f86f
|
Implement GUI for copying repositories
Closes SCI.1270.
|
2017-06-07 19:11:25 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Matej Zrimšek
|
419d638163
|
Renamed reposiotry edit and destroy permission helper. [fix 1269]
|
2017-06-05 17:36:26 +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
|
5c9a453439
|
Added permissions for deleting and renaming of repositories. [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 |
|
zmagod
|
1c021b11db
|
adds drag and drop files upload to steps [fixes SCI-1310]
|
2017-06-02 16:34:09 +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
|
b527afd12b
|
generates samples csv file in background job [fixes SCI-1278]
|
2017-05-29 14:42:55 +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 |
|
Matej Zrimšek
|
853096634d
|
Fixed permission error while cloning workflows. [fixes SCI-1291]
|
2017-05-26 11:14:50 +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
|
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 |
|
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 |
|
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 |
|
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
|
f28df506f9
|
Fix bug in counting search results for assets [SCI-1284]
|
2017-05-17 09:08:40 +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 |
|
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 |
|
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
|
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 |
|