Commit graph

11219 commits

Author SHA1 Message Date
jenkins-bot 7e0ad66a69 Merge "CollabTarget: Pass import promise to setSynchronizer" 2018-05-23 17:13:50 +00:00
jenkins-bot 504f712ebc Merge "Only apply toolbar negative margins on vector" 2018-05-23 17:05:22 +00:00
jenkins-bot c99c96e805 Merge "Allow CollabTarget to load on mobile" 2018-05-23 17:01:57 +00:00
Ed Sanders 86786bc947 CollabTarget: Pass import promise to setSynchronizer
Depends-On: I188e749c315ddbb5f8779db10987178a51d27f5c
Change-Id: I57fe6af459416e039274ea4c360e09a55123b024
2018-05-23 16:59:01 +00:00
Ed Sanders ccb766e933 MWSaveDialog: Fix typo in no-categories branch
Bug: T195323
Change-Id: I7d22b6cad363a240660563554e4578621f7966d0
2018-05-23 11:18:54 +01:00
Ed Sanders 2cd7abf88b Allow CollabTarget to load on mobile
It's not great, but it works, so allow people to at least
experiment with it.

Change-Id: Iaa54189f7aa63b0bd029dd25a898db54119eff70
2018-05-22 22:39:36 +01:00
Ed Sanders bb0d3471df Only apply toolbar negative margins on vector
This fixes toolbar placement in minerva-desktop.

Change-Id: Ifbd869cb70da9bb4db7c72ad89f696a080d18847
2018-05-22 21:25:33 +01:00
jenkins-bot ffaa4f2170 Merge "DesktopArticleTarget: on escape close toolbar dialogs first" 2018-05-20 16:55:02 +00:00
jenkins-bot 99bff72a6a Merge "$.isEmptyObject -> ve.isEmptyObject" 2018-05-20 11:09:50 +00:00
jenkins-bot 36dc4d487f Merge "Temporarily disable broken ref tools in CollabTarget" 2018-05-20 11:09:49 +00:00
Ed Sanders f5d1f6c595 Make options actually optional as documented
Change-Id: I42bb8e594a9ea8002938e68109d11488aef8883c
2018-05-20 12:53:19 +02:00
Ed Sanders 8f9cc64bba Temporarily disable broken ref tools in CollabTarget
Bug: T194838
Change-Id: Ic671fb158a14899b343c79f80ec8cde3ac72a495
2018-05-20 12:18:32 +02:00
Ed Sanders eb70a1c371 $.isEmptyObject -> ve.isEmptyObject
Change-Id: I309337fcffce7b1759bfca32215461171e869c5c
2018-05-20 12:00:09 +02:00
jenkins-bot 45c39da455 Merge "MWSaveDialog: Display of limit behavior unified with old editor" 2018-05-19 20:10:52 +00:00
David Lynch c76c41f3dc DesktopArticleTarget: on escape close toolbar dialogs first
Pressing escape will close toolbar dialogs (find/symbols/etc) if they're open
instead of trying to teardown the editing surface.

Bug: T190068
Change-Id: I27080649392f17344c901269029368fa0b3c2963
2018-05-19 19:29:34 +02:00
David Lynch 110fdf1fcb MWSaveDialog: Display of limit behavior unified with old editor
T190570 (I54d75ab6061de0de79b7a8112eb859a4c8a5e22a) changed old editor's
display of the limit to only show when there's <= 99 remaining. Bring same
behavior into this dialog.

Bug: T194458
Change-Id: I7f6fd7ee95348c39b107131a7e297d158a07c00e
2018-05-19 19:09:57 +02:00
jenkins-bot 862486fe2f Merge "Use same padding across skins for external links" 2018-05-19 13:20:35 +00:00
jenkins-bot 2822a548f3 Merge "Follow-up I2a49315d0: Fix right padding of active external links" 2018-05-19 13:14:50 +00:00
jenkins-bot 40f9c827de Merge "Import button for CollabPad" 2018-05-19 12:28:42 +00:00
Ed Sanders 0fe6c53b2e Import button for CollabPad
Change-Id: I1f454fb7914b2de0cb5f393aeed9001b6a5a2e40
2018-05-19 19:42:35 +08:00
Ed Sanders ccfd46bbd7 Use same padding across skins for external links
Change-Id: Ide98ae75eb39bf87d83d64c5ec075a0b58665099
Depends-On: I7eaf0756d4d58c0f902238b48176334689f3c704
2018-05-19 11:34:43 +02:00
Ed Sanders 7c2b61ce38 Follow-up I2a49315d0: Fix right padding of active external links
Change-Id: If8fa88b824d67b76f8545f1f58ef84365a501fa7
2018-05-19 11:33:17 +02:00
jenkins-bot 9b8a859350 Merge "MWInternalLinkAnnotation: test fragment behavior" 2018-05-18 19:22:40 +00:00
David Lynch 300d5ec486 MWInternalLinkAnnotation: test fragment behavior
Bug: T194463
Change-Id: I08d587c4e4cd12b1362915a22b37d9a0224de198
2018-05-18 20:55:35 +02:00
jenkins-bot 6cc9e81238 Merge "dm.MWInternalLinkAnnotation: account for ? in fragment" 2018-05-18 18:48:16 +00:00
Jforrester ed049cb646 Merge "Use getAuthorNames" 2018-05-18 18:47:33 +00:00
jenkins-bot 23b64d56b0 Merge "Add commentAnnotation to CollabTarget toolbar" 2018-05-18 18:29:35 +00:00
jenkins-bot 3999f76346 Merge "Use ve.ce.nodeFactory.createFromModel" 2018-05-18 18:27:31 +00:00
jenkins-bot e0e8f84322 Merge "Use CE rendering for invisible templates" 2018-05-18 18:27:29 +00:00
David Lynch 909aecbd26 dm.MWInternalLinkAnnotation: account for ? in fragment
It was failing to properly ignore the fragment if it contained a ?. This
resulted in such fragment-selflinks being considered a link to a wikipage with
a title of their full URL. As such, only consider the pre-# section for ?s.

