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

84 commits

Author SHA1 Message Date
Anton Ignatov fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov 7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Oleksii Kriuchykhin 4014f19665 Update schema.rb file 2019-04-17 14:57:38 +02:00
aignatov-bio 8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) 
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
 2019-04-15 09:49:44 +02:00
aignatov-bio 08263ab64e
adding filters for task activities [SCI-3076] (#1553) 
* update task activity screen
 2019-03-28 10:55:48 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov 5d6f009ee8 fix error for delay deleting 2019-03-20 15:20:31 +01:00
Anton Ignatov 55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov 07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Anton Ignatov 87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
Urban Rotnik ad8e5973fa Remove not null constraint from project_id in Activity table 2019-03-11 08:36:15 +01:00
Miha Mencin fa7bba9de7 scheduling creation of demo project at the sign in time 
remove wrong schema, fix comment, add migration
 2019-03-04 18:26:15 +01:00
Miha Mencin 51b3aea49a added uniquness validator and index on user_projects and user_teams relations 
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
 2019-02-27 15:09:47 +01:00
Urban Rotnik 3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Urban Rotnik 5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
Urban Rotnik 7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
Urban Rotnik 8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik 3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Miha Mencin 4acd2a592d Adding previously forgotten schema file 2019-01-28 11:25:35 +01:00
Oleksii Kriuchykhin bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Oleksii Kriuchykhin 311189a2e9 Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894] 2018-12-13 11:18:09 +01:00
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +01:00
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Jure Grabnar 26df1e5a98 Add export project modal 
Closes [SCI-2645]
 2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin 49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Oleksii Kriuchykhin ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin 938ec5acb8 Change primary key to bigint on repositories [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
zmagod b13e39a0d9 adds discard gem, move deletion of repositories in a rake task to run in background worker [fixes SCI-2448] 2018-05-24 14:39:25 +02:00
zmagod b8098093ee migrations that fixes the bug with smart annotations [fixes SCI-2426] 2018-05-18 13:57:52 +02:00
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
mlorb 64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
zmagod d12f8403e4 add reference to repository column 2018-02-12 09:05:41 +01:00
zmagod ae99c92516 follow @okriuchykhin 's suggestions 2018-02-09 16:28:21 +01:00
zmagod 557aeca049 refactor relations 2018-02-09 14:11:56 +01:00
zmagod 7c13c5a1f4 fixes typo, follows @okriuchykhin 's suggestions 2018-02-09 11:38:52 +01:00
zmagod 6b7ff11bcf setup models for repository list column [fixes SCI-2015] 2018-02-07 15:28:28 +01:00
zmagod 88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
zmagod 55d05b013b fix typo 2017-11-03 10:11:23 +01:00
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +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
Matej Zrimšek ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
zmagod c35e2a4860 adds persistence to experiments order in project overview [fixes SCI-974] 2017-05-15 09:54:37 +02:00
zmagod ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02:00
zmagod 66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod 55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
zmagod 0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00