wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3256 commits 157 branches 562 tags 714 MiB
Commit graph

1471 commits

Author SHA1 Message Date
Thomas Tanghus
102cf150b3 Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA 2012-03-26 02:04:34 +02:00
Georg Ehrke
19c101a660 fix merge conflicts 2012-03-25 14:02:02 +02:00
Michael Gapczynski
34c08b3165 Add test for Google Docs storage backend, tester needs to token and token secret to config 2012-03-24 15:46:28 -04:00
Michael Gapczynski
d139e3c3cd Move Google Docs storage backend to files_remote app 2012-03-24 15:28:05 -04:00
Bartek Przybylski
c23090b43c spaces to tabs in bookmarks 2012-03-24 19:55:44 +01:00
Bartek Przybylski
a3125f164e bookmarks tag placement & list width fix 2012-03-24 19:55:43 +01:00
Bartek Przybylski
826cb2c650 fix sharing address construction in opera and firefox 2012-03-24 19:26:53 +01:00
Bartek Przybylski
be60b451eb fix albums thumbnails preview for opera 2012-03-24 19:21:36 +01:00
Bartek Przybylski
afcf965498 fixup: sharing gallery for loggedin users fail 2012-03-24 18:40:27 +01:00
Bartek Przybylski
cbdcb68c2b gallery sharing, experimental version 2012-03-24 18:35:42 +01:00
Robin Appelman
e0cbefc727 webdav storage backend 2012-03-23 18:55:26 +01:00
Georg Ehrke
0e11cc9f6f fix previous made bug and fix oc bug - oc-139 2012-03-23 17:27:52 +01:00
Georg Ehrke
ac8362e34a check if the title of an event is null - bugfix for oc-139 2012-03-23 17:09:51 +01:00
Georg Ehrke
b63b377c4d Bookmarks: make link text click clickable too - bugfix for oc-131 2012-03-23 16:58:48 +01:00
Georg Ehrke
45b320d674 use unnamed as title for a bookmark if no title was entered and curl fails 2012-03-23 16:54:15 +01:00
Georg Ehrke
37963fee28 Merge branch 'master' into calendar_sharing 2012-03-22 20:40:20 +01:00
Robin Appelman
82b54938e3 ftp storage backend 2012-03-22 19:56:19 +01:00
Georg Ehrke
5b03de9a66 fix comments in crypt lib 2012-03-21 17:43:09 +01:00
Georg Ehrke
61166c1002 Merge branch 'master' into calendar_sharing 2012-03-21 09:43:29 +01:00
Georg Ehrke
19bbb61b20 fix spelling fail in texteditor's style.css 2012-03-20 19:48:08 +01:00
Georg Ehrke
194211500b register text/x-vcard as a fileaction for vcard import 2012-03-19 09:58:44 +01:00
Georg Ehrke
ddb7197c9c Merge branch 'master' into calendar_sharing 2012-03-18 00:53:02 +01:00
Bartek Przybylski
de09883d86 creating and retrive thumbnails for intermediate galleries 2012-03-17 23:41:10 +01:00
Georg Ehrke
eaa1074ccb Merge branch 'master' into calendar_sharing 2012-03-17 13:59:00 +01:00
Tom Needham
122f7e4c2f Dont truncate the time format 2012-03-17 12:41:16 +00:00
Bartek Przybylski
8e22823501 bredcrumb fix 2012-03-17 13:30:45 +01:00
Georg Ehrke
27218f85cb Merge branch 'master' into calendar_sharing 2012-03-16 12:17:58 +01:00
Bartek Przybylski
0fadbee699 fix adding photo to incorrect gallery 2012-03-15 00:09:06 +01:00
Bartek Przybylski
193e93e4a9 creating intermediate galleries 2012-03-14 22:28:55 +01:00
Thomas Tanghus
4a91c6dbed Make PHOTO deletable. 2012-03-13 14:56:03 +01:00
Thomas Tanghus
9e83f0247f Added sync path for iOS/OS X. 2012-03-13 14:28:38 +01:00
Thomas Tanghus
6b01d7be9a Fixed NOTE property UI. 2012-03-13 02:55:17 +01:00
Thomas Tanghus
dd0daa6e33 Cleanup in Contacts. 2012-03-13 00:55:15 +01:00
Thomas Tanghus
551b4443e1 Force load profile pic after edit hack. 2012-03-12 21:56:28 +01:00
Thomas Tanghus
60fe9dda5d Remember categories when they have changed. 2012-03-12 21:55:54 +01:00
Thomas Tanghus
3efa5f17f2 Rename... 2012-03-12 16:47:29 +01:00
Thomas Tanghus
c55d2af6b3 More modifications for using jquery.multiple_autocomplete. 2012-03-12 16:44:16 +01:00
Thomas Tanghus
2b8125f4ba Small fix to jquery.multiple_autocomplete. 2012-03-12 15:30:52 +01:00
Thomas Tanghus
d36d317bb2 Contacts: Modifications for using categories. 2012-03-12 14:13:03 +01:00
Bartek Przybylski
618f92b3fb fix thumbnail generation 2012-03-11 20:00:50 +01:00
Bartek Przybylski
d5959872e1 disabling file handlers in gallery for now 2012-03-11 19:17:51 +01:00
Bartek Przybylski
4b8ff4d910 media scanner fix 2012-03-11 17:29:21 +01:00
Bartek Przybylski
f6075cc1fe gallery migration to events system 2012-03-11 16:49:42 +01:00
Tom Needham
92221e98de spaces to tabs 2012-03-11 12:03:41 +00:00
Tom Needham
dc3dd272f7 Text editor will now wrap text based on window size 2012-03-10 14:32:57 +00:00
Tom Needham
1aaf008020 fix character encoding bug oc-278 2012-03-10 14:06:30 +00:00
Tom Needham
3f507898d0 update file extensions in editor 2012-03-10 14:00:57 +00:00
Bartek Przybylski
84d6c53970 filecache search comparition fix 2012-03-09 16:28:26 +01:00
Thomas Tanghus
2582fe1c89 Yet a missing file :-P 2012-03-09 13:56:20 +01:00
Thomas Tanghus
98bf8cfeb6 Added missing template. 2012-03-09 12:11:52 +01:00
Thomas Tanghus
2cbd281637 Merge branch 'vcategories' 2012-03-09 10:29:58 +01:00
Thomas Tanghus
8228a554a4 Temporarily disabled multi_autoselect. 2012-03-09 10:29:00 +01:00
Thomas Tanghus
bc5d9f5868 Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-) 2012-03-09 07:39:35 +01:00
Thomas Tanghus
8495e1a63e Add missing file. 2012-03-09 07:39:35 +01:00
Robin Appelman
700a120c22 fix write hook for gallery 2012-03-08 15:47:49 +01:00
Thomas Tanghus
a33a62bf60 Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php
 2012-03-08 02:55:48 +01:00
