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 |
|
zmagod
|
70db34090d
|
fixes rspec tests
|
2017-11-20 09:41:14 +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
|
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 |
|
Luka Murn
|
ccef5571f1
|
Add dependency to Canaid, the permission helper library
|
2017-11-16 15:49:13 +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 |
|
Oleksii Kriuchykhin
|
84f4aba213
|
Pull latest master into gilson-iot-rails4
|
2017-11-15 15:15:26 +01:00 |
|
Mojca Lorber
|
cd006c2640
|
change text for expiry of a link for an exported file
|
2017-11-15 14:32:19 +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 |
|
Zanz2
|
9bd198eaf6
|
Merge pull request #875 from Zanz2/removed_txt_1793
Removed the .txt text from translations file [SCI-1793]
|
2017-11-14 19:12:32 +01:00 |
|
Zanz2
|
6b9a10ffe4
|
Made validations for JSON format and .txt and .json files
|
2017-11-14 12:02:17 +01:00 |
|
Zanz2
|
3e964da241
|
Removed the .txt text from translations file
|
2017-11-14 11:42:10 +01:00 |
|
Mojca Lorber
|
be74338d9f
|
add explanation when copying custom repositories
|
2017-11-13 16:30:42 +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
|
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
|
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
|
9086cd8b6b
|
Jira branch code
|
2017-11-09 10:49:44 +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
|
b3a8f8b5e2
|
refactor dev env
|
2017-11-08 17:31:21 +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 |
|
zmagod
|
f43492adff
|
trigger an alert to on canvas save if page reload [fixes SCI-1610]
|
2017-11-07 15:08:26 +01:00 |
|
Zmago Devetak
|
a9bba07c74
|
Merge pull request #847 from ZmagoD/zd_SCI_1683
add whacamole configuration [fixes SCI-1683]
|
2017-11-06 15:56:29 +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 |
|
okriuchykhin
|
80405800ca
|
Merge pull request #818 from okriuchykhin/ok_SCI_1626
Enable :preserve_files in paperclip config [SCI-1626]
|
2017-11-03 11:56:57 +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 |
|
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 |
|
Zanz2
|
a732c8afa7
|
Code for protocol repository scinote table elements view
|
2017-10-26 17:28:27 +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 |
|
zmagod
|
4de335d189
|
add whacamole configuration [fixes SCI-1683]
|
2017-10-25 09:47:26 +02:00 |
|
Luka Murn
|
c026b60790
|
Update Profile page to use validation
|
2017-10-23 18:04:20 +02:00 |
|
Luka Murn
|
8cda449738
|
Update en.yml
Remove unneccesary my_module_groups localization Strings.
|
2017-10-23 17:49:55 +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
|
e740e586e8
|
Additional fixes required by latest merge from master (nr. 2)
|
2017-10-23 10:43:32 +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 |
|
Zanz2
|
03e40017e4
|
Updated local
|
2017-10-19 19:58:18 +02:00 |
|
Zanz2
|
6cf775a4b1
|
Refactored code, made html render on preview too
|
2017-10-17 19:27:20 +02:00 |
|
zmagod
|
30d091dc65
|
adds label under protocols keywords input [fixes SCI-1560]
|
2017-10-17 14:10:56 +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 |
|
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 |
|
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 |
|
Luka Murn
|
38bce08b5a
|
Minor wording change.
|
2017-10-13 09:27:18 +02:00 |
|
Luka Murn
|
fe89b942e7
|
Add Add-ons page to User -> Settings -> Account
Closes SCI-1675.
|
2017-10-11 14:15:37 +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 |
|
Oleksii Kriuchykhin
|
58c2487eb6
|
Enable :preserve_files in paperclip config [SCI-1626]
|
2017-10-10 13:32:14 +02:00 |
|
Oleksii Kriuchykhin
|
bd26052110
|
Remove GIOT sign-in button [GIOT-55]
|
2017-10-09 11:56:46 +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
|
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
|
183c93d21b
|
Refactoring to git review specifications
|
2017-10-07 22:13:31 +02:00 |
|
Zanz2
|
2b9563ec6d
|
Added preview text to en.yml
|
2017-10-07 17:45:23 +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 |
|
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
|
5a31df7204
|
adds @Ducz0r suggestions
|
2017-10-06 10:45:22 +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
|
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
|
84f279de22
|
setup flow
|
2017-10-04 09:16:17 +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 |
|
zmagod
|
edf4443995
|
added notification alert [fixes SCI-1566]
|
2017-10-02 14:51:54 +02:00 |
|
zmagod
|
cb4bacc372
|
refactor preferences page [fixes SCI-1564]
|
2017-09-28 16:53:51 +02:00 |
|
zmagod
|
e2aa0d7515
|
fixes user profile
|
2017-09-26 17:29:11 +02:00 |
|
Zanz2
|
11b2ef3112
|
Made code nicer, hopefully not unintentionally breaking something
|
2017-09-25 13:53:32 +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 |
|
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
|
48c8922604
|
adds invite users modal
|
2017-09-21 10:45:35 +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 |
|
zmagod
|
c636ca4276
|
refactor user preferences and profile page
|
2017-09-20 11:17:59 +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 |
|
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 |
|
zmagod
|
705d07f60e
|
adds remove team action
|
2017-09-13 17:11:51 +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
|
fdbae19156
|
changed .json to .txt for clarity
|
2017-09-12 09:33:18 +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
|
2c0a458aaf
|
dodav moj alternativni text za importanje (text na gumbu), za rails translate (t)
|
2017-09-11 15:21:35 +02:00 |
|
Toni Dezman
|
185039bc99
|
adds suggestions from code review
|
2017-09-04 15:00:26 +02:00 |
|
zmagod
|
91d2d8a935
|
adds team details view
|
2017-08-31 15:56:55 +02:00 |
|
Toni Dezman
|
c3f46d4877
|
adds hounds suggestions on improving the code
|
2017-08-31 13:24:57 +02:00 |
|
Toni Dezman
|
77a6a99513
|
fixes 404 request error
|
2017-08-31 13:03:15 +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 |
|
zmagod
|
478bd491ff
|
added pagination and sorting to team tables
|
2017-08-28 17:05:09 +02:00 |
|
Toni Dezman
|
ea9a195f09
|
email and password action/redusers work
|
2017-08-26 14:07:31 +02:00 |
|
Toni Dezman
|
ccd14f6b50
|
adds apis for full_name and initials input fields
|
2017-08-25 14:45:02 +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 |
|
Zmago Devetak
|
994b08fcfc
|
Merge pull request #752 from ZmagoD/testin-rails-5-addons
fix background worker bug
|
2017-08-25 08:05:21 +02:00 |
|
zmagod
|
afa05c8c14
|
fixed background worker in dev env
|
2017-08-23 17:10:45 +02:00 |
|
Toni Dezman
|
692df427b2
|
adds wildcard for settings/*all to show react 404 page
|
2017-08-22 10:35:18 +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 |
|
Zmago Devetak
|
efd105c499
|
Merge pull request #759 from ZmagoD/zd_SCI_1471
fixes signup spec [fixes SCI-1471]
|
2017-08-09 16:16:50 +02:00 |
|
zmagod
|
bd352869a3
|
adds user account dropdown
|
2017-08-09 09:08:13 +02:00 |
|
zmagod
|
226458a3f0
|
adds recent notifications
|
2017-08-08 15:44:28 +02:00 |
|
Luka Murn
|
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
|
6ef19725f1
|
adds redux
|
2017-08-02 17:27:05 +02:00 |
|
zmagod
|
caae1e2fe8
|
adds intl, router, bootstrap to npm modules
|
2017-07-31 10:42:40 +02:00 |
|
zmagod
|
a46e28a85a
|
fixes signup spec [fixes SCI-1471]
|
2017-07-28 15:37:28 +02:00 |
|
Luka Murn
|
03a7440136
|
Remove SkyLight stuff (we're not using it any more)
|
2017-07-27 14:26:44 +02:00 |
|
Toni Dezman
|
78f26525e9
|
Settings SPA works
|
2017-07-27 13:53:29 +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 |
|
zmagod
|
c34e4a0814
|
fix background worker bug
|
2017-07-26 13:31:36 +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 |
|
Oleksii Kriuchykhin
|
b8e93ee883
|
Add Webpacker and React [SCI-1461]
|
2017-07-12 16:41:55 +02:00 |
|
Luka Murn
|
1dc3e49367
|
Merge pull request #739 from Ducz0r/lm-sci-1432
Extend confirmation period of emails to 7 days [SCI-1432]
|
2017-07-11 10:57:16 +02:00 |
|
Luka Murn
|
19a8dfe116
|
Extend confirmation period of emails to 7 days
Closes SCI-1432.
|
2017-07-11 08:32:52 +02:00 |
|
Luka Murn
|
3e80f761b8
|
Add "about" modal, prepare hooks, VERSION system for addons
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
|
2017-07-10 15:27:50 +02:00 |
|
Luka Murn
|
16e672b9d8
|
Add VERSION file where the sciNote Core version is stored
|
2017-07-10 09:26:35 +02:00 |
|
Luka Murn
|
bc8d945101
|
Damn, I spent too much time on GeneIO. Fixing again >_<
|
2017-07-07 13:19:39 +02:00 |
|
Luka Murn
|
e9ef7b61ef
|
Fix WickedPdf bug on production
|
2017-07-07 13:05:18 +02:00 |
|
mz3944
|
f55861b373
|
Merge pull request #731 from mz3944/mz-SCI-1413
Fixed some RoR 5.1 default settings. [SCI-1413]
|
2017-07-06 17:17:27 +02:00 |
|
Luka Murn
|
4317da343b
|
Don't use listen gem in development mode
|
2017-07-06 16:49:50 +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 |
|