|
|
abb259bbd1
|
appreciation model
|
2023-01-22 20:54:44 +01:00 |
|
Thomas Rubini
|
00f80b9094
|
refactor getFullRecipeWithComments to getFullRecipeWithApprs
|
2023-01-22 20:54:44 +01:00 |
|
Thomas Rubini
|
c55ad5e1be
|
Merge pull request #46 from ThomasRubini/is_admin
|
2023-01-20 20:52:38 +01:00 |
|
Thomas Rubini
|
332d13a0c8
|
Add function is_admin() to Session
|
2023-01-20 20:49:59 +01:00 |
|
Thomas Rubini
|
ac16070040
|
Merge pull request #45 from ThomasRubini/admin_manage_users
|
2023-01-20 19:22:01 +01:00 |
|
Thomas Rubini
|
46d0e38050
|
add a button to manage user for admins
|
2023-01-20 19:21:23 +01:00 |
|
Thomas Rubini
|
92c4cd94d3
|
Merge pull request #44 from ThomasRubini/manageuser
|
2023-01-20 19:14:06 +01:00 |
|
Thomas Rubini
|
8a5d6e4cfc
|
Alias default action to search action in ManagerUser controller
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
58e47ccb94
|
refactor view manageUser/default to manageUser/search
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
9b0013ba9f
|
use model for ManageUser search action
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
3361babf05
|
finish controller manageUser/search
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
f7e0f5885f
|
use Kernel Utils getOrDie function
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
637782f907
|
refactor admin checking function to Session
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
b290394181
|
start to make manageUser/search
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
fd9e25ca8c
|
create ManageUserController and admin-only access
|
2023-01-20 19:12:54 +01:00 |
|
Thomas Rubini
|
09c83cca97
|
Merge pull request #43 from ThomasRubini/kernel_start_session_fix
|
2023-01-20 18:46:07 +01:00 |
|
Thomas Rubini
|
ddc47761d7
|
fix Kernel start_session
|
2023-01-20 18:45:50 +01:00 |
|
Thomas Rubini
|
c6984c7707
|
Merge pull request #42 from ThomasRubini/search_action
|
2023-01-20 18:35:30 +01:00 |
|
Thomas Rubini
|
5f61d15a89
|
add search functionality to RecipeModel
|
2023-01-20 18:30:16 +01:00 |
|
Thomas Rubini
|
7c6a5441a7
|
refactor 'search_term' to 'query'
|
2023-01-20 18:25:32 +01:00 |
|
Thomas Rubini
|
28810d0b7c
|
change refs to view search/search to recipe/search
|
2023-01-20 18:21:39 +01:00 |
|
Thomas Rubini
|
38e4e16856
|
add search action
|
2023-01-20 18:08:27 +01:00 |
|
Thomas Rubini
|
04b03ee731
|
Merge pull request #41 from ThomasRubini/start_session_twice
|
2023-01-20 18:01:27 +01:00 |
|
Thomas Rubini
|
dae656de56
|
Add condition to not start session twice
|
2023-01-20 18:01:00 +01:00 |
|
Thomas Rubini
|
3567dea8c5
|
Merge pull request #40 from ThomasRubini/kernel_utils
|
2023-01-20 17:58:24 +01:00 |
|
Thomas Rubini
|
219a5b0f5d
|
add kernel class 'Utils' with 'getOrDie()'
|
2023-01-20 17:58:06 +01:00 |
|
Thomas Rubini
|
dc8d5b7e0f
|
Merge pull request #39 from ThomasRubini/fix_kernel_get
|
2023-01-20 17:55:36 +01:00 |
|
Thomas Rubini
|
7351c7c239
|
add '_A_getParams' property to kernel Controller
|
2023-01-20 17:53:12 +01:00 |
|
Marla
|
5aeb889411
|
Merge pull request #37 from ThomasRubini/search_quick_fix
moved search to recipe folder and moved category_list
|
2023-01-20 10:57:36 +01:00 |
|
Thomas Rubini
|
ed0d34d0b5
|
Merge pull request #38 from ThomasRubini/kernel_get
|
2023-01-20 10:52:14 +01:00 |
|
Thomas Rubini
|
3f9607d5f2
|
add GET params to the kernel
|
2023-01-20 10:51:49 +01:00 |
|
Capelier-Marla
|
cafd0d2f51
|
moved search to recipe folder and moved category_list
|
2023-01-20 10:47:29 +01:00 |
|
Marla
|
91d0fb0b7d
|
Merge pull request #36 from ThomasRubini/user_avatars
User avatars
|
2023-01-20 10:37:19 +01:00 |
|
Capelier-Marla
|
24afac65b6
|
moved appreciations array to recipe view before calling appreciations view
|
2023-01-20 10:34:04 +01:00 |
|
Capelier-Marla
|
ac1e9bd677
|
added fake user avatar
|
2023-01-20 10:34:04 +01:00 |
|
AudricV
|
3697280731
|
Merge pull request #35 from ThomasRubini/search-results-view
Add search results view
|
2023-01-20 10:30:47 +01:00 |
|
AudricV
|
d35a39644e
|
Add search results view
|
2023-01-20 10:27:33 +01:00 |
|
Marla
|
891f694561
|
Merge pull request #34 from ThomasRubini/fix_categories
Fix categories
|
2023-01-20 10:17:46 +01:00 |
|
AntLafI
|
42c3a1dab2
|
Merge pull request #32 from ThomasRubini/appreciations
Appreciations view
|
2023-01-20 10:13:18 +01:00 |
|
AntLafI
|
240497a6f7
|
adding appreciations after recipes
|
2023-01-20 10:12:48 +01:00 |
|
Capelier-Marla
|
441f7fad48
|
added list of categories in category page
|
2023-01-20 10:12:30 +01:00 |
|
Capelier-Marla
|
eb8490332e
|
display each category in a section instead of of ul/li
|
2023-01-20 10:10:23 +01:00 |
|
Capelier-Marla
|
6a375e97a7
|
now category display imgs and redirect to the right page
|
2023-01-20 10:04:49 +01:00 |
|
Capelier-Marla
|
95f86e77a4
|
added id for each category to go directly to the section wanted
|
2023-01-20 10:04:14 +01:00 |
|
Capelier-Marla
|
f8e81d6136
|
renamed all categories in category
|
2023-01-20 09:50:54 +01:00 |
|
Thomas Rubini
|
0f85e660ae
|
Merge pull request #31 from ThomasRubini/category_list
|
2023-01-20 09:21:26 +01:00 |
|
Thomas Rubini
|
6a91c2a9be
|
change keys passed to the view
|
2023-01-20 09:20:57 +01:00 |
|
Capelier-Marla
|
5d7c4628c6
|
move category_list to common and added it to pages where we will see it (+ fixed home view array)
|
2023-01-20 09:07:10 +01:00 |
|
Capelier-Marla
|
3b8207d3b1
|
moved and fixed category_list
|
2023-01-20 09:02:57 +01:00 |
|
Nicolas
|
21f40c7ee5
|
category_list implemented
|
2023-01-20 09:02:57 +01:00 |
|
