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

4696 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jure Grabnar 87d5e5029a Fix publish_date in PIO import 2018-11-23 17:37:26 +01:00
Jure Grabnar 76c2da4bae Add uniq tables 2018-11-23 16:30:29 +01:00
Jure Grabnar 13bc664902
Merge pull request #1367 from jbargu/jg_2746_health_unit_tests 
Add unit tests for status/health API endpoints
 2018-11-19 13:14:38 +01:00
mlorb 3b96a60938
Merge pull request #1374 from mlorb/ml-sci-2842 
Update the Export all confirmation modal and export interaction [SCI-2842]
 2018-11-19 11:36:08 +01:00
Alex Kriuchykhin d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778 
Add time format selection to settings [SCI-2778]
 2018-11-19 10:17:09 +01:00
mlorb 4b540958bd change close/cancel button and refactor export_project_modal endpoint 2018-11-16 13:37:32 +01:00
Alex Kriuchykhin c184ca1c95
Merge pull request #1373 from okriuchykhin/ok_SCI_2860 
Fix sorting on projects table [SCI-2860]
 2018-11-15 16:28:41 +01:00
mlorb 6453ab6fb1 update the Export all confirmation modal and export interaction 2018-11-15 15:53:58 +01:00
Oleksii Kriuchykhin 7642d8d472 Fix sorting on projects table [SCI-2860] 2018-11-15 10:36:37 +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
Alex Kriuchykhin 324069c071
Merge pull request #1370 from okriuchykhin/ok_SCI_2853 
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
 2018-11-14 13:51:43 +01:00
Luka Murn 2ecefe0e6d
Merge pull request #1371 from Ducz0r/lm-fix-visual-bug-projects-index 
Fix visual bug (everything bold) on projects index page
 2018-11-14 13:37:17 +01:00
Oleksii Kriuchykhin 3fd687161f Remove unused variables from activities controller [SCI-2778] 2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin 537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin c44109958a Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853] 2018-11-14 12:56:04 +01:00
Luka Murn 98a39ecd72 Fix visual bug (everything bold) on projects index page 
Bug was introduced in projects absent section, there was no
closing </strong> tag.
 2018-11-14 11:33:27 +01:00
Luka Murn c0940b143a Fix root page bug introduced with merge features/core-api -> master 2018-11-13 21:24:20 +01:00
mz3944 056efe170b
Merge pull request #1358 from mz3944/mz-SCI-2646 
Removal of the temporary files for export all [SCI-2646]
 2018-11-13 20:31:04 +01:00
Luka Murn 84df2c81f9 Merge branch 'features/export-all' 
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
 2018-11-13 09:14:02 +01:00
Jure Grabnar 7a320ae031 Update formating according to Hound 2018-11-12 17:51:23 +01:00
Alex Kriuchykhin b16646b0b4
Merge pull request #1366 from okriuchykhin/ok_SCI_2839 
Improve Export All button behaviour [SCI-2839]
 2018-11-12 17:32:33 +01:00
Jure Grabnar 1c08aa6a8b Add unit tests for status/health API endpoints 
Closes [SCI-2746].
 2018-11-12 17:17:47 +01:00
Luka Murn 602e2c679f Merge remote-tracking branch 'upstream/core-api' into core-api 2018-11-12 17:09:17 +01:00
Oleksii Kriuchykhin 98d1ea8542 Improve Export All button behaviour [SCI-2839] 2018-11-12 15:51:03 +01:00
Alex Kriuchykhin c9f015fa0c
Merge pull request #1365 from okriuchykhin/ok_SCI_2847 
Fix user counters on projects overview page [SCI-2847]
 2018-11-12 15:04:02 +01:00
Oleksii Kriuchykhin 145c66a834 Fix user counters on projects overview page [SCI-2847] 2018-11-12 11:52:38 +01:00
Oleksii Kriuchykhin e89d60785f Fix dates on activities and experiments [SCI-2778] 2018-11-12 10:26:48 +01:00
mlorb d1102a7402
Merge pull request #1363 from mlorb/ml-sci-2795 
Fix user_project manage permission [SCI-2795]
 2018-11-12 09:54:50 +01:00
Oleksii Kriuchykhin 8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
mlorb 75875e5421 fix user_project manage permission 2018-11-09 11:36:44 +01:00
Alex Kriuchykhin a857af6c38
Merge pull request #1341 from okriuchykhin/ok_SCI_2773 
Improve error messages in API [SCI-2773]
 2018-11-09 09:38:20 +01:00
Alex Kriuchykhin eb72ea69dd
Merge pull request #1361 from okriuchykhin/ok_SCI_2785_v2 
Improve counters on projects overview table [SCI-2785]
 2018-11-09 09:37:41 +01:00
Matej Zrimšek 159f6d1ee2 Minor refactoring of exports [SCI-2646] 2018-11-08 21:39:09 +01:00
Matej Zrimšek b7fdd82409 Ensure temp files deletion after export is done [SCI-2646] 2018-11-08 21:32:07 +01:00
mlorb 46080a2b21
Merge pull request #1360 from mlorb/ml-sci-2837 
Fix empty projects page bug and projects tree bug [SCI-2837]
 2018-11-08 15:00:44 +01:00
mlorb a56d22a329
change count to size 2018-11-08 09:43:32 +01:00
Oleksii Kriuchykhin 1feb13c74a Improve counters on projects overview table [SCI-2785] 2018-11-07 22:27:57 +01:00
Oleksii Kriuchykhin 23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin 30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin 60e78fa868 Improve code style for error handling [SCI-2773] 2018-11-07 15:43:44 +01:00
Luka Murn 70bb539061 Merge remote-tracking branch 'upstream/core-api' into core-api 2018-11-07 13:52:50 +01:00
mlorb 4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
mlorb 039faf2964
Merge pull request #1359 from mlorb/ml-sci-2843 
Fix bug with new project button not working [SCI-2843]
 2018-11-07 11:02:47 +01:00
Alex Kriuchykhin 74d99973a5
Merge pull request #1357 from okriuchykhin/ok_SCI_2834 
Fix permission helpers in delayed export job [SCI-2834]
 2018-11-07 10:56:10 +01:00
Oleksii Kriuchykhin 82a11ebca2 Remove duplicate destroy for report [SCI-2834] 2018-11-07 09:55:06 +01:00
Matej Zrimšek 2f6a6072e1 Fix repository ZIP export test to work with enabled workers [SCI-2646] 2018-11-07 06:14:40 +01:00
Matej Zrimšek 8fe0249f45 Fix test for repository ZIP export & return path for ZIP exports [SCI-2646] 2018-11-07 05:04:29 +01:00
mlorb 63e039e235 fix bug with new project button not working 2018-11-06 11:38:31 +01:00
Luka Murn b9ac110574
Merge pull request #1342 from Ducz0r/lm-sci-2764 
Update styling of Sign up page [SCI-2764]
 2018-11-06 10:52:35 +01:00
Oleksii Kriuchykhin 0e192cc830 Ensure that temporary report is always deleted [SCI-2834] 2018-11-06 09:33:18 +01:00