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
1250 commits 70 branches 179 tags 165 MiB
Commit graph

188 commits

Author SHA1 Message Date
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
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
Luka Murn 23e60e0d01 Add Gems for smart annotations (atwho) 2017-01-04 10:51:55 +01:00
Oleksii Kriuchykhin c77c83752e Remove unused css class link-look [SCI-819] 2016-12-30 15:50:43 +01:00
Luka Murn 4b50c73474 Merge pull request #363 from Ducz0r/lm-sci-546-fix 
Restyle step table display in reports [SCI-546]
 2016-12-23 12:57:54 +01:00
Luka Murn a48eaf662e Restyle step table display in reports so 
Closes SCI-546.
 2016-12-19 15:09:49 +01:00
Zmago Devetak c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +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 6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +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
zmagod 8dd8a7e7cd Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777 2016-12-12 15:52:25 +01:00
zmagod d9025a9601 changes create/edit mode buttons [fixes SCI-777] 2016-12-12 14:42:06 +01:00
zmagod 8bb452e4f7 trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775] 2016-12-12 10:30:03 +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
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
okriuchykhin cb2abfa7a9 Merge pull request #325 from okriuchykhin/ok_SCI_712 
Added form for adding new columns to samples table into dropdown [SCI-712]
 2016-12-06 15:00:01 +01:00
Zmago Devetak 49f9e64171 Merge pull request #333 from ZmagoD/zd_SCI_700 
Managing sample groups tab
 2016-12-06 14:51:09 +01:00
zmagod dd85b128d2 fixed glyphicon-ok position 2016-12-06 14:47:16 +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
zmagod 787b8b1600 fixed new sample type/group form 2016-12-06 12:01:02 +01:00
Zmago Devetak 91f29745c4 Merge pull request #314 from ZmagoD/zd_SCI_643 
adds autolink
 2016-12-05 10:47:23 +01:00
zmagod 83aae59eed adds sample groups index page 2016-12-02 09:33:09 +01:00
Zmago Devetak 33adb58950 Merge pull request #328 from ZmagoD/zd_SCI_699 
Managing sample types tab
 2016-11-30 16:14:13 +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 4e4a48620c adds validation to input fields 2016-11-29 18:08:29 +01:00
zmagod 12848f15fa adds sample_type index view with all crud actions 2016-11-29 17:15:54 +01:00
Luka Murn 90816ae1fa Just pleasing the Hound 2016-11-28 17:16:39 +01:00
Luka Murn 073f30dcc5 Fix task comments not properly showing in reports 
Closes SCI-733.
 2016-11-28 17:14:27 +01:00
Zmago Devetak 1e870a6e7c Merge pull request #320 from ZmagoD/zd_SCI_698 
adds new samples columns dropdown [fixes SCI-698]
 2016-11-28 16:30:16 +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
Luka Murn b1b095910c Merge pull request #309 from Ducz0r/lm-remove-unused-files 
Brace for impact...
 2016-11-25 10:00:29 +01:00
zmagod fafecce264 adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643] 2016-11-23 14:18:50 +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 f5795f5516 Remove unused assets & helpers 2016-11-18 11:30:03 +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