Commit graph

1776 commits

Author SHA1 Message Date
yflory
c1402fbb0a Lint error 2017-06-09 15:56:18 +02:00
yflory
9694272083 Fix html code not parsed 2017-06-09 14:42:55 +02:00
yflory
df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2017-06-09 14:36:38 +02:00
yflory
6a96aa6819 Disconnect the network when migrating the drive in another tab 2017-06-09 14:36:35 +02:00
ansuz
2f851ab97e fix lint errors 2017-06-07 10:13:51 +02:00
ansuz
d25477e8c6 don't let tooltips interfere with DOM interaction 2017-06-06 18:08:23 +02:00
yflory
811d031ffd Fix the 'File' entry in the drive 'New' menu 2017-06-06 12:09:55 +02:00
yflory
5641a4a839 Add the file app in the 'new' dropdown menus 2017-06-06 11:52:47 +02:00
yflory
ac91d2f413 Fix the upgrade and donate buttons in the home page 2017-06-06 11:37:54 +02:00
yflory
ee57458158 Remove the pin limit alert 2017-06-06 10:49:32 +02:00
ansuz
f43132a63b bump version in footer and package.json 2017-06-06 10:01:07 +02:00
ansuz
ec9a4dec5e Merge branch 'soon' into staging 2017-06-05 11:43:26 +02:00
ansuz
77d4ffba86 animate preview mode sidebar 2017-06-02 17:39:45 +02:00
ansuz
65233c2464 remove unused variable 2017-06-02 16:16:17 +02:00
ansuz
767793b5ca fix stuck loading tip 2017-06-02 12:13:11 +02:00
ansuz
8f7aaecc1c cache some selectors and decrease memory demands 2017-06-02 11:45:54 +02:00
ansuz
f631973f1f optimize file upload 2017-06-01 18:16:02 +02:00
ansuz
55af84cc90 lower spinner timeout interval 2017-06-01 14:27:06 +02:00
ansuz
c65ca5cfc6 restore deleted line and add missing semicolon 2017-06-01 10:35:42 +02:00
ansuz
8bd9ad8847 add automated registration test 2017-06-01 10:23:50 +02:00
ansuz
07279c8dc7 export boolean Test.testing 2017-06-01 10:23:24 +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
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
ansuz
5e57578fa9 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-31 18:44:55 +02:00
ansuz
30f66ab7ba hotfix 'undefined/' bug 2017-05-31 18:44:44 +02:00
ansuz
7b94106bac fix inverted conditional :/ 2017-05-31 18:15:31 +02:00
ansuz
2e03485db4 remove known bad entries from localStorage.userHash... 2017-05-31 18:12:58 +02:00
ansuz
936bf8df9d return falsey if userHash is junk 2017-05-31 18:08:41 +02:00
ansuz
105e5cdac9 fix 'undefined/' userHash 2017-05-31 18:01:12 +02:00
ansuz
401e908963 use media-tag with xhr error handling 2017-05-31 17:17:01 +02:00
ansuz
3465710237 Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag 2017-05-31 12:55:05 +02:00
Daniel RADEAU
8ab9248a78 Fix ES6 2017-05-31 12:42:37 +02:00
Daniel RADEAU
21c39572be Update media-tag and fix bower dependencies 2017-05-31 11:53:25 +02:00
ansuz
daf112a5b5 take api settings into account for upgrade button 2017-05-30 20:11:15 +02:00
ansuz
ebfa228bc0 add upgrade button to all static pages 2017-05-30 18:39:41 +02:00
ansuz
149568689a color donate button green 2017-05-30 17:58:31 +02:00
ansuz
ec6ad6772b send feedback on donation 2017-05-30 17:25:36 +02:00
Daniel RADEAU
cb2efe138b Media Tag integration, image, audio, video, pdf 2017-05-30 16:36:06 +02:00
ansuz
76c530037b enable donate button in all apps 2017-05-30 15:51:07 +02:00
ansuz
9ca5bc507e add support for donate button 2017-05-30 15:42:53 +02:00
ansuz
a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-30 10:46:17 +02:00
ansuz
99a44f119f don't send referrer headers on pads which may link outward 2017-05-30 10:44:40 +02:00
ansuz
92a7970eb8 fix merge conflicts 2017-05-29 19:04:47 +02:00
ansuz
1240b864ef fix misconfigured history 2017-05-29 17:25:06 +02:00
Pierre Bondoerffer
f434f002c4
poll: make locks clickable 2017-05-29 16:32:40 +02:00
ansuz
3915b30055 provide a register button on login
also direct users from file to login
2017-05-29 13:11:07 +02:00