Commit Graph

3892 Commits (080511efcd40e644402868a5eb2b037fcea6cda0)

Author SHA1 Message Date
ansuz 080511efcd add missing translation for hashtags 2017-10-05 17:01:39 +02:00
ansuz 503111d26a use recompiled media-tag 2017-10-05 17:00:47 +02:00
ansuz 427afc3954 override modified file name in pdfjs 2017-10-05 16:59:55 +02:00
ansuz d85db64939 add tags from drive 2017-10-05 16:58:34 +02:00
ansuz 1f35798194 stop event propagation from tag prompt 2017-10-05 15:08:34 +02:00
ansuz c936e5ae73 make context menu open correct app on correct port 2017-10-05 11:14:47 +02:00
ansuz deed04108b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-05 10:22:07 +02:00
ansuz a90c078e84 correct reference to undefined 2017-10-05 10:21:59 +02:00
yflory 5304dc319f Enable redirection to the previous page after registration 2017-10-04 15:55:57 +02:00
yflory ceb8ff18bd Fix ghost icon in drive 2017-10-04 15:52:09 +02:00
ansuz e2f53eaddb add loading screen tip about hashtags 2017-10-03 18:39:03 +02:00
ansuz b8ce149db6 add hint about tag usage 2017-10-03 18:36:34 +02:00
ansuz f15ec4efe9 add tagging to whiteboard and file apps 2017-10-03 18:05:28 +02:00
ansuz f90742603e style fixes 2017-10-03 17:53:28 +02:00
ansuz 09c0a473e2 fix function signatures 2017-10-03 14:08:40 +02:00
ansuz 351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00
ansuz 6c7b135f91 lint compliance 2017-10-02 18:58:18 +02:00
ansuz 94c392b79f secure messaging 2017-10-02 18:57:17 +02:00
ansuz 0f9e93e1de make tests pass again 2017-09-28 10:36:40 +02:00
ansuz 48c49e5a75 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-28 10:23:59 +02:00
ansuz 19e58cec94 prevent typeError 2017-09-28 10:23:48 +02:00
yflory 8de1852ab9 Lint compliance 2017-09-27 10:36:16 +02:00
yflory e02a779c14 Use secure drive as default drive 2017-09-27 10:31:35 +02:00
yflory b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +02:00
yflory 767027b237 Lint 2017-09-27 10:16:24 +02:00
yflory 4c394e0031 Fix UI issue in poll 2017-09-27 10:15:23 +02:00
yflory 0df9e5ace0 Fix toolbar in polls 2017-09-27 10:09:47 +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
ansuz 9571b3c018 persist whiteboard content across sessions 2017-09-26 15:16:17 +02:00
ansuz 748172585e update for modified id 2017-09-26 15:00:25 +02:00
ansuz 4cd7d8eda4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-26 14:35:02 +02:00
yflory 345bfc1cea Remove migration for pad attributes 2017-09-26 14:36:49 +02:00
ansuz 52be5501d6 remove invalid test 2017-09-26 14:34:54 +02:00
yflory 69014e5fde Fix mediatags in pad not cached 2017-09-26 11:21:36 +02:00
ansuz b3e066eaca show loading screen tips during loading screen 2017-09-26 10:59:25 +02:00
Caleb James DeLisle 1fd7a6e2b3 Mistake in mkEvent which makes all events only work once 2017-09-25 18:03:31 +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 59ad96e491 Make sure the user is redirected to the drive at registration 2017-09-25 16:11:50 +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
yflory 1afbd4648d Fix old drive 2017-09-25 15:23:42 +02:00
yflory b871faffc9 Enable tags in code and slide 2017-09-25 14:47:31 +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