scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
6356 commits 70 branches 179 tags 165 MiB
Commit graph

64 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio b57e79a557
Fix tables (#1963) 2019-08-09 09:41:32 +02:00
Oleksii Kriuchykhin 9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
aignatov-bio cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801) 
* Add croppie tool to avatar editing
 2019-05-31 15:44:27 +02:00
Anton Ignatov 1ae4a60f79 Fix recaptha error 2019-03-01 12:58:31 +01:00
Jure Grabnar ebdf9adab0 Recaptcha input field now addressed with jQuery 
Fix SCI-2985
 2019-02-19 13:05:33 +01:00
Urban Rotnik 16e9a56874 Add recaptcha to invitation modal 
SCI-2935
 2019-01-25 11:27:01 +01:00
mlorb d37f3a3c09 fix invited member is added multiple times to team 2018-12-07 11:36:26 +01:00
Luka Murn 586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2 1bed2c2a3c Partially fixed according to pull request review, added comments to code review 2018-08-31 12:11:51 +02:00
Zanz2 d4aa5e60a2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663 
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
 2018-08-31 11:42:26 +02:00
Luka Murn b71c5d14c6 Fix bootstrap-select to work with turbolinks 5.x 
This was causing invite users modal, among other things, to not
function correctly after visiting another redirect within SciNote
using Turbolinks 5.x.

Closes SCI-2707.
 2018-08-24 17:11:59 +02:00
Zanz2 9a482eab2e Checkbox now gets styled properly and defaults to true 2018-08-21 09:02:54 +02:00
Oleksii Kriuchykhin 6795b08a91 Refactor invite users modal initialization [SCI-2651] 2018-08-20 13:13:34 +02:00
mlorb a6dd577b4e fix time zone selector 2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin 5c999300b5 Fix avatar upload validators [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin 812a3dcf7d Fix user profile edit form [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
mlorb 81392362ac Final button colour changes 2018-05-18 16:24:24 +02:00
mlorb 06ce285ae2 add locales 2018-05-16 14:32:15 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
mlorb 9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
mlorb 70dfe66b2d refactoring 2018-04-06 14:20:40 +02:00
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
Mojca Lorber 27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
Luka Murn f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +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
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
Oleksii Kriuchykhin 62535a01bd Move teams datatable js code into separate file [SCI-936] 2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
Mojca Lorber d3e0eca44e redesign individual team page 2017-02-01 14:44:47 +01:00
zmagod be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
zmagod 8c035a1981 renames organization in assets 2017-01-25 12:12:27 +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
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
zmagod ac52e643be cleanup direct upload 2016-12-08 11:26:13 +01:00
Luka Murn 263244ad83 Reload whole page after user is invited from team invite users modal 
Closes SCI-664.
 2016-11-15 16:21:32 +01:00
Luka Murn b246853117 Code styling (use link_to, %w) 2016-11-08 16:43:25 +01:00
Luka Murn 0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +01:00
Oleksii Kriuchykhin 347216183f Fixes different color of buttons in notifications settings [SCI-590] 2016-10-20 14:17:07 +02:00
Matej Zrimšek 05acf5a725 Replaced all Ruby constants instances in JS to be called from JS. 2016-10-17 11:57:46 +02:00
Matej Zrimšek 21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Mojca Lorber 42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Mojca Lorber 6bea0a9e1a fixes merge conflicts 2016-10-12 10:55:40 +02:00
Mojca Lorber 4f1cbad7da adding update notifications in settings 2016-10-12 10:42:07 +02:00
Oleksii Kriuchykhin 5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00