scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
4260 commits 31 branches 181 tags 166 MiB
Commit graph

43 commits

Author SHA1 Message Date
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
Matej Zrimšek
321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
mlorb
99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb
29f9414839 refactor create project permission 2017-12-14 14:18:17 +01:00
zmagod
c35e2a4860 adds persistence to experiments order in project overview [fixes SCI-974] 2017-05-15 09:54:37 +02:00
Oleksii Kriuchykhin
c119b7c014 Make sciNote work for users without any teams [SCI_934] 2017-02-01 14:16:26 +01:00
zmagod
c2c5616078 rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
zmagod
21c2f82582 rename controllers where org/organization 2017-01-24 16:57:14 +01:00
okriuchykhin
02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
Matej Zrimšek
93a8e0bdae Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848] 2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin
0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
Matej Zrimšek
5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Oleksii Kriuchykhin
835e982292 SAnitize AJAX calls in controllers and datatables [SCI-102] 2017-01-05 13:12:22 +01:00
Zmago Devetak
5d0e80a5e1 Merge pull request #369 from ZmagoD/zd_SCI_812 
fixes bug with samples sorting [fixes SCI-812]
 2017-01-03 08:56:59 +01:00
Oleksii Kriuchykhin
4d3e002c81 Add sorting to Project's experiments overview [SCI-361] 2016-12-23 15:40:01 +01:00
zmagod
e2723a288c fixes bug with samples sorting [fixes SCI-812] 2016-12-21 14:32:28 +01:00
zmagod
24b81c96f6 sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608] 2016-10-24 21:20:41 +02:00
zmagod
db806f3c10 hide private projects 2016-10-21 09:06:19 +02:00
zmagod
4c086a6fc1 removes archived projects from index page [fixes SCI-585] 2016-10-20 13:13:44 +02:00
zmagod
fa36488397 fixed new project form 2016-10-17 15:10:26 +02:00
zmagod
3117a464f0 fixed controllers 2016-10-17 15:10:26 +02:00
zmagod
bb9c03df24 fixes controllers 2016-10-17 15:10:26 +02:00
zmagod
d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
Luka Murn
4ea86d6aa1 Code style fixes 2016-07-29 10:41:08 +02:00
Luka Murn
edafcaeed6 Move route module_archive_project -> module_archive_experiment 
Also add some new routes, move some templates.
 2016-07-29 10:25:02 +02:00
Luka Murn
ebda92ef05 Add experiments_controller 2016-07-29 10:21:21 +02:00
Luka Murn
b64e200b91 Refactor canvas a lot. 
Also refactor localization files concerning canvas.
 2016-07-28 16:41:10 +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