web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 7bf17c0d32 drop edge and IE from the test matrix Caleb James DeLisle 2017-06-01 10:56:11 +02:00
  • 282095f674 disable failing tests ansuz 2017-06-01 10:40:41 +02:00
  • c65ca5cfc6 restore deleted line and add missing semicolon ansuz 2017-06-01 10:35:42 +02:00
  • 26251a5c9c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-01 10:26:55 +02:00
  • 6eb3b6800f try safari 9 Caleb James DeLisle 2017-06-01 10:27:30 +02:00
  • bd3dcebf1f add registration to tests ansuz 2017-06-01 10:26:46 +02:00
  • 8a09083fd7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-01 10:24:03 +02:00
  • 8bd9ad8847 add automated registration test ansuz 2017-06-01 10:23:50 +02:00
  • 07279c8dc7 export boolean Test.testing ansuz 2017-06-01 10:23:24 +02:00
  • 337dd99b06 lets see if safari will work with this... Caleb James DeLisle 2017-06-01 10:15:57 +02:00
  • 90060dde4c added back safari Caleb James DeLisle 2017-06-01 10:08:16 +02:00
  • 50082cfd19 Remove safari which is failing weirdly and fix race Caleb James DeLisle 2017-06-01 00:50:36 +02:00
  • 92ab8d88ba accept defeat Caleb James DeLisle 2017-06-01 00:41:31 +02:00
  • c8bd1bb2ac Trying to improve the tests which fail always when running remotely Caleb James DeLisle 2017-06-01 00:29:17 +02:00
  • 71bd808e4f Send everything through the test global function Caleb James DeLisle 2017-06-01 00:09:39 +02:00
  • 244bd7b378 ;;; Caleb James DeLisle 2017-05-31 23:32:47 +02:00
  • 7d557df74b a new and more horrible way of sniffing the logs out of the instance Caleb James DeLisle 2017-05-31 23:29:58 +02:00
  • 68296e9d23 one too many quote marks Caleb James DeLisle 2017-05-31 20:51:56 +02:00
  • 3ca41d8df7 Change the testing matrix Caleb James DeLisle 2017-05-31 20:49:03 +02:00
  • 0d4b74cfba ;;;;;; keep these ;;; for later ;;;;; Caleb James DeLisle 2017-05-31 19:46:23 +02:00
  • 24f37ea414 Delicious testing Caleb James DeLisle 2017-05-31 19:40:17 +02:00
  • 5e57578fa9 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-05-31 18:44:55 +02:00
  • 30f66ab7ba hotfix 'undefined/' bug ansuz 2017-05-31 18:44:44 +02:00
  • 7b94106bac fix inverted conditional :/ ansuz 2017-05-31 18:15:31 +02:00
  • 2e03485db4 remove known bad entries from localStorage.userHash... ansuz 2017-05-31 18:12:58 +02:00
  • 936bf8df9d return falsey if userHash is junk ansuz 2017-05-31 18:08:41 +02:00
  • 105e5cdac9 fix 'undefined/' userHash ansuz 2017-05-31 18:01:12 +02:00
  • 401e908963 use media-tag with xhr error handling ansuz 2017-05-31 17:17:01 +02:00
  • 1a8c964fde Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-31 15:31:51 +02:00
  • 087bcd2ea5 update default config with new CSP values ansuz 2017-05-31 15:21:29 +02:00
  • 96a5b5bbc1 Merge branch 'soon' into staging Caleb James DeLisle 2017-05-31 15:01:09 +02:00
  • f37b313efc jshint node=true Caleb James DeLisle 2017-05-31 15:00:41 +02:00
  • 69a72d71de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-05-31 13:05:56 +02:00
  • 5050023b6a pinneddata can now show you what is unpinned Caleb James DeLisle 2017-05-31 13:05:49 +02:00
  • 3465710237 Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag ansuz 2017-05-31 12:55:05 +02:00
  • 82f5d3c96f abstract checks for authenticated RPCs ansuz 2017-05-31 12:51:26 +02:00
  • 8ab9248a78 Fix ES6 Daniel RADEAU 2017-05-31 12:42:37 +02:00
  • d774f8771b remove more unused files ansuz 2017-05-31 12:23:31 +02:00
  • 540304807c remove unused files ansuz 2017-05-31 12:11:33 +02:00
  • 21c39572be Update media-tag and fix bower dependencies Daniel RADEAU 2017-05-31 11:53:25 +02:00
  • f9023185c1 move documentation into docs folder ansuz 2017-05-31 10:10:33 +02:00
  • 1c04af5b30 add disclaimer to top of example nginx config ansuz 2017-05-31 10:07:58 +02:00
  • daf112a5b5 take api settings into account for upgrade button ansuz 2017-05-30 20:11:15 +02:00
  • ebfa228bc0 add upgrade button to all static pages ansuz 2017-05-30 18:39:41 +02:00
  • 149568689a color donate button green ansuz 2017-05-30 17:58:31 +02:00
  • ec6ad6772b send feedback on donation ansuz 2017-05-30 17:25:36 +02:00
  • cb2efe138b Media Tag integration, image, audio, video, pdf Daniel RADEAU 2017-05-30 16:36:06 +02:00
  • 8507f77116 throw if adminEmail and allowSubscriptions are not compatible ansuz 2017-05-30 16:27:42 +02:00
  • 76c530037b enable donate button in all apps ansuz 2017-05-30 15:51:07 +02:00
  • 9ca5bc507e add support for donate button ansuz 2017-05-30 15:42:53 +02:00
  • 909bc2ebf3 add new translation key ansuz 2017-05-30 15:39:13 +02:00
  • 605377cf31 update default configuration file with new attributes and comments ansuz 2017-05-30 15:35:51 +02:00
  • 81b931e56f Update messages.pt-br.js Gustavo H M Silva 2017-05-30 09:45:14 -03:00
  • a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-30 10:46:17 +02:00
  • 99a44f119f don't send referrer headers on pads which may link outward ansuz 2017-05-30 10:44:40 +02:00
  • 75874424cf add 'support cryptpad' translation key ansuz 2017-05-30 10:41:46 +02:00
  • 08619e733a Partial translation + duplicated token fix Gustavo H M Silva 2017-05-29 15:19:04 -03:00
  • 2d2e00b569 Merged translated and non-translated in pt-BR Gustavo H M Silva 2017-05-29 14:43:15 -03:00
  • 92a7970eb8 fix merge conflicts ansuz 2017-05-29 19:04:47 +02:00
  • a15ef44a12 Merge pull request #126 from pbondoer/spanish ansuz 2017-05-29 18:55:04 +02:00
  • 0a92719763 spanish! new keys ahoy Pierre Bondoerffer 2017-05-29 18:25:18 +02:00
  • c4f8286be6 add timestamp to rpc error logs ansuz 2017-05-29 17:35:13 +02:00
  • 1240b864ef fix misconfigured history ansuz 2017-05-29 17:25:06 +02:00
  • 6518b56945 poll: french messages Pierre Bondoerffer 2017-05-29 16:50:25 +02:00
  • f434f002c4 poll: make locks clickable Pierre Bondoerffer 2017-05-29 16:32:40 +02:00
  • 3915b30055 provide a register button on login ansuz 2017-05-29 13:11:07 +02:00
  • b6bb576a34 Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll Pierre Bondoerffer 2017-05-29 12:59:49 +02:00
  • b910915d47 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-29 11:33:03 +02:00
  • 6573813523 Merge branch 'soon' into staging ansuz 2017-05-29 11:32:54 +02:00
  • 41a8604cb8 Merge pull request #122 from superniko/patch-2 ansuz 2017-05-29 10:48:24 +02:00
  • 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place Caleb James DeLisle 2017-05-26 18:09:31 +02:00
  • 1092285a68 merge master Pierre Bondoerffer 2017-05-26 16:18:51 +02:00
  • 6c1861dbc6 Merge branch 'soon' into staging Caleb James DeLisle 2017-05-26 15:48:44 +02:00
  • 0559b8cb77 Update messages.ro.js superniko 2017-05-26 16:47:45 +03:00
  • 9068a8ed58 Merge branch 'patch-1' of git://github.com/superniko/cryptpad into soon Caleb James DeLisle 2017-05-26 15:36:44 +02:00
  • 2ecf257fcd Sync localStorage with sessionStorage in auth because safari... Caleb James DeLisle 2017-05-26 15:30:01 +02:00
  • 3f3d64992d resolve merge conflicts ansuz 2017-05-26 12:44:58 +02:00
  • 57017c68fa hacks for cross-domain safari ansuz 2017-05-26 12:42:12 +02:00
  • cf658c1b3a backport live changes ansuz 2017-05-26 12:41:30 +02:00
  • 70fbbe0078 Update messages.ro.js superniko 2017-05-25 10:23:27 +03:00
  • a04f179d8b hide preview mode on phones ansuz 2017-05-24 19:00:14 +02:00
  • df2b00122a New drive structure without file names yflory 2017-05-24 18:59:44 +02:00
  • dc2b0ae6b4 jshint compliance ansuz 2017-05-24 18:45:48 +02:00
  • b32c329269 remember whether you were using preview mode for a pad ansuz 2017-05-24 18:41:19 +02:00
  • d9f7470f06 copy user details into sessionStorage for safari ansuz 2017-05-24 18:28:16 +02:00
  • a5ffd278a7 write styles for code in .less ansuz 2017-05-24 17:27:03 +02:00
  • 3803f6a20f only render preview if preview container is visible ansuz 2017-05-24 17:25:33 +02:00
  • 617e027f12 catch markdown preview errors ansuz 2017-05-24 15:50:35 +02:00
  • bc26f7fc4e Merge branch 'soon' into staging ansuz 2017-05-24 15:04:40 +02:00
  • 70c1061f47 Fix romanian translation Caleb James DeLisle 2017-05-24 14:49:00 +02:00
  • 83c0a6d37d Romanian translation Caleb James DeLisle 2017-05-24 14:37:13 +02:00
  • c5bb830757 don't preview if hightlight mode is not markdown ansuz 2017-05-24 14:21:31 +02:00
  • fd83ae3e61 implement createRandomInteger ansuz 2017-05-24 11:34:40 +02:00
  • 4d9060f49e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-24 11:28:06 +02:00
  • 378bf2aa94 yflory's word wrap fix ansuz 2017-05-24 11:27:31 +02:00
  • dc80b6b11f throttle markdown preview ansuz 2017-05-24 11:27:16 +02:00
  • f5f8e148ca Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-23 18:09:42 +02:00
  • 90f5713d4a Fix an issue with the search bar redirecting to incorrect location yflory 2017-05-23 18:09:30 +02:00
  • d49e6deffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-23 18:06:39 +02:00
  • 97cc4a6d54 add styling for tables in markdown preview ansuz 2017-05-23 18:03:35 +02:00