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

469 commits

Author SHA1 Message Date
Matej Zrimšek 8ad52354eb Used locales instead of hardcoded values for intro.js tutorial popup. 2017-04-25 16:03:50 +02:00
Luka Murn 92159b734f Merge pull request #559 from Ducz0r/lm-sci-1175-fix 
Fix encoding when cloning tables [SCI-1175]
 2017-04-25 14:38:34 +02:00
zmagod 66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber 0bae4657f6 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
Luka Murn 61af70668c Bump version to 1.10.0 2017-04-19 09:31:40 +02:00
zmagod c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
mz3944 0ebf294844 Merge pull request #562 from mz3944/mz-SCI-1187 
Added general locale for cases when a name is optional and is not spe…
 2017-04-18 15:26:35 +02:00
mlorb aab6a9b7a4 Merge pull request #561 from mlorb/ml_sci_1198 
Change mentions for user smart annotations in notifications [SCI-1198]
 2017-04-18 09:42:38 +02:00
mlorb 39f0ec9d24 Merge pull request #557 from mlorb/ml_sci_1118 
Rename cloning text [SCI-1118]
 2017-04-18 09:42:05 +02:00
Matej Zrimšek c8ba234023 Added general locale for cases when a name is optional and is not specified. [fixes SCI-1187] 2017-04-14 17:20:34 +02:00
Mojca Lorber 34cfe01152 change mentions for user smart annotations in notifications 2017-04-14 16:23:49 +02:00
Mojca Lorber 56efb8086f rename the rest of cloning text 2017-04-13 17:52:32 +02:00
Luka Murn 9c28608fbf Fix encoding when cloning tables 
Closes SCI-1175.
 2017-04-13 17:00:27 +02:00
Mojca Lorber 5f02376da3 rename cloning text 2017-04-13 15:09:17 +02:00
zmagod 53e828566a change system notification description 2017-04-13 14:01:52 +02:00
zmagod f104444a0c adds additional explanations [fixes SCI-1103] 2017-04-12 16:56:47 +02:00
Zmago Devetak 9c31239318 Merge pull request #552 from biosistemika/release-1.9.0 
Release 1.9.1
 2017-04-12 13:08:37 +02:00
Luka Murn 3d9323c8d7 Merge pull request #547 from Ducz0r/lm-sci-1107 
Silence Wicked PDF generation [SCI-1107]
 2017-04-11 11:22:49 +02:00
Luka Murn d8c00401cd Update constants.rb 
Bump version to 1.9.1
 2017-04-11 09:10:55 +02:00
Zmago Devetak 91793c295a Merge pull request #542 from ZmagoD/zd_SCI_825 
Smart annotations and Notifications
 2017-04-10 15:10:17 +02:00
Luka Murn a30c7a77e8 Silence Wicked PDF generation 
Closes SCI-1107.
 2017-04-10 14:00:31 +02:00
zmagod d2eb7be426 removed faq label 2017-04-10 11:23:50 +02:00
zmagod 90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod 9610c5f5a0 fix info dropdown links [fixes SCI-1141] 2017-04-07 11:31:09 +02:00
zmagod 9a17648eee Adds new relic in sciNote [fixes SCI-1183] 2017-04-07 11:23:45 +02:00
zmagod 439cd0cd89 add notification to experiments 2017-04-06 14:55:18 +02:00
zmagod 046b608018 add notification for my_module/project comments 2017-04-06 14:07:22 +02:00
zmagod f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
zmagod bb437bd8c5 adds notification to results annotation 2017-04-06 09:33:49 +02:00
zmagod d331911ffe completed step annotations 2017-04-06 08:42:16 +02:00
okriuchykhin b781ebd6fe Merge pull request #536 from okriuchykhin/ok_SCI_1166 
Whitelist application/zip file type in paperclip for some .xlsx files [SCI-1166]
 2017-04-05 09:55:39 +02:00
Oleksii Kriuchykhin ba4dbe49f8 Whitelist application/zip file type in paperclip for some .xlsx files [SCI-1166] 2017-04-04 10:51:54 +02:00
zmagod e016bda9d2 adds expired days in constant 2017-04-04 10:16:54 +02:00
zmagod 99c116f257 first run 2017-04-04 09:19:43 +02:00
mlorb 317739af1e Merge pull request #530 from biosistemika/ml_sci_1044 
Add data-hook and yadcf-filter plug-in [SCI-1044]
 2017-03-31 14:00:23 +02:00
Mojca Lorber 6a4faf8765 add color constants 2017-03-31 13:24:08 +02:00
okriuchykhin d39940efea Merge pull request #526 from okriuchykhin/ok_SCI_1096 
Add docker files for running in production mode [SCI-1096]
 2017-03-30 10:40:50 +02:00
zmagod 0096f9dc14 refactor 2017-03-29 09:32:23 +02:00
Oleksii Kriuchykhin a7be37ef67 Add docker files for running in production mode [SCI-1096] 2017-03-27 14:36:20 +02:00
zmagod 0996c14449 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765 2017-03-27 10:41:58 +02:00
zmagod 2235fd3fb7 adds view if download expires 2017-03-27 10:38:28 +02:00
mlorb 3beb179f87 Merge pull request #514 from biosistemika/ml_sci_1089 
Add error messages to sample group/type edit/delete actions [SCI-1089]
 2017-03-27 09:57:32 +02:00
