scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 06:56:54 +08:00
Code Issues Projects Releases Packages Wiki Activity
1586 commits 43 branches 185 tags 169 MiB
Commit graph

325 commits

Author SHA1 Message Date
Luka Murn
f138a39508 Merge pull request #324 from Ducz0r/lm-sci-718-fix 
Fix intro tutorial string
 2016-11-30 09:50:40 +01:00
zmagod
1859df0319 fix hound 2016-11-30 09:44:49 +01:00
Luka Murn
76ec77fce4 Merge pull request #329 from biosistemika/simplify-signup 
Merge simplify-signup into master
 2016-11-30 09:41:20 +01:00
zmagod
12848f15fa adds sample_type index view with all crud actions 2016-11-29 17:15:54 +01:00
zmagod
5c0b2d7b24 init sample_types page 2016-11-29 08:57:12 +01:00
Luka Murn
48a1c98f16 Fix intro tutorial string 
Closes SCI-718.
 2016-11-28 17:28:04 +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
okriuchykhin
f9c8223fe5 Merge pull request #321 from okriuchykhin/ok_SCI_736 
Improve regexp for image whitelisting [SCI-736]
 2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin
d8f8e01a46 Code cleanup, added new image types to whitelist [SCI-736] 2016-11-28 11:13:20 +01:00
okriuchykhin
31f6379866 Merge pull request #318 from okriuchykhin/ok_SCI_736 
Add whitelisting of supported image types [SCI-736]
 2016-11-28 09:32:49 +01:00
Luka Murn
d0b86de3a4 Use Rails's email regex 2016-11-25 17:37:27 +01:00
zmagod
9d91d2ce28 adds new samples columns dropdown [fixes SCI-698] 2016-11-25 17:29:30 +01:00
Oleksii Kriuchykhin
74f6455a8f Add whitelisting of supported image types [SCI-736] 2016-11-25 16:12:43 +01:00
Oleksii Kriuchykhin
3fdb20b92c Add full name field to accept invitation form [SCI-738] 2016-11-25 11:15:10 +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
Oleksii Kriuchykhin
698e07a3b5 Enable reCaptcha and auto log in on confirm invitation form [SCI-706] 2016-11-24 14:11:02 +01:00
Luka Murn
91ffb232e2 Version bump to 1.5.0 2016-11-24 11:37:45 +01:00
Mojca Lorber
3f7eb75e40 add comment 2016-11-24 09:48:25 +01:00
Mojca Lorber
beae54e278 remove already_authenticated alert flash 2016-11-23 14:55:41 +01:00
Luka Murn
198febfd94 Fix user projects not working 2016-11-23 13:19:10 +01:00
Mojca Lorber
51abd8907c add switch to toggle email confirmations 2016-11-23 09:49:52 +01:00
Mojca Lorber
b87bc4020b set ENABLE_RECAPTCHA to false in test environment 2016-11-23 09:36:49 +01:00
Luka Murn
fba646bfba Fix Hound errors 2016-11-22 15:19:12 +01:00
Luka Murn
7cbe44d1f2 Refactor user projects & user my modules code 2016-11-22 15:16:26 +01:00
Luka Murn
201b1a48d5 Refactor user my modules code 2016-11-22 15:07:18 +01:00
Mojca Lorber
88890ab65b fix hound 2016-11-22 15:05:25 +01:00
Luka Murn
e0607f7891 Refactor step comments code 2016-11-22 15:01:48 +01:00
Luka Murn
0c96036de8 Refactor some sample types code 2016-11-22 14:59:57 +01:00
Mojca Lorber
60f23b109b integrate reCaptcha into sciNote 2016-11-22 14:57:41 +01:00
Luka Murn
8ff5285179 Refactor some sample groups code 2016-11-22 14:57:01 +01:00
Luka Murn
f5e286b1f6 Remove unused code for some more comments 2016-11-22 14:52:43 +01:00
Luka Murn
1f7a8712fb Update task comments & task tags controllers & localized Strings 
(Remove a lot of unused code)
 2016-11-22 14:26:35 +01:00
Luka Murn
8505d75bca Fix Hound errors 2016-11-21 17:33:08 +01:00
Luka Murn
59eb1c1d18 Remove unused new, edit user_projects views 2016-11-19 17:01:10 +01:00
Luka Murn
911b7ba72f Remove unused new user_my_module view 2016-11-19 16:59:24 +01:00
Luka Murn
008b31df0c Finish removing new comment forms 2016-11-19 16:54:55 +01:00
Luka Murn
595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Matej Zrimšek
f13cc5be0e Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way). 2016-11-17 18:03:49 +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
Luka Murn
9d3685f872 Merge branch 'gamification' into 'master' 
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
 2016-11-17 16:30:18 +01:00
okriuchykhin
39d3b65c52 Merge pull request #297 from okriuchykhin/ok_SCI_685 
Improved tutorial styling [SCI-685]
 2016-11-17 10:57:10 +01:00
