Commit Graph
4410 Commits
Author SHA1 Message Date
guerler fd5f42dc17 Merge branch 'dev' into admin_grid_groups 2017-08-14 10:57:39 -04:00
Nicola Soranzo 9cbabef17e Merge branch 'release_17.05' into dev
Conflicts:
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/library/library-foldertoolbar-view.js
2017-08-14 12:07:17 +01:00
guerler b38ccbc105 Merge branch 'admin_grid_roles' into admin_grid_groups 2017-08-10 12:56:50 -04:00
guerler be19b36eca Merge branch 'revise_grid_forms' into admin_grid_roles 2017-08-10 12:30:58 -04:00
guerler 583765c7c0 Merge branch 'dev' into revise_grid_forms 2017-08-10 12:17:22 -04:00
E Rasche 41461235b2 rebuild client 2017-08-10 17:55:12 +02:00
E Rasche 61a5b7c9e1 another merge 2017-08-10 17:53:03 +02:00
E Rasche 7c1c60d826 forgot static files 2017-08-10 17:53:02 +02:00
E Rasche fb78a2118d merge 2017-08-10 17:53:02 +02:00
guerler 938bf525f4 Merge branch 'revise_grid_forms' into admin_grid_roles 2017-08-10 11:40:59 -04:00
guerler e477cce9b6 Merge branch 'revise_page' into revise_grid_forms 2017-08-10 11:38:32 -04:00
guerler cfa3220d9f Merge branch 'dev' into revise_page 2017-08-09 17:33:28 -04:00
Martin Cech fd0ce1284a make client again... 2017-08-09 16:05:20 -04:00
Martin Cech cff21d350d Merge branch 'dev' into library_tags 2017-08-09 16:03:29 -04:00
Martin Cech 06c70d34e2 make client 2017-08-09 16:02:47 -04:00
guerler 8f056c2bbc Merge branch 'dev' into revise_page 2017-08-09 12:32:30 -04:00
guerler dbad2556d0 Merge branch 'admin_grid_roles' into admin_grid_groups 2017-08-08 10:06:15 -04:00
guerler d3b8889c04 Fix second role link in admin panel 2017-08-08 10:04:58 -04:00
guerler 5605f390fe Build manage users and roles for groups with client form builder 2017-08-08 09:56:54 -04:00
guerler e805db6896 Use client to build create groups form 2017-08-08 09:41:24 -04:00
guerler 1bf2d1782f Use client side formbuilder for rename group form 2017-08-08 08:54:29 -04:00
guerler 9822dede69 Add client route 2017-08-08 08:47:15 -04:00
guerler c72aca4797 Revise admin groups endpoint 2017-08-08 08:41:38 -04:00
guerler a5d7c0fa84 Scroll to highlight message 2017-08-07 22:39:34 -04:00
guerler 733e225ec9 Fix message handling in user preference main view 2017-08-07 22:22:03 -04:00
guerler 183176a05c Add create role form 2017-08-07 20:35:53 -04:00
guerler d698d32ceb Manage users and groups for role 2017-08-07 20:11:11 -04:00
guerler f531d2c0c9 Repack scripts 2017-08-05 22:23:05 -04:00
guerler 1675b9cca2 Merge branch 'revise_grid_forms' into admin_grid_roles 2017-08-05 12:08:48 -04:00
guerler 9d8bdc6f30 Repack scripts 2017-08-05 12:06:54 -04:00
guerler d2d250b847 Merge branch 'dev' into revise_grid_forms 2017-08-05 11:59:59 -04:00
guerler afa6964994 Fix style for list parameter 2017-08-04 16:31:51 -04:00
guerler bf6e2d26bd Fix floating for custom build form button 2017-08-04 16:04:05 -04:00
guerler b908e98e37 Fix button and operations floating handling 2017-08-04 15:59:23 -04:00
guerler 502b2a068c Use redirect option for user preferences 2017-08-04 15:14:24 -04:00
guerler 4d542820e7 Remove unused messages, set default message status 2017-08-04 14:59:45 -04:00
guerler 5ab9ea4ffd Use primary button 2017-08-04 14:46:22 -04:00
guerler 99bf6809be Repack scripts 2017-08-04 14:29:32 -04:00
guerler 246e94ae84 Build role renaming in client 2017-08-04 14:17:43 -04:00
guerler 44a339546b Fix menu link 2017-08-04 14:00:00 -04:00
guerler b46f4e4c84 Remove unused routing message handler 2017-08-04 13:56:31 -04:00
guerler 77608ac410 Merge branch 'revise_grid_forms' into admin_grid_roles 2017-08-04 13:55:27 -04:00
guerler 7e1c40799e Use initial method parsing for reset password info 2017-08-04 12:42:08 -04:00
guerler f50e0ba5bb Revise endpoint to manage user roles and groups, add initial message support to form wrapper 2017-08-04 12:34:16 -04:00
John Chilton b17091a3ec CSRF protection for login, logout, and user registeration.
The approach is to use per-session CSRF tokens - this avoids many complications related to per-form tokens. We generate a sequence of hashes based on session IDs that doesn't follow the same pattern as normal database API IDs by supplying a "kind" parameter to encode_id (we use the same pattern for securing the job files API for Pulsar).
2017-08-04 11:52:13 -04:00
guerler 4e05028265 Create dictionary for form definitions 2017-08-04 11:29:09 -04:00
guerler 8312b07e60 Allow form redirect to grid view 2017-08-04 11:25:20 -04:00
guerler c6dee98c55 Fix input types, repack scripts 2017-08-04 00:06:48 -04:00
guerler 06b5be23dd Specify password reset form 2017-08-03 23:43:37 -04:00
guerler cd8314808e Allow array parsing through url 2017-08-03 22:51:13 -04:00