zmagod 4635a3320d Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-24 16:09:28 +01:00
zmagod f380e08ab0 fixed hound 2017-03-24 12:42:50 +01:00
zmagod 023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
zmagod 94732c6d18 adds delayed zip generator 2017-03-23 15:45:02 +01:00
Luka Murn 541998bde6 Bump version to 1.9.0 2017-03-23 14:37:47 +01:00
zmagod 4385c68f5f adds zip_export utility first run 2017-03-21 16:15:11 +01:00
Oleksii Kriuchykhin 8a8720fcfe Add missing translation for protocol load [SCI-1125] 2017-03-21 15:07:59 +01:00
Mojca Lorber 83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
Oleksii Kriuchykhin d17eb2b3f7 Add missing translations for samples assign/unassign activities [SCI-1114] 2017-03-17 14:15:50 +01:00
zmagod 856a4611c6 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-14 15:58:08 +01:00
zmagod 0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
zmagod 1d42d46c02 fixes bug with step comments 2017-03-09 16:02:52 +01:00
zmagod 3057965940 fix bug with filenames 2017-03-09 11:48:50 +01:00
zmagod 9939d8df06 refactor 2017-03-09 10:51:54 +01:00
Luka Murn 1026700b40 Merge pull request #509 from biosistemika/lm-sci-1052-fix 
Allow upload of .dot, .pot, .rtf files [SCI-1052]
 2017-03-09 10:47:19 +01:00
zmagod 49f91184da fixes locals 2017-03-09 09:55:15 +01:00
zmagod 5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Luka Murn 0916e7e40d Allow upload of .dot, .pot, .rtf files 
Closes SCI-1052.
 2017-03-06 15:01:32 +01:00
Luka Murn 473487faec Add HTML <head><title> to edit, view file pages 
Closes SCI-1049.
 2017-03-06 13:55:07 +01:00
zmagod e1b3dcc2ba adds enum extends to report element part of SCI-1003 2017-02-27 13:53:46 +01:00
Luka Murn 634336e1a4 Merge pull request #499 from biosistemika/lm-test-deface 
Add Deface checking of environmental variables
 2017-02-27 13:17:46 +01:00
Luka Murn 8e09e86a0e Change Deface config so it defaults to 'true' 2017-02-27 12:54:51 +01:00
Luka Murn de8034c5b9 Update environment settings 2017-02-27 09:40:01 +01:00
Luka Murn fecfc9e41d Merge pull request #498 from biosistemika/release-1.8.1 
Release 1.8.1
 2017-02-23 14:57:30 +01:00
Luka Murn 98e2a56670 Bump version to 1.8.1 2017-02-23 14:00:46 +01:00
Luka Murn cb12bfddc0 Merge pull request #497 from biosistemika/release-1.8.0 
Version bump to 1.8.0
 2017-02-23 11:36:24 +01:00
Luka Murn 52ab6d096f Version bump to 1.8.0 2017-02-23 11:15:26 +01:00
Luka Murn 0a271843a4 Also (temporarily) add this to development.rb 2017-02-23 10:39:34 +01:00
Luka Murn 5a35ab9677 Test Deface change 2017-02-23 09:46:04 +01:00
okriuchykhin 75792cde14 Merge pull request #492 from okriuchykhin/ok_SCI_759 
Add more extensive explanation when project name is already taken [SCI-759]
 2017-02-22 16:25:16 +01:00
Oleksii Kriuchykhin 95953e9269 Fix tutorial step 26 wording [SCI-734] 2017-02-22 14:46:38 +01:00
Oleksii Kriuchykhin 35b0b33ddf Add more extensive explanation when project name is already taken [SCI-759] 2017-02-22 14:18:48 +01:00
Mojca Lorber 0fd41e8a6d remove changes on user has no teams view 2017-02-21 15:12:58 +01:00
Mojca Lorber 90864a45a0 fix user has no teams view 2017-02-21 13:08:06 +01:00
okriuchykhin 8e18ff44a6 Merge pull request #479 from okriuchykhin/ok_SCI_999 
Add task complete/uncomplete functionality [SCI-999]
 2017-02-20 15:19:00 +01:00
Luka Murn d097f0dd15 Merge pull request #477 from Ducz0r/lm-sci-928 
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
 2017-02-13 16:42:57 +01:00
Oleksii Kriuchykhin f97c20e9b5 Fix hound warnings [SCI-999] 2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00
Luka Murn 3eb4faa44b Fix task restore action 
Closes SCI-991.
 2017-02-10 14:08:56 +01:00
Luka Murn 280b7a0e75 Minor fix 2017-02-09 15:10:45 +01:00
Luka Murn f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +01:00
Luka Murn 7bee3a4ea0 Move user profile to settings 2017-02-09 11:34:52 +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 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
Zmago Devetak 5c9954bb89 Merge pull request #450 from ZmagoD/zd_SCI_939 
Refactor "organizations" to "teams"
 2017-02-01 13:12:02 +01:00
okriuchykhin 067b9452a4 Merge pull request #464 from okriuchykhin/ok_SCI_935 
Add config option to enable/disable users registration [SCI-935]
 2017-02-01 09:36:36 +01:00
Luka Murn ec799520d4 Forgot to add en.yml 2017-01-31 16:05:13 +01:00
Luka Murn 50b8588cbf Version bump to 1.7.2 2017-01-31 15:49:58 +01:00
Luka Murn db75231617 Update URLs to sciNote support pages 
Closes SCI-978.
 2017-01-31 15:48:56 +01:00
Oleksii Kriuchykhin b35e7e70ba Enable user registration by default [SCI-935] 2017-01-31 11:10:46 +01:00
Oleksii Kriuchykhin d1e69438de Add config option to enable/disable users registration [SCI-935] 2017-01-30 15:04:02 +01:00
zmagod e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Luka Murn b2d2f56bdd Version bump to 1.7.1 2017-01-26 17:00:54 +01:00
Luka Murn 042a85af45 Bump version to 1.7.0 2017-01-25 18:22:11 +01:00