scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
1625 commits 70 branches 179 tags 165 MiB
Commit graph

72 commits

Author SHA1 Message Date
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