Commit graph

420 commits

Author SHA1 Message Date
okriuchykhin 6dbb5bc583
Merge pull request #1152 from okriuchykhin/ok_SCI_2403
Change remove file button appearence [SCI-2403]
2018-05-18 17:34:56 +02:00
mlorb 81392362ac Final button colour changes 2018-05-18 16:24:24 +02:00
Oleksii Kriuchykhin b79b0b79cf Change remove file button appearence [SCI-2403] 2018-05-18 14:51:45 +02:00
mlorb 64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
mlorb 7bda68b9f4
Merge pull request #1146 from mlorb/ml-sci-2336-v3
Add locales [SCI-2336]
2018-05-17 13:29:47 +02:00
mlorb 933a98c1f6 fix smart anotation color 2018-05-17 11:01:15 +02:00
okriuchykhin e9d6b26ec6
Merge pull request #1141 from okriuchykhin/ok_SCI_2403
Add clear file selector button to repository edit [SCI-2403]
2018-05-16 14:55:53 +02:00
Zmago Devetak 9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321
fixes images preview in repository/library [fixes SCI-2321]
2018-05-16 12:05:33 +02:00
zmagod 98baa77846 fixes cursor icon 2018-05-16 12:02:46 +02:00
Oleksii Kriuchykhin c8094f196c Add margin to clear button and fix case with new file in the cell [SCI-2403] 2018-05-16 11:25:43 +02:00
zmagod 7e3dbcd92f hound 2018-05-16 10:43:25 +02:00
zmagod 712a3c7ff6 fixes css, changes spinner in preview modal 2018-05-16 10:40:49 +02:00
Oleksii Kriuchykhin be5d481cdc Add clear file selector button to repository edit [SCI-2403] 2018-05-16 10:32:50 +02:00
mlorb cea7f5a3f7 some extra style unification 2018-05-15 17:10:31 +02:00
mlorb dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
mlorb f01cfc2968 fix hound 2018-05-14 12:08:45 +02:00
mlorb ed27a7a62a some extra restyling/unifying off app 2018-05-11 18:02:17 +02:00
zmagod e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +02:00
zmagod 38869ec037 adds title on disabled download file link 2018-05-10 09:47:10 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
Zmago Devetak ee307886df
Merge pull request #1124 from ZmagoD/zd_SCI_2347
fix the missing icons on task card [fixes SCI-2347]
2018-05-04 09:34:49 +02:00
zmagod 0177dc811b fixes per @mojca 's request 2018-05-03 16:21:29 +02:00
zmagod abbc0995f2 fix css 2018-05-03 14:51:49 +02:00
zmagod 60e5aa8716 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2 2018-05-03 14:49:06 +02:00
zmagod f04677600b fix the missing icons on task card [fixes SCI-2347] 2018-05-03 10:05:40 +02:00
zmagod 66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
mlorb 88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1
Conflicts:
	app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
