 ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
|
|
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
|
|
ansuz
|
584adb5482
|
bump version to 1.1.1
|
2017-03-02 16:31:58 +01:00 |
|
|
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
2017-03-02 11:38:20 +01:00 |
|
|
ansuz
|
e3f26263f4
|
remove red outline on images in slide
|
2017-03-02 11:28:20 +01:00 |
|
|
ansuz
|
c9040997d5
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
2017-03-02 11:07:17 +01:00 |
|
|
ansuz
|
9800f036c5
|
fix a typo
|
2017-03-01 17:06:18 +01:00 |
|
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
2017-03-01 17:05:57 +01:00 |
|
|
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
2017-03-01 15:07:34 +01:00 |
|
|
ansuz
|
bd42a7d176
|
bump hyperjson bower dependency to new major version
|
2017-03-01 14:36:41 +01:00 |
|
|
ansuz
|
639376f1cb
|
don't use hyperjson.toString
|
2017-03-01 12:36:10 +01:00 |
|
|
ansuz
|
3619fdc77a
|
bump cryptpad version number
|
2017-02-28 19:04:54 +01:00 |
|
|
ansuz
|
84a4a15c46
|
fix inverted checkbox description
|
2017-02-28 18:58:20 +01:00 |
|
|
ansuz
|
3bf85b113c
|
don't hide overflow, that causes worse problems
|
2017-02-28 16:37:34 +01:00 |
|
|
ansuz
|
5d39125004
|
Make onSettle Async Again
|
2017-02-28 13:12:04 +01:00 |
|
|
ansuz
|
3380b13c95
|
remove horizontal scroll on edge
|
2017-02-28 12:29:53 +01:00 |
|
|
ansuz
|
10c41369de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 12:25:40 +01:00 |
|
|
ansuz
|
8c87255267
|
remove any mention of piwik
|
2017-02-28 12:25:31 +01:00 |
|
|
ansuz
|
569d25f25f
|
update some translation keys in English
|
2017-02-28 11:50:07 +01:00 |
|
|
ansuz
|
b87c9d4ba6
|
fix merge conflicts with usability branch
|
2017-02-28 11:35:29 +01:00 |
|
|
ansuz
|
5a49e276b5
|
add settings_anonymous key
|
2017-02-28 11:32:14 +01:00 |
|
|
ansuz
|
12aec60a12
|
hack around onSettle not doing its job
|
2017-02-28 11:05:59 +01:00 |
|
|
ansuz
|
69b6f80e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 10:47:23 +01:00 |
|
|
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
2017-02-28 10:47:18 +01:00 |
|
|
ansuz
|
cfc9f2e622
|
remove code for 'user' app, now that we have login and register
|
2017-02-28 10:46:21 +01:00 |
|
|
ansuz
|
d49a7d7ec4
|
fix undefined reference
|
2017-02-28 10:30:24 +01:00 |
|
|
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 20:11:26 +01:00 |
|
|
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
2017-02-27 20:11:18 +01:00 |
|
|
ansuz
|
1a259bb3aa
|
check if user has disallowed feedback api
|
2017-02-27 20:02:54 +01:00 |
|
|
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:32:04 +01:00 |
|
|
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
2017-02-27 14:31:56 +01:00 |
|
|
ansuz
|
4941674cf7
|
initialize allowUserFeedback to true if it is not defined
|
2017-02-27 14:31:00 +01:00 |
|
|
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
2017-02-27 12:06:49 +01:00 |
|
|
ansuz
|
cc829d51f8
|
jshint compliance
|
2017-02-24 18:23:43 +01:00 |
|
|
ansuz
|
89bee8cf6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 12:08:26 +01:00 |
|
|
ansuz
|
ba3e24b595
|
media tag experiments
|
2017-02-24 12:08:16 +01:00 |
|
|
ansuz
|
9ccb473b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability
|
2017-02-24 12:06:17 +01:00 |
|
|
ansuz
|
252fc7a640
|
uppercase messages
|
2017-02-24 11:52:21 +01:00 |
|
|
ansuz
|
20689b1dec
|
update english translation for usability feedback
|
2017-02-23 16:11:39 +01:00 |
|
|
ansuz
|
f168433db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-22 17:41:06 +01:00 |
|
|
ansuz
|
d0b7576d84
|
make slide present mode exit button clickable at all sizes
|
2017-02-22 17:40:44 +01:00 |
|
|
ansuz
|
1494387c9f
|
ignore a line for jshint
|
2017-02-22 11:17:12 +01:00 |
|
|
ansuz
|
33e2c8676e
|
assign updated key to what it should actually be
|
2017-02-22 11:15:25 +01:00 |
|
|
ansuz
|
89f3577058
|
remove old poll
|
2017-02-22 11:05:47 +01:00 |
|
|
ansuz
|
641c805518
|
unbreak ckeditor
|
2017-02-21 18:59:42 +01:00 |
|
|
ansuz
|
7e77c6828a
|
more correct pluralization
|
2017-02-21 18:55:48 +01:00 |
|
|
ansuz
|
c0989f64fa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-21 18:21:39 +01:00 |
|
|
ansuz
|
3d0e7cb9a7
|
pull ckeditor config out of main.js
|
2017-02-21 18:21:30 +01:00 |
|
|
ansuz
|
ed19c6885d
|
join array in messages.js
|
2017-02-21 17:16:56 +01:00 |
|
|
ansuz
|
5276dac7cc
|
safely handle keys which aren't strings
|
2017-02-21 12:29:47 +01:00 |
|
|
ansuz
|
84b64da76d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-21 12:22:09 +01:00 |
|
|
ansuz
|
1151c02662
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-21 10:58:28 +01:00 |
|
|
ansuz
|
94417d9a8b
|
jshint compliance
|
2017-02-17 14:28:18 +01:00 |
|
|
ansuz
|
8167ed9048
|
implement cache-busting everywhere
|
2017-02-17 12:39:01 +01:00 |
|
|
ansuz
|
34b6507fa3
|
implement cache-busting everywhere
|
2017-02-17 12:38:58 +01:00 |
|
|
ansuz
|
66a21bb45c
|
implement cache-busting everywhere
|
2017-02-17 12:38:10 +01:00 |
|
|
ansuz
|
c9b8889380
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:26:43 +01:00 |
|
|
ansuz
|
09fade6127
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:25:35 +01:00 |
|
|
ansuz
|
5ae65c8bc1
|
make the user confirm
|
2017-02-13 13:04:55 +01:00 |
|
|
ansuz
|
7d0c29513c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 12:42:17 +01:00 |
|
|
ansuz
|
7d21206cae
|
add registration introductory text
|
2017-02-13 12:42:07 +01:00 |
|
|
ansuz
|
562e5b8c70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 11:17:16 +01:00 |
|
|
ansuz
|
5d4d530c89
|
switch registration text to an explanation of how login works
|
2017-02-13 11:17:00 +01:00 |
|
|
ansuz
|
20083264b2
|
load fontawesome icons on register page
|
2017-02-13 11:09:44 +01:00 |
|
|
ansuz
|
fbcf4ccec4
|
force usernames to be lowercase
|
2017-02-13 11:01:30 +01:00 |
|
|
ansuz
|
5614bea271
|
redirect users to login and register from toolbar
|
2017-02-13 10:51:54 +01:00 |
|
|
ansuz
|
f723585758
|
add api to check whether the realtime has synced with the server
|
2017-02-13 10:42:17 +01:00 |
|
|
ansuz
|
3b1bd2f720
|
use additional translation keys for registration
|
2017-02-13 10:15:25 +01:00 |
|
|
ansuz
|
438e139489
|
don't complete login names
|
2017-02-13 10:14:26 +01:00 |
|
|
ansuz
|
b5b2454f0b
|
use bootstrap for login and register pages
|
2017-02-10 18:29:49 +01:00 |
|
|
ansuz
|
c556f78562
|
log in directly from home page, sign up at /register/
|
2017-02-10 16:49:17 +01:00 |
|
|
ansuz
|
d0edf75c89
|
signup link directs users to register page, not user
|
2017-02-10 16:48:28 +01:00 |
|
|
ansuz
|
0ee808295b
|
make sure jquery is imported before using it
|
2017-02-10 14:29:01 +01:00 |
|
|
ansuz
|
1232aa8a79
|
jshint compliance
|
2017-02-10 14:25:02 +01:00 |
|
|
ansuz
|
88af104ce8
|
basic registration page to replace user page
|
2017-02-09 18:50:28 +01:00 |
|
|
ansuz
|
a995df25f6
|
disable new OT in pad and code app
|
2017-02-09 17:20:13 +01:00 |
|
|
ansuz
|
f92ba193c3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-09 17:16:03 +01:00 |
|
|
ansuz
|
e100110741
|
implement log in as an api
|
2017-02-09 16:31:57 +01:00 |
|
|
ansuz
|
c642bce984
|
restore disabled listener
|
2017-02-09 10:31:00 +01:00 |
|
|
ansuz
|
dae17588c6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 18:27:28 +01:00 |
|
|
ansuz
|
32a5c5ff62
|
better integration between /user/ and home
|
2017-02-07 17:50:37 +01:00 |
|
|
ansuz
|
fe7ba98338
|
remove dead code from /user/
|
2017-02-07 17:50:02 +01:00 |
|
|
ansuz
|
9b047bfb53
|
don't autocorrect usernames. add trailing slash to /drive
|
2017-02-07 17:28:32 +01:00 |
|
|
ansuz
|
6e97082ff9
|
remove dead code from login function
|
2017-02-07 17:27:36 +01:00 |
|
|
ansuz
|
4b710b418c
|
remove dead code from home page
|
2017-02-07 17:27:00 +01:00 |
|
|
ansuz
|
6e730c7800
|
prefer to end links to apps with a trailing slash
|
2017-02-07 10:53:42 +01:00 |
|
|
ansuz
|
8a1acc3c37
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 10:40:03 +01:00 |
|
|
ansuz
|
6f07a3b7b4
|
erase lingering sessionStorage values when logging out
|
2017-02-07 10:39:42 +01:00 |
|
|
ansuz
|
8648ff208e
|
dropdown links should always be black
|
2017-02-02 18:52:11 +01:00 |
|
|
ansuz
|
0ad95142f5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-02 18:49:17 +01:00 |
|
|
ansuz
|
26a4b0c18f
|
override bootstrap colors
|
2017-02-02 18:48:43 +01:00 |
|
|
ansuz
|
e712025a4e
|
set cached styles
|
2017-02-02 18:39:40 +01:00 |
|
|
ansuz
|
85b49d5ec8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-02 18:37:09 +01:00 |
|
|
ansuz
|
9d0252e989
|
style links on info pages, and fix layouts
|
2017-02-02 18:36:30 +01:00 |
|
|
ansuz
|
72c4175b6f
|
remove slide/oldmain.js
|
2017-02-02 14:44:43 +01:00 |
|
|
ansuz
|
2dfe182d8d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-02 11:27:17 +01:00 |
|
|
ansuz
|
0ca1775657
|
add page for listing missing translations
|
2017-02-02 11:27:08 +01:00 |
|
|
ansuz
|
07f722fbd8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-01 15:47:58 +01:00 |
|
|
ansuz
|
1a061c22a0
|
more consistent styles and improved SEO
|
2017-02-01 15:47:50 +01:00 |
|
|
ansuz
|
3a9c1c782d
|
remove dead code from cryptpad.less
|
2017-02-01 15:21:59 +01:00 |
|