Commit Graph

1373 Commits (02906b394578d6a4f0893812257a9dda14271f25)

Author SHA1 Message Date
yflory 02906b3945 Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar 2017-01-27 16:57:22 +01:00
yflory a4286f1c83 Merge branch 'soon' into newtoolbar 2017-01-27 16:52:49 +01:00
yflory 4aacd291b1 New config option to use an external websocket server 2017-01-27 16:45:41 +01:00
yflory 0e9e0e545f Load the new pad when the hash is changed 2017-01-27 14:57:45 +01:00
yflory e41cbb92d8 Use default FILES_DATA name if not provided 2017-01-26 16:52:23 +01:00
yflory fa1582f307 Replace 'filename' by 'title' in drive when there is no filename 2017-01-26 16:43:26 +01:00
Caleb James DeLisle 47b437614e Merge branch 'master' into soon 2017-01-26 16:34:07 +01:00
Caleb James DeLisle 4402ea9966 typo in config.dist 2017-01-26 16:34:00 +01:00
yflory c44f3a1044 Delete multiple elements could also remove unselected ones 2017-01-26 16:18:43 +01:00
yflory b79e1e48c7 Update colors in drive 2017-01-26 14:52:34 +01:00
yflory fb48484d2a Fix the rename feature in drive not working with tables 2017-01-26 14:51:59 +01:00
yflory 3f44444f41 Display the 'New' button in the trash 2017-01-26 13:19:40 +01:00
yflory 00efc96919 Move the toolbar and add a breadcrumb 2017-01-26 12:56:19 +01:00
yflory 283bde3435 Merge branch 'drivestyle' into newtoolbar 2017-01-25 18:35:52 +01:00
yflory 6f5ff07c2b Display the elements as a table instead of a list 2017-01-25 18:33:59 +01:00
yflory 95056315cf Move the folder icon style to the less file 2017-01-25 17:29:06 +01:00
yflory 7ad080b8a2 Move the folder icon style to the less file 2017-01-25 17:16:41 +01:00
yflory 8c7305bf1b Use less to write the drive stylesheet 2017-01-25 16:21:46 +01:00
yflory 11f0a9ae5f Revert the changes adding anonymous pads 2017-01-25 15:35:40 +01:00
yflory f42665ba49 Remove the unowned pads category 2017-01-25 14:27:06 +01:00
yflory cb85ad3fdf Merge branch 'newtoolbar' into ownedpads 2017-01-25 10:23:03 +01:00
yflory 373b07ed28 Fix lint errors 2017-01-25 10:21:31 +01:00
yflory 097f78d777 Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar 2017-01-25 10:01:49 +01:00
yflory 015e6fc262 Make sure we have the same hash in all the tabs when disconnecting 2017-01-24 18:17:23 +01:00
yflory 88021f2264 Anonymous pads fo anonymous users 2017-01-24 18:14:29 +01:00
yflory ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00
yflory 9d275daebb Backport changes for the login page from hpbs branch 2017-01-24 12:47:53 +01:00
yflory 69fb8b4d2f Merge branch 'master' into soon 2017-01-23 15:13:26 +01:00
yflory f8455875a9 Fix the NoScript (iframe not loaded) bug with inner iframes 2017-01-23 15:07:38 +01:00
yflory 82caa1aa8b Fix the Noscript bug 2017-01-23 12:30:07 +01:00
yflory 141f8f776a Fix the Noscript bug 2017-01-23 12:29:12 +01:00
yflory c77abfa7f4 Remove a second scrollbar in polls 2017-01-23 11:05:13 +01:00
yflory 5e36d9ea29 Fix polls table not updated with local events 2017-01-23 10:53:01 +01:00
yflory 99b8898e54 Apply new title when clicking on the page without pressing enter 2017-01-19 15:41:25 +01:00
yflory ea8667302c Display only a placeholder when the poll title is default 2017-01-19 15:35:38 +01:00
yflory 1e1bfd275c Don't show the tab notification when someone has joined the pad 2017-01-19 15:17:21 +01:00
yflory 5d5d03163e Add favicon and notifications in polls 2017-01-19 14:52:12 +01:00
yflory 3338000018 Add Esc and Arrow icons in the slide's present mode 2017-01-19 12:49:40 +01:00
yflory efdae19f0c Update the lists in the code and slide toolbars to use the new dropdown 2017-01-19 12:14:14 +01:00
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar 2017-01-18 11:00:46 +01:00
yflory a9063e0459 Reload all tabs when the user logs in or out 2017-01-16 14:08:44 +01:00
yflory efed1f5efe Add handlers to login and logout buttons 2017-01-13 17:39:41 +01:00
yflory 767ba8b549 Select what we want to display in the toolbar 2017-01-13 17:14:44 +01:00
yflory 2afdc11327 Replace the username button by a dropdown menu 2017-01-13 17:11:12 +01:00
yflory 4adde0f0c0 Use the new dropdown for userlist and share 2017-01-13 15:05:00 +01:00
yflory 70b73206b7 Merge branch 'brandones-master' into soon 2017-01-13 10:33:38 +01:00
yflory 18bea1db23 Merge branch 'master' of https://github.com/brandones/cryptpad into brandones-master 2017-01-13 10:07:04 +01:00
yflory efffd4974f Add createDropdown and createLanguageSelector in cryptpad-common 2017-01-12 18:28:38 +01:00
Caleb James DeLisle 516e25f0dc Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-01-12 17:58:29 +01:00
Caleb James DeLisle a8ba798203 Stop doing tests on pull requests because they're always going to fail 2017-01-12 17:58:12 +01:00