Commit graph

202 commits

Author SHA1 Message Date
Shane Kilkelly
8a2acd7138 Only turn on guest track-changes if available 2017-10-26 13:48:02 +01:00
Shane Kilkelly
f9d83c24ef clean-up commented out code 2017-10-26 11:04:59 +01:00
Shane Kilkelly
5f6e191c5f Automatically disable guest-track-changes when project made private 2017-10-25 14:48:32 +01:00
Shane Kilkelly
74c231826d WIP: track changes with token-access 2017-10-25 10:34:18 +01:00
Shane Kilkelly
b32088ee6b Only add token member if they're not also a collaborator 2017-10-20 13:38:52 +01:00
Shane Kilkelly
d8717a06a2 Fix track-changes with token-access 2017-10-19 14:42:17 +01:00
Shane Kilkelly
88923a314d Disallow toggling track-changes via keyboard if not available on project 2017-08-23 15:02:06 +01:00
James Allen
7538c8834f Merge branch 'master' into ja-per-user-track-changes 2017-08-09 14:05:36 +02:00
Shane Kilkelly
9cc461605e Prevent track-changes hotkey actions when not enabled. 2017-08-03 15:17:28 +01:00
Paulo Reis
7b85661035 Re-enable the toggle TC keyboard shortcut. 2017-08-01 11:59:32 +01:00
Paulo Reis
029ab8d2f1 Make sure TC state is applied to all users on load. 2017-08-01 11:30:23 +01:00
Paulo Reis
a2e583edb8 Remove debug statement. 2017-07-07 10:38:13 +01:00
Paulo Reis
6cfa10d511 Add a per-user TC notice dialog. 2017-07-07 10:38:13 +01:00
Paulo Reis
8925dc5a78 Revert "Show simpler UI when there is only one user."
This reverts commit 48300bd5b2ef01651e64dad3183e65d5d5798955.
2017-07-07 10:38:13 +01:00
Paulo Reis
dae5381af7 Show simpler UI when there is only one user. 2017-07-07 10:38:13 +01:00
Paulo Reis
139c2ab1fd Consolidate members list. 2017-07-07 10:38:13 +01:00
Paulo Reis
e421b6550a Filter out read-only users from TC users list. 2017-07-07 10:38:13 +01:00
Paulo Reis
71e0a6935f Readd feature flag handling. 2017-07-07 10:38:13 +01:00
Paulo Reis
e40b8500d7 Keep user state persistent on the client. 2017-07-07 10:38:13 +01:00
Paulo Reis
8e6265e3d2 Enable global setting. 2017-07-07 10:38:13 +01:00
Paulo Reis
1ae53a243a Correctly fetch users from project info. 2017-07-07 10:38:13 +01:00
Paulo Reis
f4bdd5eb2b Control sync state with server. 2017-07-07 10:38:13 +01:00
Paulo Reis
1fa7338baf Wire up TC widget to controller methods. 2017-07-07 10:38:13 +01:00
Paulo Reis
dc2085c6e1 Basic widget for toggling TC state. 2017-07-07 10:38:13 +01:00
James Allen
710c89a629 Support per user track changes (proof of concept) 2017-07-07 10:38:13 +01:00
Paulo Reis
3dda383d70 Use promise method signatures, instead of old HTTP service ones. 2017-06-20 16:04:06 +01:00
Paulo Reis
155f515a50 Use standard promises with the http service. 2017-06-20 11:50:23 +01:00
Paulo Reis
53b18e041f Trigger selection-related logic after accepting or rejecting changes. 2017-06-07 14:03:58 +01:00
Paulo Reis
81a5a5311d Clear selection after bulk actions. 2017-06-06 10:03:33 +01:00
Paulo Reis
e616a62d68 Save entry ids inside entry object, not only as the key. 2017-06-05 16:29:55 +01:00
Paulo Reis
6c3cdbcc3a Remove dead code, backend does not send single change events anymore. 2017-06-05 10:43:03 +01:00
Paulo Reis
8d8bcab1e8 Consolidate change accept and reject code. 2017-06-05 10:41:59 +01:00
Paulo Reis
e2edf4184f Explicit naming. 2017-06-02 11:43:43 +01:00
Paulo Reis
26260fc11f Prevent aggregation of changes from different users. 2017-06-01 16:33:50 +01:00
Paulo Reis
b2a7686204 DRYness. 2017-06-01 15:28:37 +01:00
Paulo Reis
2a0454f2f1 Integrate aggregate changes with bulk actions. 2017-06-01 15:18:43 +01:00
Paulo Reis
1490ea7b04 Change aggregated change model: the main change is now the insertion, deletion is stored in metadata. 2017-06-01 15:03:37 +01:00
Paulo Reis
11c0644490 Aggregate changes; make accept and reject work. 2017-06-01 11:47:55 +01:00
Paulo Reis
3cf8f26583 Add collapse and expand behaviour to aggregate change entries. 2017-05-31 16:23:24 +01:00
Paulo Reis
8dfb91fa6f Blur toggler after clicking. 2017-05-22 11:11:26 +01:00
Paulo Reis
58ad62c413 Relayout entries when commenting. 2017-05-19 16:57:51 +01:00
Paulo Reis
15980d5427 Merge branch 'master' into pr-hide-review-panel 2017-05-19 15:31:14 +01:00
Paulo Reis
957b201fc1 Add commenting and track-changes keyboard shortcuts. 2017-05-19 15:28:49 +01:00
Paulo Reis
7f3c0ed5ac Refactor accept and reject methods to support multiple changes; support bulk actions events. 2017-05-16 14:27:06 +01:00
Paulo Reis
82a19444b3 Merge branch 'master' into pr-bulk-actions 2017-05-15 10:29:15 +01:00
Paulo Reis
dd85c2fab2 Remove debug line. 2017-05-12 15:44:49 +01:00
Paulo Reis
f2dac28a65 Consolidate some watchers. 2017-05-11 10:23:41 +01:00
Paulo Reis
a3ab994ab3 Use the same watcher to control miniRP visibility and trigger Ace resizing. 2017-05-11 10:17:25 +01:00
Paulo Reis
8aee0edfe8 Integrate bulk actions dialog with controller actions. 2017-05-09 16:06:34 +01:00
Paulo Reis
f3e020df7e Add dialog to confirm bulk actions. 2017-05-09 16:06:19 +01:00