Oleksii Kriuchykhin
d2e29935cf Improved tutorial styling [SCI-685] 2016-11-16 15:44:06 +01:00
Oleksii Kriuchykhin
fc09cafe63 Fix tutorial strings [SCI-677] 2016-11-16 13:15:02 +01:00
Luka Murn
04749c3b2c Allow inviting of existing, unconfirmed users 
Closes SCI-676.
 2016-11-15 15:04:31 +01:00
okriuchykhin
01b01939f3 Merge pull request #277 from okriuchykhin/ok_SCI_571 
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
 2016-11-15 12:05:20 +01:00
Mojca Lorber
615cd3c278 profile changes for gamification 2016-11-14 15:04:18 +01:00
Mojca Lorber
3b7af3e66c fix validation logic 2016-11-11 11:42:16 +01:00
Oleksii Kriuchykhin
b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin
d2491a18a4 Tutorial Save Protocol step added [SCI-571] 2016-11-11 10:06:18 +01:00
Oleksii Kriuchykhin
6811120829 Added step numbers in intro tutorial [SCI-570] 2016-11-09 10:52:00 +01:00
Luka Murn
c88f834ba9 Merge pull request #269 from Ducz0r/lm-sci-569 
Add a refactored invite users modal that can be reused throughout application
 2016-11-08 16:57:05 +01:00
mlorb
0793fb9f11 Merge pull request #260 from mlorb/ml_sci_614 
Add notification for removing user from team and removing user from project [SCI-614]
 2016-11-08 11:30:49 +01:00
zmagod
808ec807c2 added extends file 2016-11-08 11:26:55 +01:00
okriuchykhin
fd805f4072 Merge pull request #259 from okriuchykhin/ok_SCI_605 
Added additional activities [SCI-605]
 2016-11-07 10:01:16 +01:00
Luka Murn
0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +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
zmagod
3c9bd6f511 enables notification to be extended 2016-11-02 14:44:16 +01:00
Mojca Lorber
44b51d087a merging 2016-11-02 14:06:20 +01:00
Mojca Lorber
a2213e23b3 add notification for removing user from team and removing user from project 2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin
e8d20dfc01 Added additional activities [SCI-605] 2016-11-02 10:43:36 +01:00
Oleksii Kriuchykhin
d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
Mojca Lorber
878952f072 change edit avatar in profile 2016-10-26 13:41:17 +02:00
Luka Murn
24cdbedd05 Bump version to 1.4.0 2016-10-25 18:15:53 +02:00
Luka Murn
4b388493b0 Fix a String 
Closes SCI-611
 2016-10-25 09:36:22 +02:00
zmagod
578ce86fed removes projects dropdown description from tutorial step [fixes SCI-589] 2016-10-20 13:29:16 +02:00
zmagod
1614cbc2b2 fixes repeat tutorial button and localization typos 2016-10-17 15:16:22 +02:00
zmagod
d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
zmagod
efe031d766 setup current_organization in all controllers 2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311 setup global team switch view and controller action 2016-10-17 15:10:26 +02:00
Matej Zrimšek
1b0fb255db Replaced hardcoded big values with infinity constant in fixtures. 2016-10-17 13:52:33 +02:00
Matej Zrimšek
a31753ea39 Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems. 2016-10-17 11:57:47 +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
Matej Zrimšek
0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Luka Murn
845d487fa1 Merge pull request #218 from Ducz0r/lm-mail-previews 
Add notification mailer preview
 2016-10-13 14:58:04 +02:00
Oleksii Kriuchykhin
c6fb57318f Added use of constants in JS [SCI-530] 2016-10-13 13:06:11 +02:00
Luka Murn
bdaeb4db13 Add notification mailer preview 2016-10-13 08:56:04 +02:00
mlorb
78f7879c04 Merge pull request #216 from mlorb/ml_sci_555 
Adding update notifications in settings [SCI-555]
 2016-10-13 08:53:55 +02:00
Mojca Lorber
42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Luka Murn
cccabcdd7b Remove invitation_to_organization email 
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
 2016-10-12 10:54:36 +02:00
Zmago Devetak
f25767fdc3 Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup 
Removed introductory popup [fixes SCI-534]
 2016-10-12 08:13:46 +02:00
