scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-22 04:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity
8506 commits 55 branches 189 tags 171 MiB
Commit graph

78 commits

Author SHA1 Message Date
Urban Rotnik
042231469c Fix syntax 2020-10-30 13:37:59 +01:00
Urban Rotnik
b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
aignatov-bio
16fe11f0f7 Fix smitch team on link for object from other team 2020-09-28 17:16:18 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin
48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
aignatov-bio
2269299b61 Fixed projects ordering in sidebar on team page 2020-06-01 10:55:23 +02:00
aignatov-bio
9e15d1ea42 Refactor experiment sidebar 2020-02-27 16:04:44 +01:00
Oleksii Kriuchykhin
16b591b110 Fix sidebar update for inline editing [SCI-4000] 2020-01-06 16:07:23 +01:00
Mojca Lorber
47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Luka Murn
701bdbd294 Remove archive controller action 2019-08-21 16:01:12 +02:00
Luka Murn
084cdcdd6b Remove old archive endpoint, controller logic 2019-08-21 13:17:19 +02:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
Oleksii Kriuchykhin
40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Oleksii Kriuchykhin
d7d45bec70 Fix links for archived objects in global activities [SCI-3229] 2019-03-28 13:43:50 +01:00
Mojca Lorber
c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Mojca Lorber
d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik
9ed3313f0f Create project activity refactored 2019-03-11 08:36:15 +01:00
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Mojca Lorber
fa1dff6352 refactor Demo project generation 2019-01-24 13:40:53 +01:00
mlorb
4040b31143 Fix behavior when user has no teams 2018-12-10 15:42:05 +01:00
Oleksii Kriuchykhin
2c96f08b98 Refresh sidebar when project is archived/restored [SCI-2881] 2018-11-29 14:20:20 +01:00
Luka Murn
c0940b143a Fix root page bug introduced with merge features/core-api -> master 2018-11-13 21:24:20 +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
mlorb
a56d22a329
change count to size 2018-11-08 09:43:32 +01:00
mlorb
4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
Matej Zrimšek
18e52e2c6f Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin
f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00
Oleksii Kriuchykhin
af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin
492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin
2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Oleksii Kriuchykhin
84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Zanz2
728b1fe491 Reverted deleted lines by accident 2018-08-28 14:51:05 +02:00
Zanz2
b26530a02f Found a new, and more elegant fix inside controller with Luka 2018-08-28 14:48:23 +02:00
zmagod
29e0ecbc89 move FirstTimeDataGenerator helper from applictaion controller 2018-07-11 11:19:39 +02:00
Oleksii Kriuchykhin
58d8414f92 Code fixes for sidebar [SCI-2478] 2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin
2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
mlorb
600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +02:00
zmagod
a2d8285f35 fixes archive button but [fixes SCI-2300] 2018-04-16 09:22:10 +02:00
Luka Murn
09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +02:00
Luka Murn
9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
mlorb
bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
Oleksii Kriuchykhin
a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
Matej Zrimšek
b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
Matej Zrimšek
d058c371d4 Readded project archive permission. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
93536afcd5 Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
a21343a819 Fixing and refactoring project permissions in controllers. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
279da20060 Fixed Hound warnings. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
d423700e84 Used permissions where they were missing. 2018-02-14 13:16:32 +01:00