 Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-14 16:24:17 +02:00 |
|
|
Caleb James DeLisle
|
723151254c
|
remove a debug line before release which killed CSP
|
2017-08-14 16:23:56 +02:00 |
|
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
2017-08-14 16:23:38 +02:00 |
|
|
Caleb James DeLisle
|
7c8df61f91
|
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
|
2017-08-11 17:54:15 +02:00 |
|
|
Caleb James DeLisle
|
196ce3b3f7
|
Fix alertify style which made the registration popup look bad
|
2017-08-11 17:49:19 +02:00 |
|
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
2017-08-11 17:34:51 +02:00 |
|
|
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 17:28:42 +02:00 |
|
|
Caleb James DeLisle
|
7a698d092e
|
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
|
2017-08-11 17:28:23 +02:00 |
|
|
Caleb James DeLisle
|
9833bd7e59
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:31:40 +02:00 |
|
|
Caleb James DeLisle
|
89a8e8050c
|
Fix typo and also change message to explain itself better
|
2017-08-11 14:31:31 +02:00 |
|
|
Caleb James DeLisle
|
aa1563a731
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 18:32:27 +02:00 |
|
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 14:49:41 +02:00 |
|
|
Caleb James DeLisle
|
1043e076a4
|
Merge branch 'ui-integration' into staging
|
2017-08-09 17:47:02 +02:00 |
|
|
Caleb James DeLisle
|
1f9bd866c3
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 16:06:46 +02:00 |
|
|
Caleb James DeLisle
|
52565076b9
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 14:48:06 +02:00 |
|
|
Caleb James DeLisle
|
548bce479a
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-07 10:53:27 +02:00 |
|
|
Caleb James DeLisle
|
eaf5c73b05
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into front-page
|
2017-08-04 15:47:34 +02:00 |
|
|
Caleb James DeLisle
|
0f7124d673
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:26:59 +02:00 |
|
|
Caleb James DeLisle
|
a6547d1ed0
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:20:14 +02:00 |
|
|
Caleb James DeLisle
|
95c7cd3fcc
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:17:22 +02:00 |
|
|
Caleb James DeLisle
|
930ba8aec6
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:13:09 +02:00 |
|
|
Caleb James DeLisle
|
b26c62714f
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:08:21 +02:00 |
|
|
Caleb James DeLisle
|
4d563af045
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:51:14 +02:00 |
|
|
Caleb James DeLisle
|
a10214ed2a
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:19:54 +02:00 |
|
|
Caleb James DeLisle
|
75c0876500
|
Added ludovic's bio
|
2017-08-04 14:19:44 +02:00 |
|
|
Caleb James DeLisle
|
c274a27dfb
|
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
|
2017-08-04 11:33:28 +02:00 |
|
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
2017-08-04 11:20:17 +02:00 |
|
|
Caleb James DeLisle
|
1b466d250f
|
Add some photos
|
2017-08-03 18:01:48 +02:00 |
|
|
Caleb James DeLisle
|
5d70dd93b3
|
Manual merge
|
2017-08-03 17:18:03 +02:00 |
|
|
Caleb James DeLisle
|
bc15ce7de5
|
Manual merge
|
2017-08-03 17:00:46 +02:00 |
|
|
Caleb James DeLisle
|
52e9ba92fa
|
Update whitepaper link and also change whatis_zeroknowledge
|
2017-08-03 16:23:29 +02:00 |
|
|
Caleb James DeLisle
|
27aa1886b1
|
Move footer to pages.js and add it to the contact page
|
2017-08-01 14:17:02 +02:00 |
|
|
Caleb James DeLisle
|
490e2b4d0a
|
work in progress on migrating styles back into the infopages.less
|
2017-08-01 13:49:42 +02:00 |
|
|
Caleb James DeLisle
|
cd2b41f51e
|
Fix up some less for supporting the info-pages
|
2017-08-01 11:53:06 +02:00 |
|
|
Caleb James DeLisle
|
896186d059
|
Fix some wrong less files which were breaking the UI of the apps
|
2017-08-01 11:19:32 +02:00 |
|
|
Caleb James DeLisle
|
cd3f29c502
|
Merge branch 'readme' of git://github.com/pbondoer/cryptpad into staging
|
2017-07-31 15:00:47 +02:00 |
|
|
Caleb James DeLisle
|
428bee6306
|
make links clickable and make more link work
|
2017-07-26 15:53:10 +02:00 |
|
|
Caleb James DeLisle
|
49c760131e
|
wip
|
2017-07-24 14:10:40 +02:00 |
|
|
Caleb James DeLisle
|
6a1ec54e2a
|
wip
|
2017-07-22 17:31:40 +02:00 |
|
|
Caleb James DeLisle
|
8404017af1
|
wip
|
2017-07-22 16:43:53 +02:00 |
|
|
Caleb James DeLisle
|
ffb5e555a0
|
Merge branch 'staging' into front-page
|
2017-07-20 10:09:32 +02:00 |
|
|
Caleb James DeLisle
|
f6abdc2b86
|
manual merge of staging
|
2017-07-13 10:30:42 +02:00 |
|
|
Caleb James DeLisle
|
607d4fa57e
|
Fixed broken pinneddata.js and added blob data to the stats
|
2017-07-06 17:19:29 +02:00 |
|
|
Caleb James DeLisle
|
25905d13fa
|
wip
|
2017-07-03 20:40:19 +02:00 |
|
|
Caleb James DeLisle
|
d72acec915
|
Version of diffdom must be pinned because they release with breaking changes
|
2017-07-02 16:52:01 +02:00 |
|
|
Caleb James DeLisle
|
fcff5fa009
|
wip
|
2017-07-02 16:51:21 +02:00 |
|
|
Caleb James DeLisle
|
2144587919
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 12:11:55 +02:00 |
|
|
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
2017-06-30 12:11:44 +02:00 |
|
|
Caleb James DeLisle
|
7bee2ba27d
|
Add a semicolon at the end of the CSP if none exists.
|
2017-06-15 14:45:01 +02:00 |
|
|
Caleb James DeLisle
|
aa9aaefdea
|
Add frame-ancestors to allow remote auth
|
2017-06-07 09:51:10 +02:00 |
|
|
Caleb James DeLisle
|
7bf17c0d32
|
drop edge and IE from the test matrix
|
2017-06-01 10:56:11 +02:00 |
|
|
Caleb James DeLisle
|
6eb3b6800f
|
try safari 9
|
2017-06-01 10:27:30 +02:00 |
|
|
Caleb James DeLisle
|
337dd99b06
|
lets see if safari will work with this...
|
2017-06-01 10:15:57 +02:00 |
|
|
Caleb James DeLisle
|
90060dde4c
|
added back safari
|
2017-06-01 10:08:16 +02:00 |
|
|
Caleb James DeLisle
|
50082cfd19
|
Remove safari which is failing weirdly and fix race
|
2017-06-01 00:50:36 +02:00 |
|
|
Caleb James DeLisle
|
92ab8d88ba
|
accept defeat
|
2017-06-01 00:41:31 +02:00 |
|
|
Caleb James DeLisle
|
c8bd1bb2ac
|
Trying to improve the tests which fail always when running remotely
|
2017-06-01 00:29:17 +02:00 |
|
|
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
2017-06-01 00:09:39 +02:00 |
|
|
Caleb James DeLisle
|
244bd7b378
|
;;;
|
2017-05-31 23:32:47 +02:00 |
|
|
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
2017-05-31 23:29:58 +02:00 |
|
|
Caleb James DeLisle
|
68296e9d23
|
one too many quote marks
|
2017-05-31 20:51:56 +02:00 |
|
|
Caleb James DeLisle
|
3ca41d8df7
|
Change the testing matrix
|
2017-05-31 20:49:03 +02:00 |
|
|
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
2017-05-31 19:46:23 +02:00 |
|
|
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
2017-05-31 19:40:17 +02:00 |
|
|
Caleb James DeLisle
|
96a5b5bbc1
|
Merge branch 'soon' into staging
|
2017-05-31 15:01:09 +02:00 |
|
|
Caleb James DeLisle
|
f37b313efc
|
jshint node=true
|
2017-05-31 15:00:41 +02:00 |
|
|
Caleb James DeLisle
|
69a72d71de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-31 13:05:56 +02:00 |
|
|
Caleb James DeLisle
|
5050023b6a
|
pinneddata can now show you what is unpinned
|
2017-05-31 13:05:49 +02:00 |
|
|
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
2017-05-26 18:09:31 +02:00 |
|
|
Caleb James DeLisle
|
6c1861dbc6
|
Merge branch 'soon' into staging
|
2017-05-26 15:48:44 +02:00 |
|
|
Caleb James DeLisle
|
9068a8ed58
|
Merge branch 'patch-1' of git://github.com/superniko/cryptpad into soon
|
2017-05-26 15:36:44 +02:00 |
|
|
Caleb James DeLisle
|
2ecf257fcd
|
Sync localStorage with sessionStorage in auth because safari...
|
2017-05-26 15:30:01 +02:00 |
|
|
Caleb James DeLisle
|
70c1061f47
|
Fix romanian translation
|
2017-05-24 14:49:00 +02:00 |
|
|
Caleb James DeLisle
|
83c0a6d37d
|
Romanian translation
|
2017-05-24 14:37:13 +02:00 |
|
|
Caleb James DeLisle
|
5348303df6
|
Bad code, lint failure
|
2017-05-11 16:02:24 +02:00 |
|
|
Caleb James DeLisle
|
b2b1f08d01
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-11 15:54:27 +02:00 |
|
|
Caleb James DeLisle
|
9a6d63960b
|
Added a script to get the amount of data which is pinned
|
2017-05-11 15:54:15 +02:00 |
|
|
Caleb James DeLisle
|
211113fb1a
|
little flowey
|
2017-04-25 16:04:17 +02:00 |
|
|
Caleb James DeLisle
|
0e8b55edc0
|
Added an authentication page to allow getting the user pubkey
|
2017-04-20 10:15:07 +02:00 |
|
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
2017-04-18 12:14:32 +02:00 |
|
|
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
2017-03-01 21:06:53 +01:00 |
|
|
Caleb James DeLisle
|
4243d9028e
|
new version of chainpad, update all the dependencies
|
2017-02-16 17:24:26 +01:00 |
|
|
Caleb James DeLisle
|
c8587a967a
|
Use new version of chainpad
|
2017-02-16 16:50:02 +01:00 |
|
|
Caleb James DeLisle
|
9148aab636
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-09 21:12:25 +01:00 |
|
|
Caleb James DeLisle
|
370f0185b9
|
Pin bower version because cursor handling is broken by the latest version
|
2017-02-09 21:12:07 +01:00 |
|
|
Caleb James DeLisle
|
2eccc6a69f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-09 12:48:14 +01:00 |
|
|
Caleb James DeLisle
|
9dfe3ccaac
|
Change 'jot it down' to 'write it down' in the front page
|
2017-02-09 12:48:06 +01:00 |
|
|
Caleb James DeLisle
|
5e4f2ffe6a
|
Shrink images, change text and 'make a pad right now' button
|
2017-01-31 15:00:01 +01:00 |
|
|
Caleb James DeLisle
|
47b437614e
|
Merge branch 'master' into soon
|
2017-01-26 16:34:07 +01:00 |
|
|
Caleb James DeLisle
|
4402ea9966
|
typo in config.dist
|
2017-01-26 16:34:00 +01:00 |
|
|
Caleb James DeLisle
|
516e25f0dc
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-01-12 17:58:29 +01:00 |
|
|
Caleb James DeLisle
|
a8ba798203
|
Stop doing tests on pull requests because they're always going to fail
|
2017-01-12 17:58:12 +01:00 |
|
|
Caleb James DeLisle
|
52d5821be0
|
Run the tests on all of the permanent branches
|
2017-01-12 12:09:16 +01:00 |
|
|
Caleb James DeLisle
|
35a853ffff
|
Stop failing tests over missing translations because otherwise they'll almost never be passing.
|
2017-01-12 12:06:44 +01:00 |
|
|
Caleb James DeLisle
|
512c1b12f4
|
Make the selenium test log the content of the /assert report to the console
|
2017-01-12 12:03:14 +01:00 |
|
|
Caleb James DeLisle
|
994f6991c8
|
Merge branch 'master' into soon
|
2017-01-11 18:01:08 +01:00 |
|
|
Caleb James DeLisle
|
6c5e8d3118
|
Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
|
2017-01-11 18:00:41 +01:00 |
|
|
Caleb James DeLisle
|
72fc2e7068
|
Chuck a few more super-duper-security headers in there
|
2016-10-06 23:02:30 +02:00 |
|
|
Caleb James DeLisle
|
f8ac3a6ad3
|
Fix merge error
|
2016-10-06 22:48:30 +02:00 |
|
|
Caleb James DeLisle
|
83c3f6310a
|
Don't make the codestyle any worse than it is
|
2016-10-06 22:44:58 +02:00 |
|