Oleksii Kriuchykhin
90c853743c Additional fixes to email markup and logic [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
8dc956010c Initial code commit [SCI-443] 2016-10-11 16:43:17 +02:00
zmagod
42a30576e3 removed introductory popup [fixes SCI-534] 2016-10-11 08:33:50 +02:00
Luka Murn
448daab7c8 Merge pull request #207 from biosistemika/add-deface-hotfix 
Merge hotfix 1.3.1 into master
 2016-10-07 18:26:13 +02:00
Luka Murn
860c3f9bf1 Bump version to 1.3.1 2016-10-07 15:57:01 +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
Oleksii Kriuchykhin
4e2ad1d5e6 Fix the issues after code review [SCI-442] 2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin
8907e54b49 Global notifications index page added [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8b5b0723d1 Initial code commit 2016-10-05 15:51:11 +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
mlorb
153b692c0c Merge pull request #181 from mlorb/ml_sci_321 
Displaying more information for individual samples in Sample table [SCI-321]
 2016-10-03 16:37:35 +02:00
Mojca Lorber
3b0185a45b change title of modal 2016-10-03 16:33:58 +02:00
Zmago Devetak
91c7d8a952 Merge pull request #176 from ZmagoD/zd_SCI_474 
Unify the comments
 2016-10-03 15:26:17 +02:00
zmagod
ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +02:00
Mojca Lorber
5b32be2137 adding subtitle in modal 2016-10-03 09:28:58 +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
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
Luka Murn
f994469cb5 Bump version to 1.3 2016-09-29 13:04:28 +02:00
zmagod
cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
Mojca Lorber
efa7a1d7b5 add sample information in pop-up 2016-09-28 15:46:41 +02:00
zmagod
2a86aaf7e4 changed popout content [fixes SCI-520] 2016-09-28 15:12:30 +02:00
zmagod
1eb9f772f4 refactor sciNote comments js and unified all comments behavior [fixes SCI-474] 2016-09-27 10:30:48 +02:00
zmagod
02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Mojca Lorber
cc5cdf2577 Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321 2016-09-26 09:39:05 +02:00
Mojca Lorber
c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
mz3944
1c1a7c231e Merge pull request #169 from mz3944/mz_help_button_SCI_13 
Added help dropdown. [SCI-13]
 2016-09-23 13:04:38 +02:00
Matej Zrimšek
fc86b7b1fd Added help dropdown. [SCI-13] 2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin
e8ac754829 Fix issue with long tags in dropdown list [fixes SCI-470] 2016-09-23 11:05:17 +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
Matej Zrimšek
c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
zmagod
06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +02:00
zmagod
9f56df02d2 removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
Matej Zrimšek
c2f0106993 Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
zmagod
b9b466cd8e Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas 2016-09-16 09:28:19 +02:00
zmagod
e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +02:00
Zmago Devetak
b26bf7b183 Merge pull request #136 from ZmagoD/zd_SCI_370 
Enabled to delete results in task archive [fixes SCI-370]
 2016-09-13 15:22:08 +02:00
zmagod
691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
Zmago Devetak
d37c7b853b Merge pull request #140 from ZmagoD/zd_SCI_341 
adds label to current project in clone experiment modal [fixes SCI-341]
 2016-09-13 11:59:01 +02:00
Jure Grabnar
e07d73420d Remove spaces inside percent literal delimiters 
I mean cmon, even dogs are now barking we shouldn't be using them,
hello?!
 2016-09-13 09:54:40 +02:00
Jure Grabnar
6519e8dbb1 Add e-notation preprocessing to formulas 
SCI-350 #close
 2016-09-13 09:46:22 +02:00
Jure Grabnar
e5b2f29b42 Add libraries for HoT formulas 2016-09-13 09:44:17 +02:00
Luka Murn
ed72996523 Bump version to 1.2.3 2016-09-08 15:37:32 +02:00
Matej Zrimšek
40355dcc97 If file is recognized as office file, it's allowed to be any office file type. 2016-09-07 14:04:11 +02:00
Matej Zrimšek
f4d4977457 Removed header checking and added office file types grouping exceptions when checking file spoofing [fixes SCI-418] 2016-09-07 13:04:18 +02:00
zmagod
d482dff2e6 adds label to current project in clone experiment modal [fixes SCI-341] 2016-09-07 08:26:36 +02:00
Zmago Devetak
9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
mz3944
50e0c26e89 Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399 
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
 2016-09-05 11:49:04 +02:00
zmagod
667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
Luka Murn
77f00bf3a7 Bump version to 1.2.2 2016-09-01 11:34:28 +02:00
Matej Zrimšek
828eebeb16 Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399] 2016-08-31 17:21:17 +02:00
Luka Murn
9ceea255b2 Bump version to 1.2.1 2016-08-31 14:29:27 +02:00
Luka Murn
ae9959dc3c Bump version to 1.2.0 2016-08-31 11:22:03 +02:00
mlorb
905acfd43d Merge pull request #109 from mlorb/ml_sci_286 
fixes notification when adding new sample [SCI-286]
 2016-08-30 17:54:45 +02:00
Zmago Devetak
6878adda46 Merge pull request #112 from ZmagoD/zd_SCI_338_vol2 
Tutorial
 2016-08-30 11:07:51 +02:00
zmagod
e02478b1f9 fixed tutorial labels 2016-08-30 09:35:57 +02:00
zmagod
5518d1cd1e fixed 16 step of tutorial 2016-08-30 08:52:44 +02:00
Mojca Lorber
53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +02:00
zmagod
2ac20d1af1 adds new image + new panel title [fixes SCI-336] 2016-08-29 09:28:29 +02:00
zmagod
d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
Matej Zrimšek
e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
 2016-08-26 11:13:40 +02:00
Zmago Devetak
0cfc758f43 Merge pull request #102 from ZmagoD/zd_SCI_336 
implement first time popup logic
 2016-08-26 09:19:36 +02:00
zmagod
2031c42920 fixed confirmation text 2016-08-26 09:13:45 +02:00