Commit Graph

33580 Commits

Author SHA1 Message Date
Hadi Nategh
e6735f635d W.I.P. migration of mainscreen to et2:
- Fix extra space added when save the entry
- Fix htmlarea not getting a right height when is in inactive tab
2018-10-30 12:02:55 +01:00
Hadi Nategh
c9c14fd4ae Merge remote-tracking branch 'origin/master' into admin_message_et2 2018-10-30 09:51:40 +01:00
nathangray
9742956c67 * Calendar - fix missing week numbers on multiweek view and wrong scrolling 2018-10-29 11:30:50 -06:00
nathangray
18625abce8 * Addressbook - move photo change flag from import into vcal so it's always set if needed 2018-10-29 11:07:35 -06:00
Hadi Nategh
631e554d56 W.I.P. migration of mainscreen to et2:
- Fix data not being loaded on initiation
2018-10-29 17:50:55 +01:00
Hadi Nategh
95268be609 Merge remote-tracking branch 'origin/master' into admin_message_et2 2018-10-29 15:20:04 +01:00
Hadi Nategh
8339ddd962 Complement part for the previous commit 2018-10-29 15:19:25 +01:00
Hadi Nategh
bd3a8c6fa7 Merge remote-tracking branch 'origin/master' into admin_message_et2 2018-10-29 15:15:35 +01:00
Hadi Nategh
9c08c4cee7 Fix et2_htmlarea disabled not working 2018-10-29 15:11:32 +01:00
Ralf Becker
0f80e158ff also set Error/Errno, if database is readonly 2018-10-28 09:29:25 +01:00
Hadi Nategh
c9ec548a53 W.I.P. migration of mainscreen to et2 2018-10-26 16:39:55 +02:00
Ralf Becker
bb369167e2 pending translations from our translation server 2018-10-26 16:20:45 +02:00
Ralf Becker
8c05d047ea * CardDAV/Addressbook: fix missing wrapping of notes field
by disabling all old special handling for vCard version 3.0
2018-10-25 21:04:34 +02:00
Hadi Nategh
9b993e5484 Revert unintentional commit 2018-10-25 18:23:36 +02:00
Hadi Nategh
16fe435de4 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Fix language setting
- Update TinyMCE
2018-10-25 18:18:47 +02:00
nathangray
78ddd31b71 * Calendar - fix recurring events were left out of merge from list 2018-10-25 10:09:46 -06:00
Hadi Nategh
e60d061183 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Fix selector fails when textarea id includes some specific chars
- Fix width and height
2018-10-25 16:16:39 +02:00
Hadi Nategh
b00b37efa8 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Fix image upload via old file_selector for etemplate apps
2018-10-25 15:31:41 +02:00
Hadi Nategh
39944322b5 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Replace fckEditor with tinymce for old etemplate apps
2018-10-25 12:32:18 +02:00
Hadi Nategh
b0891483cc W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Add language packages
2018-10-25 10:54:31 +02:00
nathangray
2fc4caec71 * Infolog - Exclude current entry from parent select/search results to avoid loop 2018-10-24 11:11:25 -06:00
Hadi Nategh
908ee59d1a W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Add missing icon
2018-10-24 14:59:31 +02:00
Hadi Nategh
7e25284816 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Add configurable toolbar as preference
- Do not load CkEditor until it's used
2018-10-24 14:48:19 +02:00
Hadi Nategh
9a331446c8 Merge remote-tracking branch 'origin/master' into htmlarea_tinymce 2018-10-23 17:11:12 +02:00
Hadi Nategh
44ef6a0a30 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Fix CKEditor widget
- Fix editor doesn't work if no imageUpload is set
2018-10-23 17:10:33 +02:00
Hadi Nategh
345c3c2611 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Add d-n-d image upload
2018-10-23 15:50:55 +02:00
Hadi Nategh
f62c5d8ea5 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Implement vfs file selector
- Add/remove more actions from toolbar
2018-10-23 13:04:20 +02:00
Hadi Nategh
987727f5fa W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Add code plugin in order to be able to edit html script
2018-10-23 10:28:13 +02:00
nathangray
d36d18a148 Calendar - In week view always display name of selected user if not self 2018-10-22 10:31:10 -06:00
nathangray
24b869d61a * Calendar - Add checkbox to turn on or off emptying calendar before iCal import 2018-10-22 09:25:28 -06:00
Hadi Nategh
236006b795 W.I.P. implementing TinyMCE editor and deprecating CKEditor:
- Keep editor toolbar in one line at least for mail compose
- Add a preference to enable/disable menubar at the top of editor
- Respects mode preference
2018-10-22 12:37:45 +02:00
Hadi Nategh
1cbd0aa2a3 W.I.P. implementing TinyMCE editor and deprecating CKEditor 2018-10-19 16:35:18 +02:00
Hadi Nategh
b39bcc8c36 Remove unintentional commited part from commit a9a303a 2018-10-19 14:59:20 +02:00
Ralf Becker
8ae20c34b9 fix PHP Warning: array_shift() expects parameter 1 to be array, null given 2018-10-19 13:55:23 +02:00
Ralf Becker
1d826e798a fix SQLSTATE[42000]: Syntax error or access violation in filemanager
caused by not correctly quoted empty string instead of id in extended ACL
2018-10-19 13:46:06 +02:00
Ralf Becker
83417962e9 release session to allow parallel requests to run 2018-10-19 11:48:53 +02:00
Ralf Becker
610f44559f fix PHP 7.2 Warning: Use of undefined constant in xet files: {$cont[nm][something]} --> {$cont['nm']['something']} 2018-10-19 09:46:54 +02:00
Ralf Becker
180c07e23c fix PHP Warning: A non-numeric value encountered 2018-10-19 09:46:30 +02:00
Ralf Becker
58169abad0 fix distro detection to use /etc/os-release to detect newer SUSE distros 2018-10-18 19:48:29 +02:00
Ralf Becker
9e99c8608c copy 17.1 changelog to master to satisfy update checker 2018-10-18 14:33:14 +00:00
Ralf Becker
5402b1171c fix / readjust patch 2018-10-18 14:34:57 +02:00
Ralf Becker
f9c3006805 7.3 seems not yet to be available in Travis 2018-10-18 11:28:56 +02:00
Ralf Becker
de1dacb7b4 trying to fix build problems with master and probably 7.3 2018-10-18 11:27:34 +02:00
Ralf Becker
960beebb81 fixing PHP 7.0 and adding 7.3 2018-10-18 11:23:16 +02:00
Ralf Becker
65f0891693 updating phpUnit versions
we previously used 6.3 for everything but PHP 5.6, now we (try) to use latest 6 for 7.0, and latest 7 for 7.1+ incl. master who errors with 6.3
2018-10-18 11:13:11 +02:00
Ralf Becker
adee0b4c52 fix warning about unknown option 'ro' by filesystem streamwrapper
it is handled by vfs, so ignoring it here
2018-10-18 11:13:04 +02:00
Hadi Nategh
730b2b7d51 * Mail: do not hierarchy delimiter inside folder names as it may break the folder structure 2018-10-17 18:02:36 +02:00
nathangray
9be59b55bf - Accept an extra array from ajax_create
- Filter extra array by db columns
2018-10-15 14:57:24 -06:00
nathangray
289e6079f7 Last / Next date
- Fix list title back to just date
- Link leads to actual recurrence for recurring events
2018-10-12 10:51:46 -06:00
Hadi Nategh
97eb04e75c Fix broken inline images because of wrong url 2018-10-12 16:58:38 +02:00