scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-10-01 20:36:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
3303 commits 69 branches 179 tags 166 MiB
Commit graph

74 commits

Author SHA1 Message Date
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
zmagod 862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
zmagod 219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin 6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +01:00
Luka Murn d715eb06ef Add team & project role-related helper functions to User model 
This will be required later once we start using Canaid.
 2017-11-16 15:50:30 +01:00
zmagod e0b6683a44 create view directory per @Ducz0r 's request 2017-11-09 10:06:53 +01:00
zmagod e0323a0a46 fixes failing tests 2017-10-27 09:35:39 +02:00
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod 6fe48a07ae fix hound, add custom hook for webpacker:compile 2017-10-16 17:02:35 +02:00
zmagod c5978f2d86 adds cucumber test for profile page [fixes SCI-1572] 2017-10-16 16:21:52 +02:00
zmagod c20f0c2d8a fixes user_controller specs, adds user model specs for settings 2017-10-05 15:53:05 +02:00
zmagod a020e23286 follow suggestions of @Ducz0r 2017-10-05 13:56:56 +02:00
zmagod cb4bacc372 refactor preferences page [fixes SCI-1564] 2017-09-28 16:53:51 +02:00
zmagod c8c8afdd1d update react-bootstrap 2017-09-28 15:00:54 +02:00
zmagod 26b526d61b adds getter and setters for user settings 2017-09-27 14:38:52 +02:00
zmagod e2aa0d7515 fixes user profile 2017-09-26 17:29:11 +02:00
Luka Murn e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
zmagod 9c01ab414c refactor leave team 2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
zmagod 478bd491ff added pagination and sorting to team tables 2017-08-28 17:05:09 +02:00
zmagod db16da7bd6 adds custom query to fetch teams data 2017-08-25 16:07:37 +02:00
Luka Murn ec7b7ffe08 You are my sunshine, my only sunshine, 
You make me happy when skies are grey
You never know, Hound, how much I love you
Please don't take my Hound away
 2017-08-10 14:42:58 +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
zmagod c314bae28d add team switch js/controller 2017-08-03 16:03:15 +02:00
zmagod 750c82a80f setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Luka Murn 9e45d197df Change some stuff for repos to work, fix some bugs 
Closes SCI-1279.
 2017-06-07 18:07:49 +02:00
Oleksii Kriuchykhin ad8dd6d740 PR fixes [SCI-1274] 2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin 8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
zmagod 94732c6d18 adds delayed zip generator 2017-03-23 15:45:02 +01:00
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