Commit graph

1362 commits

Author SHA1 Message Date
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
yflory
3f1e287811 Fix an issue causing a user object to be turned into a pad 2017-01-12 11:09:45 +01:00
yflory
51a2cfa141 Fix missing FontAwesome icon 2017-01-12 11:09:12 +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
yflory
569ea21705 Replace the language selector by our custom dropdown menu 2017-01-11 10:59:09 +01:00
ansuz
9d0d8b27cf Merge branch 'master' of github.com:gustavohmsilva/cryptpad into brazil 2017-01-11 07:59:54 +01:00
ansuz
33b8de888e clean up unused files 2017-01-11 07:49:56 +01:00
Gustavo H M Silva
5b1a45c510 Translation 100% polished.
I've corrected errors, replaced sentences to better translations and other small things. This version can be considered the final one.

Please notify me if new translation tokens gets added to the website, so I can keep the translation up to date.
2017-01-10 16:47:29 -02:00
yflory
26dd4ea11f Fix lint errors 2017-01-10 15:33:21 +01:00
yflory
4278ac7637 Merge branch 'soon' into fileManager 2017-01-10 15:07:48 +01:00
yflory
2be5db9540 Ability to open files in readonly mode
Fix CSS issues
2017-01-10 15:04:02 +01:00
ansuz
63b9d4e9fd remove path for backwards compatibility 2017-01-10 10:54:08 +01:00
ansuz
4cda1aeb2f add docker and docker-compose
thanks @felixboehm
2017-01-10 10:36:12 +01:00
yflory
f74d0a46a4 Remove the alert when pressing del in 'all files' 2017-01-09 18:38:05 +01:00
ansuz
b39067d2a1 jshint compliance 2017-01-09 18:07:45 +01:00
ansuz
74a12f50ac only migrate keys which don't already exist 2017-01-09 17:35:58 +01:00
ansuz
1c3f1a15cd make sure that /pad is resized after loading 2017-01-09 17:02:01 +01:00
yflory
dba42a90c7 Fix the username button icon not aligned 2017-01-09 16:33:12 +01:00
yflory
5b08fed7fa Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
yflory
0abec4ddb3 Fix error with placeholder translations in Safari 2017-01-09 11:50:45 +01:00
ansuz
a3cd100c94 apply yflory's safari patch 2017-01-09 11:46:51 +01:00
ansuz
0373556475 support old hashes in /poll 2017-01-09 11:46:21 +01:00
ansuz
4902aebe77 open home page table links in new tabs 2017-01-09 11:01:29 +01:00
yflory
d5561910d4 Move the file manager into /drive and add a toolbar 2017-01-06 18:26:41 +01:00
yflory
6106f7d6ca Make sure we never create the file store object twice 2017-01-06 14:14:13 +01:00
yflory
1e70af0c16 Use the same network for the apps and the file store 2017-01-06 13:52:53 +01:00
yflory
004d4a16fe Fix error with placeholder translations in Safari 2017-01-06 13:52:30 +01:00
yflory
bf764d26e7 Merge branch 'staging' into workgroups 2017-01-06 11:17:17 +01:00
yflory
3836b20b08 enable the file store 2017-01-06 11:16:56 +01:00
yflory
b0d4dad417 Fix creation of a new file manager object 2017-01-05 18:43:00 +01:00
yflory
5a8f0df19e Add support for reconnecting websocket 2017-01-05 18:42:18 +01:00
ansuz
b33661d9d5 don't toggle maximization state after setting 2017-01-05 15:21:17 +01:00
ansuz
7868a65da9 apply style patches to the correct elements 2017-01-05 15:06:08 +01:00
ansuz
5c967ed09e apply live fixes to the codebase 2017-01-05 14:45:31 +01:00
ansuz
bd6f2c037e assign the cors iframe an id 2017-01-05 14:27:40 +01:00
ansuz
e56cc49f79 catch errors that popped up because of a cross-origin iframe 2017-01-05 14:14:26 +01:00
ansuz
5080751a90 hide unnecessary scrollbar 2017-01-05 10:58:10 +01:00
ansuz
95617a11c8 fix broken paths in old poll 2017-01-05 10:57:13 +01:00
yflory
7a0442afe0 Drag and drop files into a workgroup 2017-01-04 18:24:20 +01:00
ansuz
5a90d20cff open pads in a new tab 2017-01-04 16:41:47 +01:00
ansuz
c380ecfcd9 add the slogan which was accidentally dropped 2017-01-04 16:35:32 +01:00
ansuz
05a956879a prepare new poll app for release
move old poll into poll/old
2017-01-04 15:48:50 +01:00
ansuz
6c4e070c82 update information pages 2017-01-03 15:25:41 +01:00
ansuz
7b87213ec3 extract more constants into less variables 2017-01-03 12:19:07 +01:00
ansuz
27d5559b0c define and use flags to enable the home page table 2017-01-03 12:17:17 +01:00
ansuz
5cd714b18a configure filestore usage via customize/application_config.js 2017-01-03 12:10:11 +01:00
ansuz
4b1f9fd4f1 Revert "yank dead code"
This reverts commit aad442cb20.
2017-01-03 11:49:44 +01:00
ansuz
aad442cb20 yank dead code 2017-01-02 16:03:50 +01:00
ansuz
2b5085625c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-02 15:43:06 +01:00