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

79 commits

Author SHA1 Message Date
zmagod bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
Zmago Devetak 0dc4addd6c fix typo 2017-05-12 10:10:50 +02:00
Oleksii Kriuchykhin bb8c7c342c Add additional info to samples info modal [SCI-960] 2017-05-11 22:20:06 +02:00
zmagod 80a0af8c9f replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241] 2017-05-11 11:36:47 +02:00
Matej Zrimšek bafdbf4082 Email is now case insensitive when inviting users by it. [fixes SCI-856] 2017-04-18 18:01:29 +02:00
Mojca Lorber 27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
zmagod 836baa7412 fixes bug with user teams table [fixes SCI-987] 2017-02-15 10:06:21 +01:00
Luka Murn 1b6f50647c Please Hound 2017-02-13 16:40:27 +01:00
Luka Murn 280b7a0e75 Minor fix 2017-02-09 15:10:45 +01:00
Luka Murn 2a9f975c13 Some minor fixes 2017-02-09 14:58:11 +01:00
Luka Murn f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +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
Oleksii Kriuchykhin cc6b518c7f Check that user is a member of a team when switching to it [SCI-984] 2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +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
zmagod be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin d1e69438de Add config option to enable/disable users registration [SCI-935] 2017-01-30 15:04:02 +01:00
zmagod c2c5616078 rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
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