Commit Graph

12123 Commits (ed8c2f431906626456dbca7cf3ceed156d1b060e)
 

Author SHA1 Message Date
ansuz 748172585e update for modified id
ansuz 4cd7d8eda4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 345bfc1cea Remove migration for pad attributes
ansuz 52be5501d6 remove invalid test
yflory 69014e5fde Fix mediatags in pad not cached
ansuz b3e066eaca show loading screen tips during loading screen
Caleb James DeLisle 77fe6a9bba small bug fixes
Caleb James DeLisle 1b01855dd2 Merge branch 'staging' into framework
Caleb James DeLisle 1fd7a6e2b3 Mistake in mkEvent which makes all events only work once
Caleb James DeLisle 368a6b2406 manual merge, still wip
yflory cdeac00633 Merge branch 'staging' into newdrive
yflory a8eecee590 Fix access to undefined variable in drive
yflory 91e36171eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 138ad17e3e Fix 'import local pads' in settings creating duplicates
yflory 59ad96e491 Make sure the user is redirected to the drive at registration
yflory d2f1d0c0e9 Fix readme pad not added at registration in sframe drive
Caleb James DeLisle ae54cbca33 Refactor sframe-cpnf-inner to export chainpad
Caleb James DeLisle 44018ee7e1 Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
Caleb James DeLisle b15527565c Allow passing arguments when firing events
Caleb James DeLisle 0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/
Caleb James DeLisle d9845d3450 Refactor sframe-cpnf-inner to export chainpad
Caleb James DeLisle f418ee9632 Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
Caleb James DeLisle 72f03b2a47 Allow passing arguments when firing events
yflory 1afbd4648d Fix old drive
yflory b871faffc9 Enable tags in code and slide
yflory 6aeb366767 Lint
yflory 0600ce59ec Display the 'spinner' when typing in sframe apps
yflory 1d7683503f Fix link origin in sframe upload table
yflory 92c808812a Fix missing style in toolbar/less2
yflory deba699d08 Remove old style for sframe drive
yflory 4049931924 Lint
yflory c364377d7c Use less2 in sframe drive
yflory 47fe7b1c53 Drive in sandboxed iframe
yflory dfdeb7b113 Fix style and race condition for history mode
yflory a810d7bd85 Fix style and race condition for history mode
yflory 456370b1aa Base for Drive in sandboxed iframe
ansuz 95302366d1 lint compliance
ansuz 68f7d4bc0a more conformant tagPrompt behaviour
ansuz db4c3e7e2c Merge branch 'master' into staging
ansuz b5b84f540e fix preview mode class
ansuz 53b98c12c9 ignore broken stylesheet
ansuz f990200996 drop any notion of crypto from sframe-listmap
ansuz a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 95542bcdaf Lint
ansuz c9223cb942 listmap does not care about 'readOnly' mode anymore
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 8a09e39f46 Enable tags in pads
ansuz d2b27f3588 resolve merge conflicts
ansuz f127240a2f add poll to main.less
ansuz 4af01e6e9e make listmap consume cpNfInner