d2b3e078d5
updated version to resolve conflict
2018-02-22 13:05:00 +01:00
c409cac280
changed to AGPL-3.0-or-later
2018-02-22 13:03:53 +01:00
8c42125ea0
Merge branch 'soon'
2018-02-22 12:44:28 +01:00
7ff9bbe2b0
Fix share modal with new pads
2018-02-22 12:43:16 +01:00
a0ec51dde5
Fix share modal with new pads
2018-02-22 12:43:06 +01:00
480b499d7b
Hack to remove onbeforeunload popup
2018-02-22 10:16:33 +01:00
7ede2e1a07
Fix cursor position when editing a task in todo
2018-02-20 18:43:25 +01:00
c34161a988
Update oocell config
2018-02-20 18:36:00 +01:00
acf09c807d
Fix fonts
2018-02-20 16:09:49 +01:00
9ba912d953
Clean onlyoffice files
2018-02-20 15:47:07 +01:00
db71fe5bf8
Rename font files
2018-02-20 15:23:24 +01:00
d53ea25111
Merge branch 'soon'
2018-02-20 14:42:32 +01:00
5f50bedce2
Fix empty properties for readonly pads
2018-02-20 14:42:11 +01:00
15a8196037
Enable pad creation screen
2018-02-20 10:39:02 +01:00
70670f9732
Merge branch 'soon'
2018-02-20 10:24:03 +01:00
2eef1e96e6
Remove invalid error reports
2018-02-20 10:21:15 +01:00
75cb373136
Merge branch 'oo' of github.com:xwiki-labs/cryptpad into oo
2018-02-19 18:54:28 +01:00
7cb3282634
New apps for text, slide and spreadsheet
2018-02-19 18:52:57 +01:00
50ef40a862
Merge branch 'soon' into staging
2018-02-19 14:08:12 +01:00
766fa72841
Fix initial value of the preview link in the share modal
2018-02-19 14:07:21 +01:00
831c23b259
Merge branch 'staging' into oo
2018-02-19 12:11:58 +01:00
5d584625e4
FAQ pages
2018-02-19 12:11:45 +01:00
5c1e5a3f49
Merge branch 'staging' into oo
2018-02-19 12:11:06 +01:00
299a2f4c08
FAQ placeholder
2018-02-19 12:09:57 +01:00
1b7b53a164
Merge branch 'soon'
2018-02-19 11:39:55 +01:00
5dbc99343a
Improve 'rename' input in the drive
2018-02-19 11:38:57 +01:00
b04e3def64
Fix invalid translation key
2018-02-19 11:26:43 +01:00
c1a609e1d3
Merge branch 'soon'
2018-02-16 18:04:52 +01:00
c10e50b5bb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-02-16 18:04:27 +01:00
16447e0313
Stop expiration code if no directories for tasks
2018-02-16 17:28:22 +01:00
7cf8bdb841
Merge branch 'soon'
2018-02-16 17:08:38 +01:00
91437c558e
fix weird messages
2018-02-16 17:06:11 +01:00
4426631793
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-02-16 16:13:17 +01:00
11fabea327
update footer and package.json version
2018-02-16 16:13:01 +01:00
649fefad54
Send cookie when history keeper has changed
2018-02-16 15:25:53 +01:00
2ac9c3ba66
Report RPC errors when deleting owned pads
2018-02-16 12:33:33 +01:00
037a6ccc35
Fix INVALID_RESPONSE error in the file app
2018-02-16 12:02:20 +01:00
54a91f1153
Ability to reorder and edit tasks
2018-02-15 15:38:39 +01:00
70e014cdfc
Hide infinite spinner and disconnect modals when pad is deleted
2018-02-15 11:34:44 +01:00
ef0c08130d
Stop the process when expire-channels is done
2018-02-15 11:33:31 +01:00
f004c4d701
lint compliance
2018-02-14 19:42:00 +01:00
e83e589cf0
Kick from pad when an owned channel is deleted + whiteboard and poll
2018-02-14 19:41:07 +01:00
be0842c66d
add license to package.json
2018-02-14 15:47:17 +01:00
728a6a868d
Manage expired channels
2018-02-13 18:20:13 +01:00
8f7489576f
Merge pull request #228 from fvn-linagora/PR-logout-page
...
add a logout page
2018-02-12 16:33:07 +01:00
ac527c6411
add a logout page
...
allows destroying user session with a minimum number of loaded dependenciesi.
Can be Used for SSO forwards (logout).
Co-authored-by: Nicolas PARQUET <nparquet@linagora.com>
2018-02-12 15:38:51 +01:00
99b509b229
Merge pull request #227 from nparquet/fix-mainpages
...
Fixed customization of main pages
2018-02-12 10:36:25 +01:00
3b46578621
Fix main pages customization
...
Co-authored-by: fvn-linagora <fvignon@linagora.com>
2018-02-09 16:17:40 +01:00
223ed73ae1
French translation for the pad creation screen
2018-02-09 15:47:52 +01:00
3bb6d5a83c
Remove full history timeout
2018-02-09 15:47:29 +01:00
Sven Neuhaus