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

207 Commits

Author SHA1 Message Date
Thomas Tanghus 719ae155db Try to align and float contact parts better. 2012-08-21 00:20:18 +02:00
Michael Gapczynski 82d81e8d39 Merge branch 'share_api' 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
 2012-08-19 22:29:01 -04:00
Thomas Tanghus 2d3ec5cb4b Removed stray img element. 2012-08-19 17:05:45 +02:00
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
 2012-08-14 10:22:13 -04:00
Thomas Tanghus d303763d1f Automatically check radio when new addressbook fields get focus. 2012-08-13 15:07:15 +02:00
Bart Visscher cb71996008 Change image links to use imagePath function 2012-08-12 22:30:13 +02:00
Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
 2012-08-09 11:38:22 -04:00
Thomas Tanghus 2eac79b782 Some UI improvements on the addressbooks settings. 2012-08-07 00:06:18 +02:00
Michael Gapczynski 03d65af5dc Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible 2012-08-06 15:09:01 -04:00
Thomas Tanghus 3610975bc1 Some fixes for keyboard shortcuts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus 20f8971222 Use popup class style for ninja-mode help. 2012-08-02 04:18:44 +02:00
Thomas Tanghus f84e92e6e3 More files to delete \o/ 2012-08-02 04:18:44 +02:00
Thomas Tanghus a8faae4f42 Addressbooks settings rewrite and cleanup. 2012-08-02 00:02:07 +02:00
Thomas Tanghus 19c55e2d44 Implemented app settings in popup. 2012-07-31 12:23:22 +02:00
Thomas Tanghus ab8ce89df3 Added help for keyboard shortcuts. 2012-07-22 00:15:28 +02:00
Thomas Tanghus ecf8e77dab Remove unused file. 2012-07-20 17:11:13 +02:00
Thomas Tanghus 7fff386679 Code style. 2012-07-20 17:11:13 +02:00
Thomas Tanghus 8b49e304e0 Hide file form field behind image so it will maybe work with IE... 2012-07-15 12:28:29 +02:00
Thomas Tanghus eba4f08015 Refactored contacts import. 2012-07-15 04:17:30 +02:00
Thomas Tanghus 7cb74a0bf3 Reduce variables assigned. 2012-07-10 01:24:40 +02:00
Thomas Tanghus 334257d2b6 Implemented VCFExportPlugin. 2012-07-08 17:52:57 +02:00
Thomas Tanghus 2b22f0db0a Add missing requesttoken. 2012-07-08 13:28:12 +02:00
Thomas Tanghus 6d3afb3857 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:57:07 +02:00
Tom Needham 704a1c655e Contacts: fix add contact icon path 2012-06-30 11:07:54 +00:00
Thomas Tanghus e04a605b9b No need for this anymore. 2012-06-28 01:51:42 +02:00
Thomas Tanghus a48aba316e Smoother profile picture loading - hopefully. 2012-06-28 01:46:33 +02:00
Thomas Tanghus 1f06cdf81f Small js fix. 2012-06-22 14:27:46 +02:00
Bart Visscher 82f39d3292 Contacts: Fix name and carddav-url encoding 2012-06-21 23:30:04 +02:00
Thomas Tanghus ad7154b344 Fix being able to link directly to contact, that I broke in other commit. 2012-06-21 22:02:17 +02:00
Thomas Tanghus e5feb4e1aa Remove obsolete js. 2012-06-18 02:22:22 +02:00
Thomas Tanghus a4f53922c2 Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:36:25 +02:00
Thomas Tanghus ea4d8ccf70 Rearrange markup. 2012-06-17 23:12:11 +02:00
Thomas Tanghus 8337b30e43 Add thumbnail links so they are loaded when addressbook is expanded. 2012-06-17 23:09:25 +02:00
Thomas Tanghus b6b6d69158 Moved parsing to the controller and js to contacts.js. 2012-06-17 20:25:32 +02:00
Thomas Tanghus 2875901fc7 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus 91f5a1de39 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Stephan Bergemann 92e35bd843 now a little less in template - more in ajax controller 2012-06-17 20:25:32 +02:00
Stephan Bergemann 7f485d1b20 contacts app now lists contacts sorted by expandable/collapsable addressbooks 2012-06-17 20:25:32 +02:00
Thomas Tanghus 4cbdd59859 Fix char encoding. 2012-06-16 18:38:20 +02:00
Thomas Tanghus 6642ef6a50 Fix string encoding probs. 2012-06-16 18:06:47 +02:00
Thomas Tanghus 8a68d09b0f Use type=url for URL field. 2012-06-15 04:32:01 +02:00
Thomas Tanghus 756eb3548f Use the right csrf token. 2012-06-14 13:23:12 +02:00
Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00
Thomas Tanghus 613a122437 Remove check for encryption. 2012-06-13 19:03:34 +02:00
Thomas Tanghus bc1e8cb0a2 Contacts: implemented CSRF prevention. 2012-06-13 17:35:42 +02:00
Lukas Reschke 2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Lukas Reschke c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Lukas Reschke 6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Thomas Tanghus e79e18d866 Copy/paste error. 2012-06-11 02:40:55 +02:00
Thomas Tanghus d4f6f3e935 Contacts: Attempt to make file upload work in ICS Chrome. 2012-06-07 20:29:16 +02:00