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

3417 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zanz2 11dc3be9d4 It is now possible to scroll down preview modal 2017-12-10 01:41:21 +01:00
Zanz2 d0a9198408 Fixed the styling 2017-12-10 01:20:08 +01:00
Oleksii Kriuchykhin 6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +01:00
Luka Murn 86ac07c69f
Merge pull request #902 from biosistemika/rails-5.1 
Merge rails-5.1 into decoupling-settings-page
 2017-12-07 09:25:11 +01:00
okriuchykhin b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747 
Improve server side assets validation display for steps [SCI-1747]
 2017-12-04 14:12:43 +01:00
okriuchykhin 1c852252c4
Merge pull request #899 from okriuchykhin/ok_SCI_1839 
Fix jsPlumb library loading [SCI-1839]
 2017-12-04 14:12:12 +01:00
zmagod 52e5cf7be8 remove unneeded import 2017-12-04 13:27:24 +01:00
zmagod e01e7bebbf add permissions endpoint on the API 2017-12-04 13:25:48 +01:00
Zanz2 b0012ab936 Simplified repeating method calls 2017-12-03 16:50:06 +01:00
Zanz2 fcbd956d6e Finished code beautification 2017-12-03 01:17:49 +01:00
Zanz2 835ac6910f Code refactor part 1 2017-12-02 00:29:47 +01:00
Zmago Devetak 205d3b3d8f
Merge pull request #894 from ZmagoD/zd_SCI_1650 
Adds task to copy images [fixes SCI-1650]
 2017-12-01 17:32:09 +01:00
zmagod b6a5ab5e6c fix request 2017-12-01 17:29:46 +01:00
zmagod 52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +01:00
Luka Murn 022c81ec1f Add developer documentation to Git 
Currently, this only includes some remarks regarding validation.
 2017-12-01 15:53:38 +01:00
Oleksii Kriuchykhin 373d7e8aa6 Clear selected files after successful upload [SCI-1747] 2017-12-01 11:51:22 +01:00
Oleksii Kriuchykhin c4fe2b1c11 Fix jsPlumb library loading [SCI-1839] 2017-12-01 10:48:07 +01:00
okriuchykhin e54bfba8fd
Merge pull request #897 from okriuchykhin/ok_SCI_1845 
Update Rails version to 4.2.10 [SCI-1845]
 2017-11-30 16:20:55 +01:00
okriuchykhin 16729ccd7d
Merge pull request #898 from okriuchykhin/ok_SCI_1838 
Fix assignment of users to projects [SCI-1838]
 2017-11-30 11:16:07 +01:00
okriuchykhin 9ed73702c5
Merge pull request #896 from okriuchykhin/ok_SCI_1837 
Fix Ajax calls with redirect [SCI-1837]
 2017-11-30 11:00:26 +01:00
okriuchykhin 7dfaab82bb
Merge pull request #895 from okriuchykhin/ok_SCI_1840 
Add initialization of the selectpicker on experiments actions [SCI-1840]
 2017-11-30 10:56:07 +01:00
Oleksii Kriuchykhin 194054d973 Fix assignment of users to projects [SCI-1838] 2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin 9408b29768 Update Rails version to 4.2.10 [SCI-1845] 2017-11-29 16:49:50 +01:00
Oleksii Kriuchykhin 7bb52191cd Fix Ajax calls with redirect [SCI-1837] 2017-11-29 16:13:28 +01:00
Luka Murn 92b665253f
Bump version to 1.12.7 2017-11-29 10:36:05 +01:00
Oleksii Kriuchykhin 745dac09a7 Improve clean-up of dropped files [SCI-1747] 2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin 6964ed2dbb Add initialization of the selectpicker on experiments actions [SCI-1840] 2017-11-28 16:34:30 +01:00
zmagod 7442684846 fix protocol preview, remove unneeded functions, fix copy paste tokens 2017-11-28 14:16:20 +01:00
Oleksii Kriuchykhin e35031dd9a Small code fixies [SCI-1747] 2017-11-28 11:34:57 +01:00
zmagod e233fbe1d8 fix image removing from tinymce 2017-11-28 11:01:07 +01:00
zmagod dec1e53b53 fix banana 2017-11-28 10:09:06 +01:00
Zanz2 bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 
Fixed validations lengths and added workarounds for bugs [SCI-1833]
 2017-11-24 17:55:20 +01:00
zmagod e69e9f6794 remove unneeded comment and add tiny_mce_asset regex in a constant 2017-11-24 17:04:01 +01:00
zmagod 066c782cd2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step 2017-11-24 16:29:32 +01:00
Zmago Devetak 027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651 
export and import RTE images
 2017-11-24 16:28:28 +01:00
zmagod b6c0d352bd Adds task to copy images [fixes SCI-1650] 2017-11-24 16:25:12 +01:00
Zmago Devetak 728f656472
update protocols_exporter.rb 2017-11-24 15:23:19 +01:00
Zmago Devetak 3cd7e6fdde
fix open method 2017-11-24 15:19:58 +01:00
Zanz2 0e574b2f15 removed un needed limits 2017-11-24 11:49:57 +01:00
Zmago Devetak 215fa9d0b0
Merge pull request #887 from ZmagoD/zd_SCI_1762 
fixes rspec tests
 2017-11-24 11:48:39 +01:00
zmagod d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
Zanz2 e7e37939a9 quick fix to expected result losing html 2017-11-24 11:18:12 +01:00
zmagod 65aee2630f fix makefile 2017-11-24 09:56:04 +01:00
zmagod 6987261b53 disable pending cucumber tests 2017-11-24 09:52:13 +01:00
Zanz2 dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
zmagod 6f8c97a686 remove rm container 2017-11-23 17:43:09 +01:00
mlorb 9e7b75a880
Merge pull request #892 from mlorb/ml-sci-1215_v2 
Make background gray for paperclip images [SCI-1215]
 2017-11-23 17:32:09 +01:00
zmagod b5537e2dfc change setup 2017-11-23 17:23:55 +01:00
zmagod 6d68135a70 adds mailer envs 2017-11-23 17:09:05 +01:00
zmagod 6d56377eb0 adds sleep time after Delayed::Worker.new.work_off 2017-11-23 16:57:30 +01:00