Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 767ba8b549 Select what we want to display in the toolbar yflory 2017-01-13 17:08:00 +01:00
• 2afdc11327 Replace the username button by a dropdown menu yflory 2017-01-13 16:42:30 +01:00
• 4adde0f0c0 Use the new dropdown for userlist and share yflory 2017-01-13 15:05:00 +01:00
• 70b73206b7 Merge branch 'brandones-master' into soon yflory 2017-01-13 10:33:38 +01:00
• 18bea1db23 Merge branch 'master' of https://github.com/brandones/cryptpad into brandones-master yflory 2017-01-13 10:07:04 +01:00
• efffd4974f Add createDropdown and createLanguageSelector in cryptpad-common yflory 2017-01-12 18:28:38 +01:00
• 516e25f0dc Merge branch 'master' of github.com:xwiki-labs/cryptpad Caleb James DeLisle 2017-01-12 17:58:29 +01:00
• a8ba798203 Stop doing tests on pull requests because they're always going to fail Caleb James DeLisle 2017-01-12 17:58:12 +01:00
• 29c8f0bbef Use a FontAwesome spinner to replace the old unaligned one yflory 2017-01-12 17:05:16 +01:00
• b5acdb8cc0 Disable zooming on mobile Brandon Istenes 2017-01-12 05:39:41 +03:00
• 40985f1811 Dubious height setting for iOS Brandon Istenes 2017-01-12 05:02:57 +03:00
• 52d8d8db1d Get rid of margins on mobile Brandon Istenes 2017-01-12 05:02:34 +03:00
• cd0931c951 UI improvements for mobile browsers Brandon Istenes 2017-01-12 04:09:36 +03:00
• 6352656737 Remove the default context menu in the entire drive yflory 2017-01-12 15:55:35 +01:00
• ed79b8870c Merge branch 'master' into soon yflory 2017-01-12 15:37:48 +01:00
• 605072cfbf Fix empty title with new documents yflory 2017-01-12 15:15:10 +01:00
• 4963c77b61 Fix the title reset bug yflory 2017-01-12 14:26:10 +01:00
• 52d5821be0 Run the tests on all of the permanent branches Caleb James DeLisle 2017-01-12 12:09:16 +01:00
• 35a853ffff Stop failing tests over missing translations because otherwise they'll almost never be passing. Caleb James DeLisle 2017-01-12 12:06:44 +01:00
• 512c1b12f4 Make the selenium test log the content of the /assert report to the console Caleb James DeLisle 2017-01-12 12:03:14 +01:00
• 3f1e287811 Fix an issue causing a user object to be turned into a pad yflory 2017-01-12 11:09:45 +01:00
• 51a2cfa141 Fix missing FontAwesome icon yflory 2017-01-12 11:09:12 +01:00
• 994f6991c8 Merge branch 'master' into soon Caleb James DeLisle 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 Caleb James DeLisle 2017-01-11 18:00:41 +01:00
• 569ea21705 Replace the language selector by our custom dropdown menu yflory 2017-01-11 10:46:22 +01:00
• 9d0d8b27cf Merge branch 'master' of github.com:gustavohmsilva/cryptpad into brazil ansuz 2017-01-11 07:59:54 +01:00
• 33b8de888e clean up unused files ansuz 2017-01-11 07:49:56 +01:00
• 5b1a45c510 Translation 100% polished. Gustavo H M Silva 2017-01-10 16:47:29 -02:00
• 26dd4ea11f Fix lint errors yflory 2017-01-10 15:33:21 +01:00
• 4278ac7637 Merge branch 'soon' into fileManager yflory 2017-01-10 15:07:48 +01:00
• 2be5db9540 Ability to open files in readonly mode yflory 2017-01-10 15:04:02 +01:00
• 63b9d4e9fd remove path for backwards compatibility ansuz 2017-01-10 10:53:09 +01:00
• 4cda1aeb2f add docker and docker-compose ansuz 2017-01-10 10:36:12 +01:00
• f74d0a46a4 Remove the alert when pressing del in 'all files' yflory 2017-01-09 18:38:05 +01:00
• b39067d2a1 jshint compliance ansuz 2017-01-09 18:07:45 +01:00
• 74a12f50ac only migrate keys which don't already exist ansuz 2017-01-09 17:35:58 +01:00
• 1c3f1a15cd make sure that /pad is resized after loading ansuz 2017-01-09 17:02:01 +01:00
• dba42a90c7 Fix the username button icon not aligned yflory 2017-01-09 16:33:12 +01:00
• 5b08fed7fa Ability to add files from the drive toolbar yflory 2017-01-09 16:17:04 +01:00
• 0abec4ddb3 Fix error with placeholder translations in Safari yflory 2017-01-06 13:52:30 +01:00
• a3cd100c94 apply yflory's safari patch ansuz 2017-01-09 11:46:51 +01:00
• 0373556475 support old hashes in /poll ansuz 2017-01-09 11:46:21 +01:00
• e8a87378aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-01-09 11:02:32 +01:00
• 4902aebe77 open home page table links in new tabs ansuz 2017-01-09 11:01:29 +01:00
• d5561910d4 Move the file manager into /drive and add a toolbar yflory 2017-01-06 18:26:41 +01:00
• 6106f7d6ca Make sure we never create the file store object twice yflory 2017-01-06 14:14:13 +01:00
• 1e70af0c16 Use the same network for the apps and the file store yflory 2017-01-06 13:52:53 +01:00
• 004d4a16fe Fix error with placeholder translations in Safari yflory 2017-01-06 13:52:30 +01:00
• bf764d26e7 Merge branch 'staging' into workgroups yflory 2017-01-06 11:17:17 +01:00
• 3836b20b08 enable the file store yflory 2017-01-06 11:16:56 +01:00
• b0d4dad417 Fix creation of a new file manager object yflory 2017-01-05 18:43:00 +01:00
• 5a8f0df19e Add support for reconnecting websocket yflory 2017-01-05 18:42:18 +01:00
• b33661d9d5 don't toggle maximization state after setting ansuz 2017-01-05 15:21:17 +01:00
• 7868a65da9 apply style patches to the correct elements ansuz 2017-01-05 15:06:08 +01:00
• 5c967ed09e apply live fixes to the codebase ansuz 2017-01-05 14:45:31 +01:00
• bd6f2c037e assign the cors iframe an id ansuz 2017-01-05 14:27:40 +01:00
• e56cc49f79 catch errors that popped up because of a cross-origin iframe ansuz 2017-01-05 14:14:26 +01:00
• 5080751a90 hide unnecessary scrollbar ansuz 2017-01-05 10:58:10 +01:00
• 95617a11c8 fix broken paths in old poll ansuz 2017-01-05 10:57:13 +01:00
• 7a0442afe0 Drag and drop files into a workgroup yflory 2017-01-04 18:24:20 +01:00
• 5a90d20cff open pads in a new tab ansuz 2017-01-04 16:41:47 +01:00
• c380ecfcd9 add the slogan which was accidentally dropped ansuz 2017-01-04 16:35:32 +01:00
• 05a956879a prepare new poll app for release ansuz 2017-01-04 15:48:50 +01:00
• 6c4e070c82 update information pages ansuz 2017-01-03 15:25:41 +01:00
• 7b87213ec3 extract more constants into less variables ansuz 2017-01-03 12:19:07 +01:00
• 27d5559b0c define and use flags to enable the home page table ansuz 2017-01-03 12:17:17 +01:00
• 5cd714b18a configure filestore usage via customize/application_config.js ansuz 2017-01-03 12:10:11 +01:00
• 4b1f9fd4f1 Revert "yank dead code" ansuz 2017-01-03 11:49:44 +01:00
• aad442cb20 yank dead code ansuz 2017-01-02 16:03:50 +01:00
• 2b5085625c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-01-02 15:43:06 +01:00
• 69b1764c9d Missing entries in the context menu with users yflory 2017-01-02 15:42:29 +01:00
• 7c0df5aed9 use wss if useSecureWebsockets is true felixboehm 2017-01-02 11:54:50 +01:00
• f01c3725af move minor links to the bottom of the home page ansuz 2016-12-30 15:56:24 +01:00
• 9b650362b9 rebuild css ansuz 2016-12-30 15:33:59 +01:00
• d843caeb9a remove bottom bar and move language selector to main html ansuz 2016-12-30 15:33:28 +01:00
• c6499d6789 make panel styles reusable ansuz 2016-12-30 15:30:35 +01:00
• 773209472e break monolithic style file into several modules ansuz 2016-12-30 15:05:16 +01:00
• 34967ac354 encapsulate rendering functions so we can pass in cryptpad-common ansuz 2016-12-30 13:27:01 +01:00
• 66b8c93205 remember time of first visit ansuz 2016-12-30 13:23:09 +01:00
• ba4df1a22c create examples directory with old prototypes ansuz 2016-12-30 13:22:01 +01:00
• 0abf45bdc5 better fsStore debugging ansuz 2016-12-30 12:27:11 +01:00
• d8c18d0937 adding docker and docker-compose felixboehm 2016-12-29 22:02:03 +01:00
• e3f79f914a fix user hash ansuz 2016-12-29 18:12:30 +01:00
• d232a5a83e Revert "simplify key generation and remember user's additional keys" ansuz 2016-12-29 17:51:58 +01:00
• fefe444501 add new translation keys ansuz 2016-12-29 17:11:30 +01:00
• 91a806ab86 focus on OK button when we pop an alert ansuz 2016-12-29 17:10:59 +01:00
• 850bd42149 don't try to display things that don't exist ansuz 2016-12-29 17:05:28 +01:00
• 75786ff9ff simplify key generation and remember user's additional keys ansuz 2016-12-29 17:04:48 +01:00
• 621476424d make strings translatable and refocus on correct input ansuz 2016-12-29 17:04:01 +01:00
• a97696c712 show user's display name and account name ansuz 2016-12-29 17:03:17 +01:00
• 0c9178ba46 update slide styles, comment alertify styles, updated compiled css ansuz 2016-12-28 17:33:46 +01:00
• ec92640974 ignore scratch directory ansuz 2016-12-28 17:24:40 +01:00
• 3560f0580f commit prototype upload script ansuz 2016-12-28 17:23:57 +01:00
• d7bdb30969 don't compile alertify.css directly ansuz 2016-12-28 17:20:29 +01:00
• 2f9f3d921a trim excess whitespace from usernames ansuz 2016-12-28 17:13:41 +01:00
• 89e5830409 make alertify display time configurable ansuz 2016-12-28 17:13:00 +01:00
• 32d7fc55d2 make it easier to add pages at the document root ansuz 2016-12-28 17:11:06 +01:00
• 8b9d7f2357 update built html ansuz 2016-12-28 17:10:38 +01:00
• 6a46d6e06c update page layout and account for about page ansuz 2016-12-28 17:09:02 +01:00
• 49d80d91d9 don't load customize/pad.js anymore ansuz 2016-12-28 15:53:27 +01:00