Commit Graph

1399 Commits (fa6938baa8a8987b39136fc98355d403db55b7fa)

Author SHA1 Message Date
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
Caleb James DeLisle 1e5bc5da14 onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer 2017-10-02 15:09:25 +03:00
Caleb James DeLisle 12e82e80ec When changing the title of a presentation, the title in the bottom of the slide should also change 2017-10-02 15:04:44 +03:00
Caleb James DeLisle f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/ 2017-09-27 16:53:16 +02:00
Caleb James DeLisle 6dbc02e81a Merge branch 'staging' into framework 2017-09-27 12:01:18 +02:00
Caleb James DeLisle 1c791b5b51 Fix framework by removing some async and also fix media tags 2017-09-27 11:58:14 +02:00
Caleb James DeLisle 90d00c10b1 Make metadata-manager a bit more robust 2017-09-27 11:56:25 +02:00
yflory 8de1852ab9 Lint compliance 2017-09-27 10:36:16 +02:00
yflory b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +02:00
Caleb James DeLisle 342b6012f7 manual merge of staging into framework 2017-09-26 17:11:45 +02:00
Caleb James DeLisle cf6030ab8b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-26 15:58:33 +02:00
Caleb James DeLisle e62c5e1d07 Add some debugging lines to help synthesize error cases 2017-09-26 15:58:25 +02:00
yflory 345bfc1cea Remove migration for pad attributes 2017-09-26 14:36:49 +02:00
ansuz b3e066eaca show loading screen tips during loading screen 2017-09-26 10:59:25 +02:00
Caleb James DeLisle 77fe6a9bba small bug fixes 2017-09-26 10:23:35 +02:00
Caleb James DeLisle 1b01855dd2 Merge branch 'staging' into framework 2017-09-25 18:11:57 +02:00
Caleb James DeLisle 1fd7a6e2b3 Mistake in mkEvent which makes all events only work once 2017-09-25 18:03:31 +02:00
Caleb James DeLisle 368a6b2406 manual merge, still wip 2017-09-25 17:35:25 +02:00
yflory cdeac00633 Merge branch 'staging' into newdrive 2017-09-25 17:35:06 +02:00
yflory a8eecee590 Fix access to undefined variable in drive 2017-09-25 17:29:31 +02:00
yflory 91e36171eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-25 17:09:41 +02:00
yflory 138ad17e3e Fix 'import local pads' in settings creating duplicates 2017-09-25 17:09:26 +02:00
yflory d2f1d0c0e9 Fix readme pad not added at registration in sframe drive 2017-09-25 16:09:54 +02:00
Caleb James DeLisle ae54cbca33 Refactor sframe-cpnf-inner to export chainpad 2017-09-25 15:46:04 +02:00
Caleb James DeLisle 44018ee7e1 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. 2017-09-25 15:45:56 +02:00
Caleb James DeLisle b15527565c Allow passing arguments when firing events 2017-09-25 15:45:49 +02:00
Caleb James DeLisle 0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/ 2017-09-25 15:45:08 +02:00
Caleb James DeLisle d9845d3450 Refactor sframe-cpnf-inner to export chainpad 2017-09-25 15:44:03 +02:00
Caleb James DeLisle f418ee9632 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. 2017-09-25 15:43:02 +02:00
Caleb James DeLisle 72f03b2a47 Allow passing arguments when firing events 2017-09-25 15:42:08 +02:00
yflory 6aeb366767 Lint 2017-09-25 14:47:19 +02:00
yflory 0600ce59ec Display the 'spinner' when typing in sframe apps 2017-09-25 13:19:25 +02:00
yflory 1d7683503f Fix link origin in sframe upload table 2017-09-25 12:44:05 +02:00
yflory 92c808812a Fix missing style in toolbar/less2 2017-09-25 11:59:05 +02:00
yflory 4049931924 Lint 2017-09-25 11:51:24 +02:00
yflory c364377d7c Use less2 in sframe drive 2017-09-25 11:48:42 +02:00
yflory 47fe7b1c53 Drive in sandboxed iframe 2017-09-22 19:35:06 +02:00
yflory dfdeb7b113 Fix style and race condition for history mode 2017-09-21 18:00:33 +02:00
yflory a810d7bd85 Fix style and race condition for history mode 2017-09-21 18:00:11 +02:00
yflory 456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
ansuz 95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
ansuz 68f7d4bc0a more conformant tagPrompt behaviour 2017-09-20 17:55:05 +02:00
ansuz f990200996 drop any notion of crypto from sframe-listmap 2017-09-19 18:21:33 +02:00
ansuz a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:38:21 +02:00
ansuz c9223cb942 listmap does not care about 'readOnly' mode anymore 2017-09-19 15:38:06 +02:00
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:36:38 +02:00
yflory 8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
ansuz d2b27f3588 resolve merge conflicts 2017-09-19 14:24:26 +02:00
ansuz 4af01e6e9e make listmap consume cpNfInner 2017-09-19 14:16:13 +02:00
yflory 6fdd66167a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 11:04:59 +02:00