70b73206b7
Merge branch 'brandones-master' into soon
2017-01-13 10:33:38 +01:00
18bea1db23
Merge branch 'master' of https://github.com/brandones/cryptpad into brandones-master
2017-01-13 10:07:04 +01:00
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
2017-01-12 18:28:38 +01:00
516e25f0dc
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-01-12 17:58:29 +01:00
a8ba798203
Stop doing tests on pull requests because they're always going to fail
2017-01-12 17:58:12 +01:00
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
2017-01-12 17:05:16 +01:00
b5acdb8cc0
Disable zooming on mobile
2017-01-12 18:50:39 +03:00
40985f1811
Dubious height setting for iOS
2017-01-12 18:49:46 +03:00
52d8d8db1d
Get rid of margins on mobile
2017-01-12 18:49:46 +03:00
cd0931c951
UI improvements for mobile browsers
2017-01-12 18:49:46 +03:00
6352656737
Remove the default context menu in the entire drive
2017-01-12 15:55:35 +01:00
ed79b8870c
Merge branch 'master' into soon
2017-01-12 15:37:48 +01:00
605072cfbf
Fix empty title with new documents
2017-01-12 15:15:10 +01:00
4963c77b61
Fix the title reset bug
2017-01-12 14:29:40 +01:00
52d5821be0
Run the tests on all of the permanent branches
2017-01-12 12:09:16 +01:00
35a853ffff
Stop failing tests over missing translations because otherwise they'll almost never be passing.
2017-01-12 12:06:44 +01:00
512c1b12f4
Make the selenium test log the content of the /assert report to the console
2017-01-12 12:03:14 +01:00
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
51a2cfa141
Fix missing FontAwesome icon
2017-01-12 11:09:12 +01:00
994f6991c8
Merge branch 'master' into soon
2017-01-11 18:01:08 +01:00
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
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
9d0d8b27cf
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into brazil
2017-01-11 07:59:54 +01:00
33b8de888e
clean up unused files
2017-01-11 07:49:56 +01:00
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
26dd4ea11f
Fix lint errors
2017-01-10 15:33:21 +01:00
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
2017-01-10 15:04:02 +01:00
63b9d4e9fd
remove path for backwards compatibility
2017-01-10 10:54:08 +01:00
4cda1aeb2f
add docker and docker-compose
...
thanks @felixboehm
2017-01-10 10:36:12 +01:00
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
b39067d2a1
jshint compliance
2017-01-09 18:07:45 +01:00
74a12f50ac
only migrate keys which don't already exist
2017-01-09 17:35:58 +01:00
1c3f1a15cd
make sure that /pad is resized after loading
2017-01-09 17:02:01 +01:00
dba42a90c7
Fix the username button icon not aligned
2017-01-09 16:33:12 +01:00
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
0abec4ddb3
Fix error with placeholder translations in Safari
2017-01-09 11:50:45 +01:00
a3cd100c94
apply yflory's safari patch
2017-01-09 11:46:51 +01:00
0373556475
support old hashes in /poll
2017-01-09 11:46:21 +01:00
e8a87378aa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-01-09 11:02:32 +01:00
4902aebe77
open home page table links in new tabs
2017-01-09 11:01:29 +01:00
d5561910d4
Move the file manager into /drive and add a toolbar
2017-01-06 18:26:41 +01:00
6106f7d6ca
Make sure we never create the file store object twice
2017-01-06 14:14:13 +01:00
1e70af0c16
Use the same network for the apps and the file store
2017-01-06 13:52:53 +01:00
004d4a16fe
Fix error with placeholder translations in Safari
2017-01-06 13:52:30 +01:00
bf764d26e7
Merge branch 'staging' into workgroups
2017-01-06 11:17:17 +01:00
3836b20b08
enable the file store
2017-01-06 11:16:56 +01:00
b0d4dad417
Fix creation of a new file manager object
2017-01-05 18:43:00 +01:00
5a8f0df19e
Add support for reconnecting websocket
2017-01-05 18:42:18 +01:00
b33661d9d5
don't toggle maximization state after setting
2017-01-05 15:21:17 +01:00
yflory