mlorb 9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
zmagod 4d6e995481 add dismiss buttons back 2018-04-25 10:43:16 +02:00
zmagod c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
zmagod e96b690a5b removes reports link from secondary navigation, fix bug with turbolinks 2018-04-20 11:57:52 +02:00
Zmago Devetak 487fb1fb48
Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2
Zd sci 2239 v2
2018-04-19 18:00:19 +02:00
mlorb 72c79013de fix file preview background 2018-04-19 17:40:24 +02:00
mlorb d7eccac289
Merge pull request #1099 from mlorb/ml-sci-2167
Remove breadcrumbs throughout application [SCI-2167]
2018-04-19 16:11:37 +02:00
zmagod a948710576 fixes alert label [fixes SCI-2239] 2018-04-19 15:51:36 +02:00
mlorb 8753df7ce3
Merge pull request #1103 from mlorb/ml-sci-2309
Fix top navigation style [SCI-2309]
2018-04-19 15:16:27 +02:00
mlorb c1832969b4 fix top navigation style 2018-04-19 13:26:10 +02:00
mlorb 4f0c2a8122 fix screen responsiveness 2018-04-18 17:06:47 +02:00
mlorb c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
mlorb 04a20ab7ec change links 2018-04-16 17:05:22 +02:00
zmagod a2d8285f35 fixes archive button but [fixes SCI-2300] 2018-04-16 09:22:10 +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
Zmago Devetak bdb6554870
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219
adds manage columns page
2018-04-06 17:06:28 +02:00
zmagod cf7761daaa Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223 2018-04-06 12:56:39 +02:00
zmagod c0cc6c293a fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279] 2018-04-05 13:15:32 +02:00
zmagod a8a19df06d Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-05 08:51:58 +02:00
Oleksii Kriuchykhin 9720063fb3 Fix tests [SCI-2217] 2018-04-05 00:06:11 +02:00
zmagod 525a1c15ca fixes hound 2018-04-04 16:40:07 +02:00
zmagod 0c05c60ebf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-04 16:06:38 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
zmagod 5eb007f4d2 fixes per @mlorb 's request 2018-04-04 13:22:14 +02:00
zmagod 38b84edfb0 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-04-04 12:59:41 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mlorb 10b5e1de84 refactor typography 2018-03-30 09:54:57 +02:00
zmagod 56b0900619 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-03-29 16:42:10 +02:00
mlorb 4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
mlorb 22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
zmagod 3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
mlorb faaecec2ff implement new Help dropup in navigation 2018-03-23 14:08:27 +01:00
zmagod 3be3c00574 adds manage columns page [fixes SCI-2218] 2018-03-22 09:35:36 +01:00
zmagod 81df97f008 add library sidebar and create new library button [fixes SCI-2121] 2018-03-21 09:22:55 +01:00
mlorb 9cf9bf94c0 fix merge conflict 2018-03-20 14:30:07 +01:00
mlorb 884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
mlorb e0926ddc3c code refactoring 2018-03-20 13:53:11 +01:00
Oleksii Kriuchykhin acbd40e0d1 Remove Power Up button [SCI-2117] 2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin 37f675b32a Use larger LinkedIn sign-in button [SCI-2201] 2018-03-18 12:18:33 +01:00
zmagod a9dfcd9681 refactor 2018-03-16 16:38:59 +01:00
zmagod 311b2dac5a Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142 2018-03-16 16:21:47 +01:00
zmagod 86a8afd907 refactor 2018-03-16 15:56:12 +01:00
zmagod ee03115361 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095 2018-03-16 15:32:40 +01:00
mlorb 9de998e85c code left-side menu bar 2018-03-14 14:33:34 +01:00
zmagod a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
zmagod 51af74071c remove comments and activity modal 2018-03-13 10:52:53 +01:00
zmagod 8fe173e831 re-structure top navigation bar 2018-03-12 16:27:35 +01:00
zmagod e218cae453 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +01:00
Zanz2 1fc8b2a2b2 quick fix un-needed styling 2017-12-10 01:45:47 +01:00
Zanz2 d0a9198408 Fixed the styling 2017-12-10 01:20:08 +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 4354363215 rubocop refactor css 2017-11-03 16:46:03 +01:00
Zanz2 ac26b17ddf Rubocop refactor 2017-11-03 16:45:15 +01: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 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 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
Ž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 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
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 a2e1aa5b36 fixes bug with long text in parse records modal [fixes SCI-1392] 2017-06-22 14:43:01 +02:00
Mojca Lorber a195c9a5af truncate and display text in tooltip in custom repository fields 2017-06-15 15:08:33 +02:00
zmagod 33b996ffee refactor 2017-06-09 09:49:57 +02:00
zmagod 1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +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
Oleksii Kriuchykhin 620a989a2f Improve view of badges on experiment canvas [SCI-152] 2017-05-09 14:07:23 +02:00
Oleksii Kriuchykhin 3f60439948 Change color of loading animation in reports [SCI-1029] 2017-05-08 11:02:51 +02:00
Oleksii Kriuchykhin d3fb688fce Change color of turbolinks progress bar [SCI-1029] 2017-04-26 15:04:29 +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
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
zmagod f104444a0c adds additional explanations [fixes SCI-1103] 2017-04-12 16:56:47 +02:00
Oleksii Kriuchykhin 181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +02:00
Mojca Lorber b09c18a9bc fix overlaping text in audit trail table 2017-04-11 14:29:31 +02:00
zmagod 023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
Luka Murn 4ddb139911 Fix padding of state buttons
Closes SCI-1073.
2017-03-03 16:36:52 +01:00
Oleksii Kriuchykhin a326fa374f Lower z-index value for notification count icon [SCI-739] 2017-02-22 14:35:07 +01:00
Mojca Lorber 6b30f097f0 fix visual bug in edit avatar mode 2017-02-21 14:02:42 +01:00
Oleksii Kriuchykhin db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +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
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
zmagod 9c3bc8dac7 fixes checklist item user popover bug [fixes SCI-907] 2017-01-23 09:47:04 +01:00
Mojca Lorber 6de83ff53b fix hound 2017-01-19 15:58:40 +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
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
zmagod cb0483a6e6 refactor 2017-01-18 08:34:29 +01:00
zmagod 1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
zmagod a4aa933151 refactor smart annotation parser helper 2017-01-11 10:34:14 +01:00
zmagod a903772de8 style dropdown 2017-01-10 17:05:32 +01:00
Mojca Lorber 510731bd4e change color of clickable nameswhen row is selected in datatables 2017-01-09 15:51:21 +01:00
Luka Murn 0ee5b98977 Refactor code a bit, add dismiss button to header 2017-01-07 09:59:52 +01:00
Luka Murn b614ce714b Restyle atwho dropdown 2017-01-05 14:06:48 +01:00
Luka Murn e12907c9b9 Remove original atwho css, apply our own 2017-01-05 10:52:28 +01:00
mlorb 59751ec41e Merge pull request #373 from mlorb/ml_sci_709
Add Protocol Preview to Protocol repository [SCI-709]
2017-01-04 11:28:55 +01:00
Luka Murn 3bee9d2e12 Save an (yet unworking) version of user smart annotations
Used so other devs can start working on smart annotations.
2017-01-04 10:54:02 +01:00
Mojca Lorber fe37ac3b6d fix hound 2 2017-01-03 17:46:30 +01:00
Mojca Lorber 0011474ea3 fix hound 2017-01-03 17:43:55 +01:00
Mojca Lorber c476faca30 fix hound 2017-01-03 11:04:09 +01:00
Oleksii Kriuchykhin c77c83752e Remove unused css class link-look [SCI-819] 2016-12-30 15:50:43 +01:00
Mojca Lorber 40e3240a99 add content to preview modal 2016-12-22 11:43:11 +01:00
zmagod 25671c744a disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804] 2016-12-16 09:50:45 +01:00
zmagod 9083f84396 Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789 2016-12-15 11:03:19 +01:00
zmagod b003d192c3 fixed edit mode 2016-12-15 09:54:38 +01:00
zmagod 1ff98bb6df adds tooltip to samples dropdown and column names 2016-12-14 13:36:10 +01:00
zmagod d9971b4502 adds error message in samples table dropdown [fixes SCI-789] 2016-12-13 17:08:19 +01:00
zmagod c960230bf0 fixes dropdown height bug [fixes SCI-787] 2016-12-13 11:35:50 +01:00
Luka Murn d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
2016-12-12 09:57:37 +01:00
Matej Zrimšek 0b12c87b09 Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701] 2016-12-09 16:44:50 +01:00
zmagod 8b0dab624d clear unneeded css, change processing image [fixes SCI-758] 2016-12-09 14:24:20 +01:00
Luka Murn 54ebdbb06c Update edit mode JS & CSS 2016-12-09 13:18:59 +01:00
Luka Murn da630ac2cb Make edit, delete buttons clickable & hide them if neccesary 2016-12-09 13:18:59 +01:00
Oleksii Kriuchykhin f6dd64772a Add columns to samples table without page reload [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin 22dabd2177 Added form for adding new columns to samples table into dropdown [SCI-712] 2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin 2a27c8e6b3 Fix hound warning [SCI-695] 2016-11-30 11:52:07 +01:00
Oleksii Kriuchykhin f51f33ec25 Added sorting functionality to samples colunmns dropdown [SCI-695] 2016-11-30 11:42:05 +01:00
zmagod 72d1dfb15e cleanup sample_datatable.js 2016-11-28 16:28:22 +01:00
zmagod 9d91d2ce28 adds new samples columns dropdown [fixes SCI-698] 2016-11-25 17:29:30 +01:00
Mojca Lorber 91b0f4907c fix hound 2016-11-18 12:54:32 +01:00
Mojca Lorber 086f937fbb fix empty space and blockquote padding - rich text editing 2016-11-18 12:43:57 +01:00
Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master'
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +01:00
Matej Zrimšek 0d133ff32e Refactoring and added back buttons for tutorial steps 1-5. 2016-11-17 14:46:04 +01:00
Luka Murn d1701bd7ae Merge pull request #276 from Ducz0r/lm-sci-637
Automatically resize textarea elements [SCI-637]
2016-11-17 09:58:36 +01:00
Mojca Lorber 7002fc3f2f fix hound 2016-11-14 15:10:37 +01:00
Mojca Lorber 615cd3c278 profile changes for gamification 2016-11-14 15:04:18 +01:00
mlorb b0b2484fdf Merge pull request #279 from mlorb/ml_sci_638_vol2
Fix validation problems for rich text fields [SCI-638]
2016-11-11 12:37:02 +01:00
Mojca Lorber 4b7fa440f6 fix hound 2016-11-11 12:03:01 +01:00
Luka Murn 5727158495 Hotfix to nicely render comments form on Firefox as well 2016-11-11 09:47:37 +01:00
Luka Murn b42922d32c Add autosize functionality to all textareas
Closes SCI-637
2016-11-11 09:09:41 +01:00
Mojca Lorber 1facd2cefe fix validation problems 2016-11-10 17:20:17 +01:00
Luka Murn d44a757b25 Add textareas to checklist name & items
Closes SCI-644
2016-11-08 11:50:29 +01:00
Luka Murn 55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +01:00
Luka Murn 6fe0d6b3df A working invite modal! 2016-11-07 09:43:10 +01:00
Luka Murn ccf8932611 Add first version of invite users modal 2016-11-07 09:43:09 +01:00
Mojca Lorber 44b51d087a merging 2016-11-02 14:06:20 +01:00
Oleksii Kriuchykhin d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
Mojca Lorber 888aa31aed fix hound 2016-10-27 11:18:11 +02:00
Mojca Lorber 5719d4c61f show edit avatar on mouse hover, add background and center image 2016-10-27 11:09:30 +02:00
Mojca Lorber 8309df0aaf fix hound 2016-10-26 13:51:05 +02:00
Mojca Lorber 878952f072 change edit avatar in profile 2016-10-26 13:41:17 +02:00
Zmago Devetak 12c77df883 Merge pull request #237 from ZmagoD/zd_SCI_593_v2
Styled global team switch and search [fixes SCI-593]
2016-10-21 16:28:50 +02:00
zmagod 9a4603dd7d removed unneeded css 2016-10-21 16:27:53 +02:00
zmagod 49d3879642 fixes padding on mobile, added separator on team switch dropdown, focus search input 2016-10-21 11:46:59 +02:00
zmagod c642e208dd styled global team switch and search [fixes SCI-593] 2016-10-21 09:33:18 +02:00
zmagod 9214adc591 fixed team name position 2016-10-20 15:35:09 +02:00
zmagod f9fb4d8bd6 move tooltip to the right [fixes SCI-591] 2016-10-20 14:34:45 +02:00
zmagod 76f6e30078 fixes word-wrap on mozilla 2016-10-17 15:36:33 +02:00
zmagod 8a6899aeea restyled team switch dropdown 2016-10-17 15:21:19 +02:00
zmagod 8cd86a50bb styled dropdown 2016-10-17 15:10:26 +02:00
Matej Zrimšek f2cd9890dd Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS. 2016-10-17 11:57:47 +02:00
Matej Zrimšek a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Mojca Lorber 8f783f87f7 fixes hound 2016-10-12 15:32:40 +02:00
Mojca Lorber 4f1cbad7da adding update notifications in settings 2016-10-12 10:42:07 +02:00
zmagod 0bdf77562d add word-wrap to notrification index page [fixes SCI-556] 2016-10-06 13:49:24 +02:00
zmagod de00a19dd9 fixes styling in settings preferences [SCI-553] 2016-10-06 13:22:44 +02:00
Luka Murn 5c80c8a817 Add "no notifications" to dropdown & notifications index page 2016-10-05 16:58:21 +02:00
Luka Murn 877574e853 Add link to settings from both notification lists 2016-10-05 16:26:26 +02:00
Zmago Devetak eea310514a Merge pull request #194 from ZmagoD/zd_SCI_531_533
Notification style fixes
2016-10-05 15:27:36 +02:00
Zmago Devetak 71ad5bf034 Merge pull request #190 from ZmagoD/zd_SCI_529
Prepare settings screen for notifications
2016-10-05 14:54:47 +02:00
zmagod 9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
zmagod cba4318185 add word wrapping to notifications dropdown [fixes SCI-532] 2016-10-05 13:22:33 +02:00
zmagod f9d956bbca fix notifications number on [fixes SCI-531] 2016-10-05 11:50:57 +02:00
zmagod c4f28c3649 made notification images bigger [fixes SCI-533] 2016-10-05 10:16:51 +02:00
zmagod 6229e6a3a1 styled notification settings button [fixes SCI-529] 2016-10-04 16:12:56 +02:00
zmagod a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn 61cb9651c7 Merge pull request #188 from biosistemika/global-notifications
Global notifications
2016-10-04 08:30:50 +02:00
zmagod 0d23f05698 Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440 2016-10-03 16:14:22 +02:00
zmagod ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +02:00
zmagod b9bc2f17c8 fixing hound 2016-10-03 08:27:13 +02:00
zmagod 2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
Luka Murn 49c5474219 Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2
Fixed wrong CSS formatting and added release notes link to help link.
2016-09-30 08:27:57 +02:00
zmagod 60a503f115 added assignment image 2016-09-29 16:05:43 +02:00
zmagod e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Matej Zrimšek a6324d61c5 Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab. 2016-09-29 14:27:26 +02:00
Oleksii Kriuchykhin 792f949a61 Fix issue with spinner in avatar upload [SCI-423] 2016-09-27 09:12:31 +02:00
Matej Zrimšek fc86b7b1fd Added help dropdown. [SCI-13] 2016-09-23 12:52:38 +02:00
Matej Zrimšek c614843044 Minor refactoring with hound alert fixes. 2016-09-21 19:48:18 +02:00
Matej Zrimšek 234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
zmagod 2bfe8f0636 fixing hound 2016-09-21 08:16:23 +02:00
zmagod 42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod da86208441 styled step comments 2016-09-20 14:13:40 +02:00
zmagod d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
Luka Murn a480c8d403 Styling fixes 2016-08-25 13:59:50 +02:00
Luka Murn f0d9cb96fa Add edit project comments functionality 2016-08-25 13:51:30 +02:00
Luka Murn 15c0baeee8 Add delete project comment functionality
This commit also removes the old code from @bberic.
2016-08-25 13:51:30 +02:00
zmagod 92bb3dda99 hide last next button 2016-08-25 08:46:11 +02:00
zmagod dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00