mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,166 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

1406 Commits

Author SHA1 Message Date
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