Commit graph

1991 commits

Author SHA1 Message Date
yflory
55210f17eb Clean the code to be less dependant on 'li' 2017-03-01 16:15:48 +01:00
Pierre Bondoerffer
3e9c4d0901
Add hover to file manager tree 2017-03-01 15:57:22 +01:00
Pierre Bondoerffer
cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 15:53:48 +01:00
yflory
c6c3e1bbb5 Don't select subfolders in the tree when drag&drop 2017-03-01 15:53:31 +01:00
Pierre Bondoerffer
d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 15:46:49 +01:00
yflory
a26b9d3240 Don't select subfolders in the tree when right-click on drag&drop 2017-03-01 15:46:10 +01:00
ansuz
cb5e01815c validate all alertify strings by default. require 'force' argument to bypass 2017-03-01 15:07:34 +01:00
Pierre Bondoerffer
b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 14:45:18 +01:00
yflory
a2b5200381 Add a container for the folders in the tree in the drive 2017-03-01 14:44:43 +01:00
ansuz
bd42a7d176 bump hyperjson bower dependency to new major version 2017-03-01 14:36:41 +01:00
yflory
412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security 2017-03-01 13:10:55 +01:00
yflory
11d54256da Make sure the display name is displayed in the same way everywhere 2017-03-01 13:10:06 +01:00
yflory
2c5c6da0d9 Fix XSS in alertify logs 2017-03-01 13:09:14 +01:00
yflory
5797aab3f2 Fix XSS with display names in the user list 2017-03-01 13:08:36 +01:00
yflory
26e3971482 Fix XSS in the user dropdown menu 2017-03-01 13:08:09 +01:00
ansuz
639376f1cb don't use hyperjson.toString 2017-03-01 12:36:10 +01:00
Pierre Bondoerffer
eb9a39eb68
Add hover on elements in drive and make grid slightly prettier 2017-02-28 23:15:47 +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
e2acf15ed8 Merge pull request #91 from pbondoer/staging
Spanish translation updated 🎉
2017-02-28 18:49:51 +01:00
Pierre Bondoerffer
f11b03c16e
Spanish translation updated 🎉 2017-02-28 18:47:58 +01:00
yflory
f130fd0598 Fix horizontal scrollbar in edge 2017-02-28 18:02:12 +01:00
yflory
345d2faab2 Fix horizontal scrollbar in Edge #3 2017-02-28 17:13:51 +01:00
yflory
d683dc499a Fix horizontal scrollbar in Edge #2 2017-02-28 17:03:23 +01:00
yflory
7a0a87bf6c Fix horizontal scrollbar in Edge 2017-02-28 16:38:51 +01:00
ansuz
3bf85b113c don't hide overflow, that causes worse problems 2017-02-28 16:37:34 +01:00
yflory
f06196c261 Remove the context menu buttons when removing selection 2017-02-28 15:48:49 +01:00
yflory
65202bd619 Fix french translation with the drive readme 2017-02-28 15:02:11 +01:00
yflory
c0278ba77f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 13:12:53 +01:00
yflory
efb7380a12 Fix default pad not created after registration 2017-02-28 13:12:27 +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
yflory
8007f51655 Update french translation 2017-02-28 12:01:32 +01:00
yflory
1c7561f37e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 11:51:23 +01:00
yflory
6967b67485 Update french translation suing new best practices 2017-02-28 11:51:18 +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
yflory
4f4075ed6e Make the settings app available to anonymous users 2017-02-28 11:23:50 +01:00
yflory
0224d6489b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 11:06:50 +01:00
ansuz
12aec60a12 hack around onSettle not doing its job 2017-02-28 11:05:59 +01:00
yflory
0ae7f94184 Remove the pointer and text underline on icon:hover in drive 2017-02-28 10:50:52 +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
yflory
ec7761eeb8 Make sure we don't use a wrong title for a new pad 2017-02-28 10:43:36 +01:00
yflory
8e7e1d336e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 10:39:53 +01:00
yflory
96f6b5755d Add the blog link in the header and footer 2017-02-28 10:39:48 +01:00