Zmago Devetak
5c9954bb89
Merge pull request #450 from ZmagoD/zd_SCI_939
...
Refactor "organizations" to "teams"
2017-02-01 13:12:02 +01:00
Oleksii Kriuchykhin
d1e69438de
Add config option to enable/disable users registration [SCI-935]
2017-01-30 15:04:02 +01:00
zmagod
72e13beee3
renamed organizations in views
2017-01-25 12:01:23 +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
Oleksii Kriuchykhin
cd3924afd3
Sanitize .html_safe marked strings which contain tags [SCI-102]
2017-01-05 13:04:19 +01:00
zmagod
40fdfef67f
setup delayed_paperclip gem
2016-12-08 15:24:14 +01:00
zmagod
ac52e643be
cleanup direct upload
2016-12-08 11:26:13 +01:00
zmagod
6274cd413e
fixes bug with deleted team name [fixes SCI-746]
2016-12-02 16:07:00 +01:00
Luka Murn
6a770f6a7e
Fix inviting users not working
...
Closes SCI-750, SCI-751.
Probably reopens parts of SCI-746.
2016-12-01 15:46:37 +01:00
Luka Murn
d685ac939b
Merge pull request #326 from Ducz0r/lm-sci-746-fix
...
Fix some recaptcha form submit errors for signup pages
2016-11-30 09:35:16 +01:00
Luka Murn
e099a279b1
Remove link to "Resend confirmation instructions" if not neccesary
...
Closes SCI-747.
2016-11-29 16:12:35 +01:00
Luka Murn
b5d0a39827
Fix some recaptcha form submit errors for signup pages
...
Closes SCI-746.
2016-11-29 15:53:58 +01:00
Luka Murn
d142fa96d9
Merge pull request #317 from Ducz0r/lm-sci-735-fix
...
Add Deface hooks to sign up & confirm invitation forms
2016-11-28 10:22:46 +01:00
Luka Murn
a16bbe8fd2
Typo fix
2016-11-25 11:52:33 +01:00
Luka Murn
cb16ab3c75
Add Deface hooks to signup & confirm invitation forms
2016-11-25 11:50:20 +01:00
Oleksii Kriuchykhin
3fdb20b92c
Add full name field to accept invitation form [SCI-738]
2016-11-25 11:15:10 +01:00
Oleksii Kriuchykhin
592ed802b2
Switched to use of recaptcha_input_tag helper method [SCI-706]
2016-11-24 14:19:44 +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
Mojca Lorber
48ac289b6e
put recaptcha in helper method
2016-11-22 17:57:42 +01:00
Mojca Lorber
60f23b109b
integrate reCaptcha into sciNote
2016-11-22 14:57:41 +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
Luka Murn
a3bbf94643
Add a smart_text_area tag & implement it throughout application
...
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
2016-11-16 17:57:01 +01:00
Mojca Lorber
607f1381d0
fix mobile view
2016-11-15 10:58:15 +01:00
Oleksii Kriuchykhin
2fb3041784
Fixes edit avatar link area [SCI-649]
2016-11-11 13:17:44 +01:00
Luka Murn
0ab62576a2
Add new modal to organization page, remove old modal code
2016-11-07 09:43:10 +01:00
Matej Zrimšek
0fe5822825
Added profile statistics data hook.
2016-11-03 17:50:32 +01:00
Mojca Lorber
a234c4c9d9
fix merge conflict problem with avatar on profile page
2016-11-03 15:23:09 +01:00
Mojca Lorber
44b51d087a
merging
2016-11-02 14:06:20 +01:00
Mojca Lorber
91ec201fd0
make image clickable
2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin
d28edfb488
Added statistics block in users profile [SCI-566]
2016-10-27 13:44:27 +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
Matej Zrimšek
21ec05d541
Refactored searches (user and globals earch) and used constants.
2016-10-17 11:17:59 +02:00
Luka Murn
02d3e03f75
Bugfix for notification emails
...
The URLs in notification emails didn't get server URL prepended,
so users could not click on them.
2016-10-13 12:12:28 +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
8f783f87f7
fixes hound
2016-10-12 15:32:40 +02:00
Mojca Lorber
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +02:00
Mojca Lorber
6bea0a9e1a
fixes merge conflicts
2016-10-12 10:55:40 +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
Mojca Lorber
4f1cbad7da
adding update notifications in settings
2016-10-12 10:42:07 +02:00
Oleksii Kriuchykhin
4c6a60c249
Added html_safe to notification email template
2016-10-11 16:46:20 +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
de00a19dd9
fixes styling in settings preferences [SCI-553]
2016-10-06 13:22:44 +02:00
zmagod
9c7a690944
fixed type, fixed settings controller, fixes setting view on mobile devices
2016-10-05 14:33:22 +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
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
Luka Murn
61f4fbd1d4
Remove warning info when removing pending user from organization
2016-09-01 13:23:53 +02:00
Matej Zrimšek
ccdccc5cf1
Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.
2016-08-17 18:11:13 +02:00
Matej Zrimšek
951cf67b3d
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
2016-08-17 18:08:21 +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
