Oleksii Kriuchykhin
|
3fdb20b92c
|
Add full name field to accept invitation form [SCI-738]
|
2016-11-25 11:15:10 +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
|
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 |
|
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 |
|
Mojca Lorber
|
88890ab65b
|
fix hound
|
2016-11-22 15:05:25 +01:00 |
|
Mojca Lorber
|
60f23b109b
|
integrate reCaptcha into sciNote
|
2016-11-22 14:57:41 +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 |
|