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
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
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
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
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
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
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
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
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
4902aebe77
open home page table links in new tabs
2017-01-09 11:01:29 +01:00
b33661d9d5
don't toggle maximization state after setting
2017-01-05 15:21:17 +01:00
7868a65da9
apply style patches to the correct elements
2017-01-05 15:06:08 +01:00
5c967ed09e
apply live fixes to the codebase
2017-01-05 14:45:31 +01:00
bd6f2c037e
assign the cors iframe an id
2017-01-05 14:27:40 +01:00
e56cc49f79
catch errors that popped up because of a cross-origin iframe
2017-01-05 14:14:26 +01:00
5080751a90
hide unnecessary scrollbar
2017-01-05 10:58:10 +01:00
95617a11c8
fix broken paths in old poll
2017-01-05 10:57:13 +01:00
5a90d20cff
open pads in a new tab
2017-01-04 16:41:47 +01:00
c380ecfcd9
add the slogan which was accidentally dropped
2017-01-04 16:35:32 +01:00
05a956879a
prepare new poll app for release
...
move old poll into poll/old
2017-01-04 15:48:50 +01:00
6c4e070c82
update information pages
2017-01-03 15:25:41 +01:00
7b87213ec3
extract more constants into less variables
2017-01-03 12:19:07 +01:00
27d5559b0c
define and use flags to enable the home page table
2017-01-03 12:17:17 +01:00
5cd714b18a
configure filestore usage via customize/application_config.js
2017-01-03 12:10:11 +01:00
4b1f9fd4f1
Revert "yank dead code"
...
This reverts commit aad442cb20
2017-01-03 11:49:44 +01:00
aad442cb20
yank dead code
2017-01-02 16:03:50 +01:00
2b5085625c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-01-02 15:43:06 +01:00
69b1764c9d
Missing entries in the context menu with users
2017-01-02 15:42:29 +01:00
7c0df5aed9
use wss if useSecureWebsockets is true
...
There are no certs / httpOtps set if proxy doing ssl offloading.
Better use useSecureWebsockets from config file.
2017-01-02 11:54:50 +01:00
f01c3725af
move minor links to the bottom of the home page
2016-12-30 15:56:24 +01:00
9b650362b9
rebuild css
2016-12-30 15:33:59 +01:00
d843caeb9a
remove bottom bar and move language selector to main html
2016-12-30 15:33:28 +01:00
yflory