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
7410 commits 70 branches 179 tags 165 MiB
Commit graph

142 commits

Author SHA1 Message Date
zmagod 0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
Luka Murn 86be639a7c Please the Hound 2017-02-13 14:20:44 +01:00
Luka Murn c6ed73bc82 Allow team admins to see all projects, even hidden ones 2017-02-13 13:42:53 +01:00
zmagod 1220466035 fixing hound 2017-01-25 15:00:14 +01:00
zmagod 9d90b9b42a rename Organization to Team in models 2017-01-24 17:08:48 +01:00
zmagod a193850ae6 rename models where org/organization 2017-01-24 16:34:21 +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
zmagod a434649f42 Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-01-03 16:35:25 +01:00
zmagod e554fdf805 code refactor 2016-12-21 16:52:15 +01:00
Zmago Devetak c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
Nbernot 1eb3ddee53 Token expiration restored to 1 day. 2016-12-08 11:12:24 +01:00
Luka Murn 62353b6c3b Temporary change token expiration 2016-12-06 16:33:32 +01:00
Mojca Lorber 01e75fbbcc create samples table model and migration 2016-12-05 11:08:33 +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
Nejc Bernot c54bd6df82 Added user ids to wopi tokens 2016-12-01 13:48:11 +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
Nejc Bernot cb03ed8384 Users can now have multiple tokens 
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
 2016-11-30 16:48:42 +01:00
Mojca Lorber 51abd8907c add switch to toggle email confirmations 2016-11-23 09:49:52 +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 eb4d031b79 Fix destroying of users in relation to notifications 2016-11-15 15:56:32 +01:00
Oleksii Kriuchykhin ab895ae864 Show only protocols from Protocol Management in users statistics [SCI-658] 2016-11-11 12:14:57 +01:00
Luka Murn 0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +01:00
Oleksii Kriuchykhin d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
zmagod e02132578a first run 2016-10-24 20:07:20 +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
Jure Grabnar 3bc683be8f Fix access_token_ttl calculation 2016-09-29 10:57:08 +02:00
zmagod 485497334d generated notification related migrations and model tests 2016-09-28 14:18:52 +02:00
Jure Grabnar 5aea0fbb19 Refactor the rest of WOPI logic from Nejc 2016-09-28 09:33:44 +02:00
Nejc Bernot 1b260785ec First working version of office integration 
Only works on scinote-preview
 2016-09-28 09:33:44 +02:00
Nejc Bernot b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +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 c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
Matej Zrimšek ffe6799313 Fixed hound alerts. 2016-09-16 15:57:54 +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 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