Thomas Tanghus
ae7aab2d6e Merge gitorious.org:owncloud/owncloud into vcategories 
Conflicts:
	apps/contacts/ajax/saveproperty.php
	apps/contacts/lib/vcard.php
 2012-03-07 23:38:44 +01:00
Thomas Tanghus
91d85e9b16 Use OC.dialogs. 2012-03-07 22:57:37 +01:00
Bart Visscher
340320625e Contacts: Add UI for categories 2012-03-07 21:50:55 +01:00
Bart Visscher
9908adb320 Merge branch 'master' into vcategories 
Conflicts:
	apps/contacts/lib/vcard.php
 2012-03-07 21:49:46 +01:00
Bart Visscher
d8cfe77ba5 Contacts: small fixes and cleanups 2012-03-07 21:46:42 +01:00
Bart Visscher
9599548203 Contacts: change card parameter type of VCard::edit and VCard::add 
changed to OC_VObject
 2012-03-07 21:46:42 +01:00
Bart Visscher
97ab706a6a Contacts: No random token for contactphoto 2012-03-07 21:46:42 +01:00
Bart Visscher
46aa011ef9 Contacts: Add Organisation as Name property choice 2012-03-07 21:46:41 +01:00
Bart Visscher
9ccf46d350 Contacts: convert class attribute selectors to class selectors 2012-03-07 21:46:41 +01:00
Thomas Tanghus
57c4d39b1e Fix conflict. 2012-03-07 20:57:05 +01:00
Robin Appelman
cf5d63f0ab some js cleanup for gallary 
also tabs no spaces
 2012-03-07 18:58:10 +01:00