Bug: T194463
Change-Id: I205f86d2b4abcf91dd6a84e3013e899e953a6842
2018-05-18 19:58:21 +02:00
Ed Sanders 6ddd2ba96c Add commentAnnotation to CollabTarget toolbar
Change-Id: I7450b401fa68a1d91522579e9e9e70c0d052bcc3
2018-05-18 19:36:41 +02:00
jenkins-bot a47b78e18c Merge "Update VE core submodule to master (1d341ca7d)" 2018-05-18 15:37:04 +00:00
James D. Forrester 9e52ece21f Update VE core submodule to master (1d341ca7d)
New changes:
3a6d868bf Separate (Comment/Link)InspectorTools into separate files
cb5d36e32 Localisation updates from https://translatewiki.net.
c75491b16 build: Extend 'svgmin' options and amend
ddef270d9 Genericise activeLink behaviour to any annotation
d13d44e12 Create simple comment annotation type for rebaser.
7e49a1f33 Add getters for author properties
1d341ca7d Follow-up I16942623d: Only filter inactive models if they are 'canBeActive'

Local changes:
Change .ve-ce-linkAnnotation-active > .ve-ce-linkAnnotation.ve-ce-annotation-active

Bug: T185596
Change-Id: I2a49315d01aa075373f9b5f0d8802a7e7dd4dca3
2018-05-18 17:07:28 +02:00
jenkins-bot 60ef3af0b1 Merge "Fix position of inspectors/context inside dialogs" 2018-05-18 14:55:01 +00:00
jenkins-bot b899759edc Merge "MobileArticleTarget: fix deprecated toolbar calls" 2018-05-18 14:54:59 +00:00
Bartosz Dziewoński dfe65db5bb Fix position of inspectors/context inside dialogs
Override #addSurface instead of #getSurfaceConfig, so that the
$overlayContainer option only applies to the "main" surface of the
Target rather than all of the surfaces (including those in
TargetWidgets).

Bug: T194433
Change-Id: I61c609e2d52814b4547fb5292a0bfb237c4c218f
2018-05-18 14:26:00 +00:00
David Lynch 150fb16008 MobileArticleTarget: fix deprecated toolbar calls
Change-Id: If7d4b52c29e9648f17eda2d62f8fcdad744f82ae
2018-05-18 15:59:15 +02:00
Ed Sanders fcd9a480a1 Use getAuthorNames
Depends-On: Ib5f3c7cd6343b582ae9f4b5efcfa24f66243af52
Depends-On: I2a49315d01aa075373f9b5f0d8802a7e7dd4dca3
Change-Id: Ib02945a46326659b652cdc01976396ef698a8080
2018-05-18 12:30:10 +00:00
jenkins-bot c80c2d1723 Merge "Fix ve.ce.MWTransclusionNode#filterRendering to work with non-element nodes" 2018-05-18 12:05:33 +00:00
Ed Sanders ed604c857d Fix ve.ce.MWTransclusionNode#filterRendering to work with non-element nodes
Bug: T194839
Change-Id: I90065720725e8b59bfe4a4a9215b3835179cb2d1
2018-05-17 19:19:40 +01:00
jenkins-bot a975aacbe7 Merge "CategoriesPage: Remove unnecessary input widget width" 2018-05-16 22:06:14 +00:00
Ed Sanders 70cd11e32d CategoriesPage: Remove unnecessary input widget width
Change-Id: I7fa38b866d0489de612b0ed08cf0b9eb3b9b71af
2018-05-16 18:04:08 +01:00
jenkins-bot a8ca28da84 Merge "CollabTarget: remember current name, briefly" 2018-05-16 16:40:09 +00:00
David Lynch aab3c106df CollabTarget: remember current name, briefly
Change-Id: I2804f21c00b9224217d340948ca3c437f1b8b1a4
2018-05-16 18:16:44 +02:00
jenkins-bot df4d8673ca Merge "MobileArticleTarget: Show both edit modes in edit switcher, for consistency" 2018-05-16 15:50:24 +00:00
Ed Sanders 9b8e501333 MobileArticleTarget: Show both edit modes in edit switcher, for consistency
Change-Id: I48193db0d8282e31265e95884878eb81cbaeeedd
2018-05-16 15:20:25 +00:00
jenkins-bot 4f53736399 Merge "CollabTarget: set name to logged in MW user" 2018-05-16 15:18:51 +00:00
David Lynch c3d03ae101 CollabTarget: set name to logged in MW user
Change-Id: Ic39ce1790d3a267123810bdb87cc0a844df0d42c
2018-05-16 12:48:34 +02:00
jenkins-bot c5a6e54dde Merge "Simplify valign code with a loop" 2018-05-16 09:49:06 +00:00
jenkins-bot d70ddfb85a Merge "Use better align change descriptions" 2018-05-16 09:49:05 +00:00