Commit graph

2240 commits

Author SHA1 Message Date
Georg Ehrke
469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bart Visscher
e1b9b65e41 Use correct appid for lostpassword email preference 2011-12-18 23:10:43 +01:00
Bart Visscher
d5e9c7d572 Gallery: fix calculation of folder thumbnail selection 2011-12-18 23:10:43 +01:00
Bart Visscher
fbad1da9e2 Contacts: check if PREF parameter is set before useing it 2011-12-18 23:10:43 +01:00
Bart Visscher
dff9585f64 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Bart Visscher
ff346ad135 Calendar: small for loop fix 2011-12-18 23:10:43 +01:00
Bart Visscher
4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Robin Appelman
3d1accab70 add licence file for sabredav 2011-12-18 03:45:13 +01:00
Michael Gapczynski
9e50cecf27 Fix shared status for files inside a shared folder 2011-12-17 21:13:54 -05:00
Georg Ehrke
f6ed7a19be Merge branch 'master' into calendar 2011-12-16 21:21:34 +01:00
Robin Appelman
dc641943d9 fix some display issues for readonly folders 2011-12-16 17:39:15 +01:00
Robin Appelman
65214bed0c make the sharing app return the corrrect result for is_writable on the shared folder 2011-12-16 17:31:31 +01:00
Robin Appelman
a862fec9a3 make remember login token also dependent on password to protect against some brute force attacks on this token 2011-12-14 13:26:34 +01:00
Georg Ehrke
1ab0adec46 Merge branch 'master' into calendar 2011-12-12 14:21:51 +01:00
Robin Appelman
5e711f37ca make filesize parsing case insensitive 2011-12-11 23:34:27 +01:00
Robin Appelman
9c6d3a83fd also update the data attribute holding the quota 2011-12-11 23:34:20 +01:00
Robin Appelman
ccd9b56609 after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
this way the user can see when an invalid input is given
2011-12-11 23:34:13 +01:00
Georg Ehrke
56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke
33caa64cce check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs 2011-12-10 15:11:41 +01:00
Georg Ehrke
b7c754cb32 Merge branch 'master' into calendar 2011-12-10 15:03:33 +01:00
Bart Visscher
1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher
a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Bart Visscher
2e951c0ce5 Gallary: Fix alignment of album thumbnails 2011-12-09 21:44:13 +01:00
Georg Ehrke
ac8177d83e Merge branch 'master' into calendar 2011-12-09 14:45:41 +01:00
Georg Ehrke
bd68cee8cf add resettimezone file for testing timezone detection 2011-12-09 14:36:43 +01:00
Georg Ehrke
add48b2657 optimize timezone detection 2011-12-09 14:35:59 +01:00
Bart Visscher
eeaf539a44 Gallery: splitout model code 2011-12-08 20:05:12 +01:00
Georg Ehrke
2103c331a0 Merge branch 'master' into calendar 2011-12-08 14:03:14 +01:00
Michiel de Jong
d4546cdf37 bump version number to force db rebuild 2011-12-08 17:19:38 +07:00
Bart Visscher
9ba59aee36 Sort apps on name and enabled status 2011-12-07 20:41:00 +01:00
Bart Visscher
0342b5fc43 Fix filename of log icon 2011-12-07 20:41:00 +01:00
Bart Visscher
a389d94e2b Imageviewer: fix fancybox.png image url in fancybox css 2011-12-07 20:41:00 +01:00
Bart Visscher
546b7279a3 Contacts: Add "Preferred" before phone label for preferred numbers 2011-12-07 20:40:59 +01:00
Bart Visscher
1220edd4df Contacts: Add direct link to details of a contact 2011-12-07 20:40:59 +01:00
Bart Visscher
36abf22a48 Contacts: Fix postname var spelling 2011-12-07 20:40:59 +01:00
Bart Visscher
7e990a8e5c Contacts: refactor common ajax functions to OC_Contacts_App 2011-12-07 20:40:59 +01:00
Bart Visscher
247146f703 Contacts: refactor rendering of part.details template 2011-12-07 20:40:58 +01:00
Bart Visscher
c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Michiel de Jong
b9e6f5e42d compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage 2011-12-07 21:51:47 +07:00
Robin Appelman
a0548a416a Don't trigger file action when renaming, stupid fix for stupid firefox behaviour 2011-12-05 23:52:14 +01:00
Georg Ehrke
361d4ac13b fix merge conflicts 2011-12-03 17:25:17 +01:00
Bart Visscher
31846141b0 Contacts: make name editable again 2011-12-02 21:24:48 +01:00
Bart Visscher
0bbeb13e26 Calendar: Also check if the enddate is in the requested range for events 2011-11-30 21:13:26 +01:00
Bart Visscher
e5fdc6013a Calendar: Use the default timezone that is set in lib/base.php 2011-11-30 21:13:04 +01:00
Bart Visscher
2d391298fb Contacts: Allow '/' in property name
Kaddressbook uses this in the messaging property. This is allowed in Version 2 of the vcard specification. Version 3 of the specification doesn't allow this any more but be lenient in what we accept.
2011-11-30 20:58:27 +01:00
Brice Maron
1d312cf070 Correct ldap check in dependencies_chk app 2011-11-25 23:43:24 +01:00
Bart Visscher
53ff85e2ad Contacts: layout updates 2011-11-24 21:36:35 +01:00
Bart Visscher
6ce6cbf489 Contacts: better label for saving a property 2011-11-24 21:36:35 +01:00
Bart Visscher
9701145f83 Contacts: make type of phone property also multiselect in addproperty 2011-11-24 21:36:34 +01:00
Bart Visscher
43911d9a6f Template: output better html for select options 2011-11-24 21:36:34 +01:00