Commit Graph

16 Commits (c269929319cc1ee3e638406b0e50d9e09bef06b4)

Author SHA1 Message Date
ansuz a3c093838c merge latest staging and resolve conflicts 2017-11-24 13:46:59 +01:00
ansuz ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory 280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
yflory dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
Caleb James DeLisle 7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window 2017-11-09 17:07:04 +01:00
Caleb James DeLisle 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
Caleb James DeLisle 9e4c48f537 lint errors 2017-10-18 12:25:13 +03:00
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory 8e1f15e88d Get title suggestion based on poll's description 2017-10-12 14:12:26 +02:00
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework 2017-10-06 14:50:35 +03:00
Caleb James DeLisle 0aecfad854 Occasionally the language selector only says "Mode" rather than the language 2017-10-05 16:12:49 +03:00
yflory 68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
Caleb James DeLisle d6570ad9f2 Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click. 2017-10-03 17:57:57 +03:00
Caleb James DeLisle fa6938baa8 1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +03:00
yflory 47cfa0cf45 Focus the editable content when opening a codemirror pad 2017-09-13 18:09:55 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00