mlorb
|
9e11f3b220
|
update buttons positions and wording throughout app
|
2018-04-25 13:57:12 +02:00 |
|
Luka Murn
|
9bf8b5d864
|
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
|
2018-04-12 13:16:46 +02:00 |
|
mlorb
|
8a35ce5c58
|
add locales
|
2018-04-09 10:53:03 +02:00 |
|
mlorb
|
70dfe66b2d
|
refactoring
|
2018-04-06 14:20:40 +02:00 |
|
mlorb
|
b8e91e91a1
|
refactor settings into the new navigation bar
|
2018-04-05 16:30:02 +02:00 |
|
Oleksii Kriuchykhin
|
3b7977ee3b
|
Merge latest changes from ux-release-1 [SCI-2217]
|
2018-04-04 14:20:34 +02:00 |
|
Oleksii Kriuchykhin
|
f656ad1561
|
Fix fa icons [SCI-2217]
|
2018-03-30 17:03:44 +02:00 |
|
mlorb
|
4bf9369bc5
|
refactor buttons
|
2018-03-29 13:58:14 +02:00 |
|
okriuchykhin
|
145f49de2d
|
Revert "Update turbolinks and fix repository table init [SCI-2251]"
|
2018-03-26 17:38:48 +02:00 |
|
Oleksii Kriuchykhin
|
07070df1b4
|
Fix users profile edit form [SCI-2251]
|
2018-03-26 13:47:12 +02:00 |
|
Oleksii Kriuchykhin
|
a105e61d48
|
Remove tutorial [SCI-1860]
|
2018-03-18 13:18:05 +01:00 |
|
Oleksii Kriuchykhin
|
37f675b32a
|
Use larger LinkedIn sign-in button [SCI-2201]
|
2018-03-18 12:18:33 +01:00 |
|
mlorb
|
f5949e9d10
|
refactor
|
2018-03-01 17:52:24 +01:00 |
|
mlorb
|
08439e7f58
|
sign up with linkedIn account
|
2018-02-28 18:12:21 +01:00 |
|
Zmago Devetak
|
0583979cf9
|
Merge pull request #993 from ZmagoD/zd_SCI_2039
fixes errors with form id duplicates [fixes SCI-2039]
|
2018-02-15 11:10:43 +01:00 |
|
Matej Zrimšek
|
d423700e84
|
Used permissions where they were missing.
|
2018-02-14 13:16:32 +01:00 |
|
zmagod
|
ace78cfb58
|
fixes errors with form id duplicates [fixes SCI-2039]
|
2018-02-09 14:54:16 +01:00 |
|
zmagod
|
25dcfe66ae
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960
|
2018-02-01 16:04:05 +01:00 |
|
zmagod
|
34f5076b04
|
fixes failin specs [fixes SCI-2001]
|
2018-01-31 12:05:45 +01:00 |
|
zmagod
|
76b08e6ac9
|
add permissions in views
|
2018-01-24 13:59:57 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Oleksii Kriuchykhin
|
baf3151bb0
|
Fix notification settings accessors [SCI-1864]
|
2017-12-13 11:59:53 +01:00 |
|
Oleksii Kriuchykhin
|
84f4aba213
|
Pull latest master into gilson-iot-rails4
|
2017-11-15 15:15:26 +01:00 |
|
zmagod
|
33ebe1f748
|
integration tests for forgot_password [fixes SCI-1576]
|
2017-11-08 16:23:52 +01:00 |
|
okriuchykhin
|
2e0bf91467
|
Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
|
2017-10-27 11:14:39 +02:00 |
|
zmagod
|
5e6a4bb69a
|
adds environment variable that disables/enables the creation of new team when user sign up
|
2017-10-25 15:29:04 +02:00 |
|
mlorb
|
550c5ad6f6
|
add integration test for signup.feature
|
2017-10-20 14:48:47 +02:00 |
|
Luka Murn
|
4e06b5c397
|
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
|
2017-10-17 13:17:49 +02:00 |
|
Luka Murn
|
4d8f2665d3
|
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
|
2017-10-17 13:10:02 +02:00 |
|
Luka Murn
|
fe89b942e7
|
Add Add-ons page to User -> Settings -> Account
Closes SCI-1675.
|
2017-10-11 14:15:37 +02:00 |
|
Oleksii Kriuchykhin
|
bd26052110
|
Remove GIOT sign-in button [GIOT-55]
|
2017-10-09 11:56:46 +02:00 |
|
mlorb
|
55772a80ab
|
fix hound and refactor
|
2017-09-21 10:45:36 +02:00 |
|
mlorb
|
48c8922604
|
adds invite users modal
|
2017-09-21 10:45:35 +02:00 |
|
Luka Murn
|
e078ae4f77
|
Merge branch 'rails-5.1' into decoupling-settings-page
|
2017-09-21 08:36:09 +02:00 |
|
Oleksii Kriuchykhin
|
c3fceb90df
|
Backport API to Rails-4 [SCI-1579]
|
2017-08-30 13:30:41 +02:00 |
|
Luka Murn
|
9227ea5854
|
Finish the user settings jsonb, also fix references throughout app
Closes SCI-1475.
|
2017-08-10 14:29:01 +02:00 |
|
Luka Murn
|
c62002381b
|
Add default settings migration and concern
|
2017-08-10 11:30:57 +02:00 |
|
lenart
|
74e723d5d5
|
Changed data hook name and form id [SCI-1430]
|
2017-07-03 11:28:35 +02:00 |
|
lenart
|
8ec458db91
|
Added data hook and form id for GA tracking [SCI-1430]
|
2017-06-30 10:06:54 +02:00 |
|
zmagod
|
f104444a0c
|
adds additional explanations [fixes SCI-1103]
|
2017-04-12 16:56:47 +02:00 |
|
mlorb
|
317739af1e
|
Merge pull request #530 from biosistemika/ml_sci_1044
Add data-hook and yadcf-filter plug-in [SCI-1044]
|
2017-03-31 14:00:23 +02:00 |
|
Mojca Lorber
|
503ee5b62e
|
change place of data-hook
|
2017-03-30 17:21:29 +02:00 |
|
Mojca Lorber
|
9458f391e5
|
add data-hook and yadcf-filter plug-in
|
2017-03-29 15:59:51 +02:00 |
|
zmagod
|
023b3213e8
|
fixes email link [fixes SCI-765]
|
2017-03-24 12:10:07 +01:00 |
|
Mojca Lorber
|
6b30f097f0
|
fix visual bug in edit avatar mode
|
2017-02-21 14:02:42 +01:00 |
|
Luka Murn
|
6f1c19ae2d
|
Fix _user_dropdown.html.erb
|
2017-02-21 09:27:42 +01:00 |
|
Luka Murn
|
d097f0dd15
|
Merge pull request #477 from Ducz0r/lm-sci-928
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
|
2017-02-13 16:42:57 +01:00 |
|
Luka Murn
|
f93cc89624
|
Fix system notification email links not working bug
Closes SCI-964.
|
2017-02-10 15:13:33 +01:00 |
|
Luka Murn
|
f7bd62547e
|
Refactor teams settings into its own controllers
|
2017-02-09 14:37:59 +01:00 |
|
Luka Murn
|
7bee3a4ea0
|
Move user profile to settings
|
2017-02-09 11:34:52 +01:00 |
|
Luka Murn
|
5cb3eb5e09
|
Refactor preferences -> move them to subcontroller, subroute
|
2017-02-09 11:07:16 +01:00 |
|
okriuchykhin
|
c2a69982aa
|
Merge pull request #471 from okriuchykhin/ok_SCI_936
Adds datatable to all teams page [SCI-936]
|
2017-02-07 10:33:33 +01:00 |
|
zmagod
|
c99a540eb3
|
adds hook to team name in the invitation template [fixes SCI-930]
|
2017-02-03 16:53:42 +01:00 |
|
Oleksii Kriuchykhin
|
62535a01bd
|
Move teams datatable js code into separate file [SCI-936]
|
2017-02-03 10:44:42 +01:00 |
|
Oleksii Kriuchykhin
|
8b105aa030
|
Add override hooks [SCI-936]
|
2017-02-02 23:35:47 +01:00 |
|
Zmago Devetak
|
65bbd81497
|
Merge pull request #469 from ZmagoD/zd_SCI_929
Adds hook in user settings navigation
|
2017-02-02 15:01:37 +01:00 |
|
mlorb
|
5510fa7751
|
rename data-hooks in team view
|
2017-02-02 10:36:23 +01:00 |
|
Oleksii Kriuchykhin
|
db90c5d63b
|
Add datatable to all teams page [SCI-936]
|
2017-02-02 09:53:59 +01:00 |
|
zmagod
|
bb42bd04a5
|
adds hook in user settings navigation
|
2017-02-01 17:10:22 +01:00 |
|
Mojca Lorber
|
86351ce17d
|
add data-hooks for billing
|
2017-02-01 15:01:54 +01:00 |
|
Mojca Lorber
|
d3e0eca44e
|
redesign individual team page
|
2017-02-01 14:44:47 +01:00 |
|
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 |
|