zmagod
21c2f82582
rename controllers where org/organization
2017-01-24 16:57:14 +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
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +01:00
Luka Murn
ef688feb4e
Hotfix 1.6.1
...
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin
835e982292
SAnitize AJAX calls in controllers and datatables [SCI-102]
2017-01-05 13:12:22 +01:00
zmagod
ac52e643be
cleanup direct upload
2016-12-08 11:26:13 +01:00
Luka Murn
372b455d7d
Merge pull request #332 from Ducz0r/lm-sci-750-751
...
Fix inviting users not working
2016-12-01 15:52:40 +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
Matej Zrimšek
3bdaa4bcef
Some token authentication refactoring and error handilng fixes. [closes SCI-689]
2016-12-01 15:38:56 +01:00
Matej Zrimšek
46465060d0
Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]
2016-11-30 16:56:56 +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
okriuchykhin
5981d1a48e
Merge pull request #316 from okriuchykhin/ok_SCI_738
...
Add full name field to accept invitation form [SCI-738]
2016-11-25 16:15:23 +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
87d3280847
Refactor registrations_controller code slightly
2016-11-25 09:56:07 +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
60f23b109b
integrate reCaptcha into sciNote
2016-11-22 14:57:41 +01:00
Luka Murn
3be30c0e7a
Re-introduce fix for SCI-650 that was lost during merge
...
Closes SCI-650.
2016-11-18 10:57:03 +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
04749c3b2c
Allow inviting of existing, unconfirmed users
...
Closes SCI-676.
2016-11-15 15:04:31 +01:00
Luka Murn
861e7cf72d
Update invited user form so it works if user inputs empty team name
...
Closes SCI-650
2016-11-11 17:27:32 +01:00
Luka Murn
564274a588
Set invited_by field to invited users
2016-11-10 14:45:24 +01:00
Mojca Lorber
27c83992b4
refactoring notification method
2016-11-07 15:31:06 +01:00
Luka Murn
ce7733e9e9
Also add notification when UserOrganization is created
2016-11-07 09:47:30 +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
Mojca Lorber
749b108928
fix hound
2016-11-02 13:32:15 +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
zmagod
6a328969f0
reset current_user if the user leaves the team [fixes SCI-599]
2016-10-25 09:53:02 +02:00
zmagod
e02132578a
first run
2016-10-24 20:07:20 +02:00
zmagod
557957c857
fixed issue with mozilla browsers
2016-10-17 15:21:19 +02:00
zmagod
1614cbc2b2
fixes repeat tutorial button and localization typos
2016-10-17 15:16:22 +02:00
zmagod
931cba2666
fixes hound [fixes SCI-512]
2016-10-17 15:10:26 +02:00
zmagod
8f24d0d80c
fixed new user registration
2016-10-17 15:10:26 +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
a6a2a237aa
Removed unneeded ERB tags, which caused error. Minor refactoring.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
5966911b92
Fixed Hound alerts.
2016-10-17 11:57:46 +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
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
Oleksii Kriuchykhin
5399033fce
Added user settings for email notifications [SCI-443]
2016-10-11 16:43:17 +02:00
zmagod
9c7a690944
fixed type, fixed settings controller, fixes setting view on mobile devices
2016-10-05 14:33:22 +02:00
zmagod
a68e7abc57
first run notification settings
2016-10-04 15:52:48 +02:00
zmagod
947096862d
fixed hound
2016-10-03 11:40:59 +02:00
zmagod
ea17182372
generate notifications [fixes SCI-440]
2016-10-03 11:37:29 +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
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
Matej Zrimšek
4ad384df5a
Fixed hound alerts.
2016-08-17 21:02:05 +02:00
Matej Zrimšek
27a9dac412
File permissions corrected, with some refactoring.
2016-08-17 18:23:24 +02:00
Matej Zrimšek
c87ba5b45c
Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.
2016-08-17 18:10:32 +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
