Commit graph

283 commits

Author SHA1 Message Date
Cayo Puigdefabregas 4e9df475c3 Merge branch 'main' into data-institution 2024-10-14 11:37:41 +02:00
Cayo Puigdefabregas dcf2e43d57 we don't need for the moment edit profile of user 2024-10-14 11:34:52 +02:00
Cayo Puigdefabregas 4b9875157c resolve conflicts 2024-10-14 11:24:14 +02:00
Cayo Puigdefabregas f1b3941e57 fix template reset passwords 2024-10-14 11:15:37 +02:00
cayop 4453095657 Merge pull request 'data-institution' (#10) from data-institution into main
Reviewed-on: #10
2024-10-11 15:16:13 +00:00
Cayo Puigdefabregas 0c36e12da6 only admin users can see admin pages 2024-10-11 17:15:37 +02:00
Cayo Puigdefabregas 59d99fa434 add form for edit institution details with template 2024-10-11 17:04:47 +02:00
Cayo Puigdefabregas 3b70a6c7cc add form for edit institution details 2024-10-11 17:04:33 +02:00
cayop b620079da7 Merge pull request 'user-panel' (#9) from user-panel into main
Reviewed-on: #9
2024-10-11 14:26:35 +00:00
Cayo Puigdefabregas 017dc818da add url in settings and legacy 2024-10-11 13:46:21 +02:00
Cayo Puigdefabregas e0929c03c7 add settings page for download settings file 2024-10-11 13:04:37 +02:00
Cayo Puigdefabregas 3e967c5a1a token to user panel link and add tags to tokens 2024-10-10 14:03:08 +02:00
Cayo Puigdefabregas 533bee30ec merge new main 2024-10-10 12:40:52 +02:00
Cayo Puigdefabregas a6d077aa2d resolve conflicts 2024-10-10 12:28:03 +02:00
Cayo Puigdefabregas 1ef48b3dd8 merge ekoa 2024-10-10 11:44:23 +02:00
Cayo Puigdefabregas 36fe3310a3 user panel 2024-10-10 10:35:27 +02:00
cayop 0a9596d33b Merge pull request 'search' (#8) from search into main
Reviewed-on: #8
2024-10-09 16:04:01 +00:00
Cayo Puigdefabregas 3e7b5c1df5 lot over institution and not over user 2024-10-09 18:00:56 +02:00
Cayo Puigdefabregas e0258cbf02 add search for hids 2024-10-09 13:05:18 +02:00
Cayo Puigdefabregas 1abd846922 search in xapian 2024-10-09 12:18:09 +02:00
sergio_gimenez 99eccc82aa 90: Add device model in the title 2024-10-08 08:02:42 +02:00
sergio_gimenez b8946dfbde 90: Playing with CSS to make it look good 2024-10-08 08:00:35 +02:00
sergio_gimenez 12e31758b3 90-initial-ugly-view 2024-10-08 07:26:48 +02:00
cayop 355355dcfc Merge pull request 'admin-users' (#7) from admin-users into main
Reviewed-on: #7
2024-10-07 14:59:24 +00:00
Cayo Puigdefabregas 35bf1a65a2 add admin from add_user command 2024-10-07 16:57:26 +02:00
Cayo Puigdefabregas 472d61bdc2 fix bugs 2024-10-07 16:56:58 +02:00
Cayo Puigdefabregas 124395a313 edit and delete user 2024-10-07 16:56:24 +02:00
Cayo Puigdefabregas 693dbc639c add institutio as owner of devices and add owner to xapian docs 2024-10-04 17:32:53 +02:00
pedro 55e85e5a3e README: fix typos 2024-10-03 19:48:27 +02:00
Cayo Puigdefabregas 898846b1df add base admin panel for admin users 2024-10-03 17:46:02 +02:00
Cayo Puigdefabregas 13ba92a6fc Edit or Delete a CUSTOM_ID 2024-10-03 12:49:07 +02:00
cayop 74d6126c0b Merge pull request 'pagination' (#6) from pagination into main
Reviewed-on: #6
2024-10-02 10:53:20 +00:00
Cayo Puigdefabregas 2f17d01780 fix pagination 2024-10-02 12:51:40 +02:00
Cayo Puigdefabregas 2b4b469b0e fix pagination in lots 2024-10-02 12:27:20 +02:00
Cayo Puigdefabregas aa31aefb42 Pagination for list of devices in dashboard and lots 2024-10-02 12:13:05 +02:00
pedro 029640347d docker-reset.sh: arg to make it easier to deploy 2024-09-28 12:11:20 -03:00
Cayo Puigdefabregas 665fbf852a fix link snapshot with user 2024-09-27 14:25:00 +02:00
Cayo Puigdefabregas 9dfaf0f60b token api activate 2024-09-27 14:23:25 +02:00
Cayo Puigdefabregas b8ab991a4f . 2024-09-27 09:48:46 +02:00
pedro 94470cbdd1 add modelo datos 2024-09-26 20:35:41 -03:00
pedro b47b5d3b4b docker-reset: add detach arg for demo deployment 2024-09-26 20:06:37 -03:00
Cayo Puigdefabregas e96afda483 add details in dashboard for placeholder 2024-09-26 13:09:55 +02:00
Cayo Puigdefabregas f39cdefc75 remove trash 2024-09-26 12:09:45 +02:00
Cayo Puigdefabregas dffe663e05 remove units and quantities addapted 2024-09-26 12:04:13 +02:00
cayop 76457893f5 Merge pull request 'add shortid and refactor unassigned devices table' (#5) from tau_shortid into tau
Reviewed-on: #5
2024-09-26 09:58:49 +00:00
cayop fc0bb95017 Merge pull request 'device: avoid hids duplication' (#4) from tau_hids-dup into tau
Reviewed-on: #4
2024-09-26 09:56:48 +00:00
Cayo Puigdefabregas fae8882c21 Merge branch 'tau_placeholder-add-ux-bug' into tau 2024-09-26 11:23:44 +02:00
cayop ce80d1f3c2 Merge branch 'tau' into tau_placeholder-add-ux-bug 2024-09-26 09:09:23 +00:00
Cayo Puigdefabregas 1a28e071e9 fix bug remove usb nets iface 2024-09-26 10:10:15 +02:00
pedro e2f5358d83 add shortid and refactor unassigned devices table 2024-09-26 00:22:21 -03:00