Robin Appelman
d8d2939668 dont use numRows and fix some of the gallary hooks 2012-03-07 17:31:01 +01:00
Thomas Tanghus
75323b86d1 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Robin Appelman
1d88ab57ec dont open the album when clicking the remove/rename button 2012-03-07 16:28:57 +01:00
Robin Appelman
41817db2e2 no rounded borders for album decoration 2012-03-07 16:27:51 +01:00
Robin Appelman
a4543175ce make gallary work with archives 2012-03-07 16:24:49 +01:00
rok
fb88bdba69 Ability to save an arbitrary number of external sites 2012-03-07 14:59:19 +01:00
Bartek Przybylski
0a78849391 multilevel gallery 2012-03-04 18:28:41 +01:00
Georg Ehrke
c40668e3a9 Merge branch 'master' into calendar_sharing 2012-03-04 10:10:19 +01:00
Bartek Przybylski
c411826fe5 moving gallery op to one file, migrate gallery dialogs to oc dialogs 2012-03-04 00:35:37 +01:00
Robin Appelman
af214d9dcd change gallary scanning to support gallaries inside archives 2012-03-03 22:04:34 +01:00
Robin Appelman
a5df3f8ea7 allow transparent opening of zip files from the web interface 2012-03-03 21:23:35 +01:00
Georg Ehrke
f2dcab50b5 fix merge conflicts 2012-03-03 15:06:51 +01:00
Georg Ehrke
4c45483ad3 make calendar compatible with php 5.2 - works for me with PHP 5.2.12 2012-03-03 14:30:52 +01:00
Robin Appelman
23b64cd9ce remove the archive after a testcase is done 2012-03-03 01:37:00 +01:00
Robin Appelman
042878a5a9 add archive library and a storage provider on top of the archive library 
only zip backend is implemented atm
 2012-03-03 00:57:52 +01:00
Jakob Sack
1865659ce1 Fix missing bracket 2012-03-02 21:01:44 +01:00
Jakob Sack
503e5cada3 Add /dav.php, a single location bundling all *DAV-operations. 2012-03-02 20:25:20 +01:00
Bart Visscher
d1dcd7893c Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Michiel de Jong
1471d8f710 remoteStorage app version 0.5 2012-03-01 20:58:14 +00:00
Michiel de Jong
e10402c61b remoteStorage app version 0.5 2012-03-01 20:55:20 +00:00
Michiel de Jong
5d8d7ef2a1 remoteStorage app version 0.5 2012-03-01 20:55:12 +00:00
Bart Visscher
5dcd9e20d0 Small cleanups 2012-03-01 21:00:23 +01:00
Bart Visscher
ec2f49833d Calendar: Don't request edit form for readonly events 2012-03-01 21:00:23 +01:00
Bart Visscher
f914cd0144 Implement showing Birthdays of contacts in the calendar 2012-03-01 21:00:22 +01:00
Bart Visscher
fe3bcb5fe2 Calendar: fix bug in creating DTEND from DTSTART 2012-03-01 21:00:22 +01:00
Bart Visscher
642ccd27ab Bookmarks: fix loading and displaying of the bookmarks 2012-03-01 20:57:11 +01:00
Arthur Schiwon
fa6ad6ba68 LDAP: set also quota, when there is no explicit default value 2012-03-01 14:31:06 +01:00
Arthur Schiwon
b192f86d84 LDPA: fix setting variables and add missing ones to the array 2012-03-01 14:21:38 +01:00
Arthur Schiwon
eb8ffd9315 LDAP fix: set user quota, if attribute is provided 2012-03-01 14:18:28 +01:00
Robin Appelman
e76e4e7540 add touch() to all storage backands, and make parameter optional 2012-02-29 23:44:05 +01:00
Arthur Schiwon
f040ce044c consider changed/new setting variables for user_ldap 2012-02-29 13:03:44 +01:00
Arthur Schiwon
3c72a7c934 make ldap settings a little bit less ugly 2012-02-29 12:57:11 +01:00
Bartek Przybylski
2754cac21f dialogs library for apps 2012-02-28 23:02:30 +01:00