 ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
|
ansuz
|
fcbe3a5224
|
add already registered message to english translation
|
2017-03-14 12:40:19 +01:00 |
|
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
2017-03-14 12:39:50 +01:00 |
|
|
ansuz
|
11ff3f5347
|
new styles for alertify dialogs
|
2017-03-14 12:02:12 +01:00 |
|
|
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
2017-03-14 12:01:42 +01:00 |
|
|
ansuz
|
5d88c3a436
|
newer registration code
|
2017-03-14 12:00:23 +01:00 |
|
|
ansuz
|
bbe2279b9c
|
add new translations for registration
|
2017-03-14 11:02:14 +01:00 |
|
|
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 19:32:15 +01:00 |
|
|
ansuz
|
0d30a1e00f
|
add safe and danger classes to alertify styles
|
2017-03-13 19:32:10 +01:00 |
|
|
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
2017-03-13 19:30:56 +01:00 |
|
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
|
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
2017-03-13 12:56:49 +01:00 |
|
|
ansuz
|
a16e6850d4
|
add translation keys for the feedback page
|
2017-03-13 12:54:59 +01:00 |
|
|
ansuz
|
95a51e8fe4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 12:16:06 +01:00 |
|
|
ansuz
|
ff3641134f
|
update pad initialState
|
2017-03-13 12:16:01 +01:00 |
|
|
ansuz
|
1178660815
|
update code initialState string
|
2017-03-13 11:52:33 +01:00 |
|
|
ansuz
|
91e587d9c7
|
fix section title
|
2017-03-13 11:30:48 +01:00 |
|
|
ansuz
|
b7a43cd9d9
|
update readme to explain dev mode
|
2017-03-13 11:29:08 +01:00 |
|
|
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 10:59:20 +01:00 |
|
|
ansuz
|
aa762e7d63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-07 15:33:01 +01:00 |
|
|
ansuz
|
8a48612de2
|
add some notes for later
|
2017-03-07 14:40:06 +01:00 |
|
|
ansuz
|
f7002a0bf7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-06 17:25:13 +01:00 |
|
|
ansuz
|
efdd999161
|
implement dev mode which busts cache all the time
|
2017-03-06 17:25:02 +01:00 |
|
|
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 18:16:39 +01:00 |
|
|
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
2017-03-03 18:16:34 +01:00 |
|
|
ansuz
|
bf82704def
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 17:21:43 +01:00 |
|
|
ansuz
|
92066118a1
|
correct out of date portions of the readme
|
2017-03-03 17:16:06 +01:00 |
|
|
ansuz
|
6e72c6a51b
|
remove unused dependencies
|
2017-03-03 17:15:33 +01:00 |
|
|
ansuz
|
08c862b271
|
add FIXME notes to poll
|
2017-03-03 16:13:32 +01:00 |
|
|
ansuz
|
3b578aa1fd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 18:31:38 +01:00 |
|
|
ansuz
|
f313b6f65c
|
bump travis node version to 6.6.0
|
2017-03-02 18:31:24 +01:00 |
|
|
ansuz
|
868161a8a8
|
fix undefined reference in code
|
2017-03-02 17:59:59 +01:00 |
|
|
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 17:59:35 +01:00 |
|
|
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
2017-03-02 17:40:29 +01:00 |
|
|
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 |
|