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
13057 commits 31 branches 181 tags 166 MiB
Commit graph

13057 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
40fe4e54a9 Feed the Hound #2 2016-07-29 16:48:56 +02:00
Luka Murn
ecf5b5a2c1 Feed the Hound 2016-07-29 16:46:25 +02:00
Luka Murn
4d57479cf9 Remove comment 
Closes SCI-38.
 2016-07-29 16:40:42 +02:00
zmagod
95da62adde fixed hound 2016-07-29 16:38:42 +02:00
zmagod
25b99b6570 fixed search [fixes SCI-261] 2016-07-29 16:32:54 +02:00
Luka Murn
8a2b54819a More fixes on secondary navigation 2016-07-29 16:20:35 +02:00
Luka Murn
bed8687dbd Remove some unused commented code 2016-07-29 16:08:30 +02:00
Luka Murn
b085aa1db3 Remove uneccesary project_activities HTML pages 2016-07-29 16:06:35 +02:00
Luka Murn
ed2226c14b Refactor sidebar 2016-07-29 15:58:47 +02:00
Luka Murn
34af50a9d0 Fix breadcrumbs & sidebar so it works 2016-07-29 15:47:41 +02:00
zmagod
e5d488c2cc Merge branch 'ZmagoD-zd_SCI_277' into experiment-level 2016-07-29 14:54:05 +02:00
zmagod
ec54b4e9ba Merge branch 'zd_SCI_277' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_277 2016-07-29 14:53:20 +02:00
Luka Murn
0f0689eddc Fix permission helper 2016-07-29 11:43:15 +02:00
Luka Murn
02b7c952e6 Merge pull request #39 from biosistemika/lm-explvl-routes 
Additional fixes related to experiment level routes
 2016-07-29 10:51:14 +02:00
Luka Murn
4ea86d6aa1 Code style fixes 2016-07-29 10:41:08 +02:00
Luka Murn
affc429496 Remove experiments index 2016-07-29 10:25:02 +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
1ad265835b Move route canvas_project -> canvas_experiment 2016-07-29 10:08:28 +02:00
Luka Murn
0c75423cc0 Add TODO to project overview page 2016-07-29 09:46:26 +02:00
Luka Murn
55db93fcc1 Merge pull request #37 from ZmagoD/zd_SCI_37 
Fixing canvas, sidebar, add experiments actions
 2016-07-29 09:33:54 +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
c8ef3b1899 Fix first time generator 2016-07-28 16:40:51 +02:00
zmagod
e95f518964 refactor canvas_controller, experiments_controller 2016-07-28 16:01:53 +02:00
zmagod
d91aa5c60b fixed translation sting 'name' to 'experiment' 2016-07-28 14:57:47 +02:00
zmagod
23a46d5fb3 added translations to experiment create and edit flash messages 2016-07-28 14:52:11 +02:00
zmagod
352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
Luka Murn
2a0eafeebb Merge pull request #38 from biosistemika/lm-search-fix 
Hotfix for search results bug
 2016-07-28 13:31:47 +02:00
Luka Murn
1953e295b6 Hotfix for search results bug 2016-07-28 13:29:26 +02:00
zmagod
9d23cfd940 fixed experiment routes 2016-07-28 11:30:34 +02:00
zmagod
c11932b45b fixed layout 2016-07-28 11:00:56 +02:00
zmagod
d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +02:00
zmagod
54c4051906 added canvas under experiments 2016-07-28 09:01:44 +02:00
zmagod
a17106b883 added experiments controller and fixed sidebar 2016-07-27 16:18:26 +02:00
Zmago Devetak
c869db2506 Merge pull request #35 from ZmagoD/zd_SCI_40 
Edit canvas controller to work with experiments
 2016-07-27 12:11:19 +02:00
zmagod
485d93f8b9 refactor canvas permissions 2016-07-27 11:35:07 +02:00
zmagod
0955d1c66a 1. Fixed fixtures 
2. Added shoulda matcher gem
3. Added Experiment test suite
4. Fixed failing tests
 2016-07-27 10:49:13 +02:00
jbargu
3453da4c17 Merge pull request #34 from biosistemika/jg_explvl_global_search 
Update global search for experiment level
 2016-07-27 10:20:14 +02:00
Jure Grabnar
1a1c4bb68a Remove needless join from MyModuleGroup 2016-07-27 10:18:57 +02:00
zmagod
39c3a83e11 fixed my_modules and my_modules_groups fixtures and added experiments fixture 2016-07-26 15:18:09 +02:00
zmagod
5c7501a273 added experiments canvas labels in localization file and fixed canvas views 2016-07-26 14:21:59 +02:00
zmagod
0a84ecdfc1 edit canvas controller to work with experiment 2016-07-26 14:02:06 +02:00
Luka Murn
43d1ad608a Add CLA text to CONTRIBUTING.md 2016-07-26 13:58:03 +02:00
Jure Grabnar
77ed1c5fd3 Change invalid references to project in search and shorten lines. 2016-07-26 12:59:37 +02:00
Jure Grabnar
80621c9b6b Add experiment text to all searches related to experiment 2016-07-26 12:26:48 +02:00
Jure Grabnar
690ad0fffa Add a few experiment permissions 2016-07-26 12:26:48 +02:00
Jure Grabnar
3be562bdf6 Add experiment to search results 2016-07-26 12:26:48 +02:00
Jure Grabnar
6d26203796 Add missing target var to result searches 2016-07-26 12:26:48 +02:00
Jure Grabnar
17bcaeb2c2 Add experiment to db:fake:generate 
Also tweak a numbers a bit since experiment is another factor now.
 2016-07-26 12:26:48 +02:00
Jure Grabnar
5283027da1 Add missing target var to searches. 2016-07-26 12:26:48 +02:00