1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Commit Graph

3399 Commits

Author SHA1 Message Date
Jenkins for ownCloud
e9934f263a [tx-robot] updated from transifex 2014-09-13 05:14:18 -04:00
Jenkins for ownCloud
2e8533d1b4 [tx-robot] updated from transifex 2014-09-12 03:29:00 -04:00
Nicolas Mora
b6fd5ea21d Merge pull request #642 from owncloud/import-fixes2
Import fixes from previous bugs
2014-09-11 12:11:48 -04:00
Jenkins for ownCloud
93ab4de37a [tx-robot] updated from transifex 2014-09-11 00:48:10 -04:00
babelouest
7a9145d524 fix issue #537, handle multiple values in a not connected property 2014-09-10 12:52:30 -04:00
babelouest
b15ee161cf fix $id is array in database.php line 529 #559 2014-09-10 12:29:35 -04:00
babelouest
92af9fbc06 replace \:// with :// in the original vcard 2014-09-10 12:29:09 -04:00
Jenkins for ownCloud
34f456f0b7 [tx-robot] updated from transifex 2014-09-10 00:48:10 -04:00
Jenkins for ownCloud
74524bb3e9 [tx-robot] updated from transifex 2014-09-09 00:48:21 -04:00
Jan-Christoph Borchardt
ea5d8fbb79 Merge pull request #619 from owncloud/fix-header
Small fixes for header
2014-09-08 17:00:46 +02:00
LEDfan
5947a27884 This should solve the 404 error 2014-09-07 10:34:25 +02:00
Jenkins for ownCloud
96cad3607c [tx-robot] updated from transifex 2014-09-07 00:48:12 -04:00
Jenkins for ownCloud
5e5e2ea54a [tx-robot] updated from transifex 2014-09-06 00:48:18 -04:00
Jenkins for ownCloud
fca1fca893 [tx-robot] updated from transifex 2014-09-05 00:48:18 -04:00
Jenkins for ownCloud
ed30778ea9 [tx-robot] updated from transifex 2014-09-04 00:48:11 -04:00
Jenkins for ownCloud
259311d4e6 [tx-robot] updated from transifex 2014-09-03 00:48:32 -04:00
jbtbnl
0357bd3d3f Hide import input fields and import button on import start 2014-09-02 16:25:39 +02:00
Jenkins for ownCloud
0ad9ceee40 [tx-robot] updated from transifex 2014-09-02 00:48:25 -04:00
Andrew Brown
670848b860 Update search classes to with the new search system
Add a Contact search result type to distinguish these results within a search view.

reformat code
2014-09-01 17:00:23 +02:00
Jenkins for ownCloud
8302b2e50d [tx-robot] updated from transifex 2014-09-01 00:48:29 -04:00
Jenkins for ownCloud
6e6500f47e [tx-robot] updated from transifex 2014-08-31 13:04:38 -04:00
Jan ten Bokkel
2cec676c10 Add avatar and placeholder JavaScripts 2014-08-31 10:51:24 +02:00
Jenkins for ownCloud
1643a5d8cc [tx-robot] updated from transifex 2014-08-30 00:49:04 -04:00
jbtbnl
f9c075ba89 Merge pull request #624 from owncloud/issue-504
Remove drag&drop tipsy reminder
2014-08-29 19:38:53 +02:00
jbtbnl
cf02c8dbb4 Remove drag&drop tipsy reminder 2014-08-29 18:40:34 +02:00
Jan ten Bokkel
7945f1fcc8 Fix export of contacts 2014-08-29 17:52:51 +02:00
Jan ten Bokkel
ee1e61535e Fixes contacts export function 2014-08-29 14:00:15 +02:00
Frank Karlitschek
dc33a738e9 Merge pull request #620 from jakobsack/master
Fix my name in README.md
2014-08-29 11:54:32 +02:00
Jakob Sack
b64361a12f Fix my name 2014-08-29 11:38:47 +02:00
Jan ten Bokkel
703c14d946 Remove responsive CSS leftover and fix column selection based on screen
width
2014-08-29 11:21:50 +02:00
Jan ten Bokkel
4a0c4870d7 Fix header positioning. Make sort order reappear afder deselection. 2014-08-29 11:07:13 +02:00
Jenkins for ownCloud
61c9485123 [tx-robot] updated from transifex 2014-08-29 00:48:43 -04:00
Bernhard Reiter
0eb18b2a15 Fix typos in variable names that broke stuff. 2014-08-29 00:45:56 +02:00
Bernhard Reiter
e69f1374f3 Fix a comment typo. 2014-08-29 00:45:56 +02:00
Bernhard Reiter
0d6f16f612 Fix one error reporting line in the group controller. 2014-08-29 00:45:56 +02:00
Bernhard Reiter
319f68051b In public function inGroup($name), add missing "return" keyword. 2014-08-29 00:45:56 +02:00
Jan ten Bokkel
8654fe0aba Improve import dialog styling 2014-08-28 16:49:53 +02:00
Jan ten Bokkel
be5ae33234 Align import dialog to screen center 2014-08-28 16:24:38 +02:00
Jenkins for ownCloud
a6977a714f [tx-robot] updated from transifex 2014-08-28 00:48:37 -04:00
Jan ten Bokkel
f1cbc92ec7 Remove unnecessary log message 2014-08-27 13:48:53 +02:00
Jenkins for ownCloud
2a185f6d89 [tx-robot] updated from transifex 2014-08-27 00:48:33 -04:00
jbtbnl
65966d2888 Fix Scrutinizer issues 2014-08-26 23:20:29 +02:00
jbtbnl
0129e59024 Hide upload iframe and fix merge flaws 2014-08-26 19:28:45 +02:00
jbtbnl
a9ade3079d Merge remote-tracking branch 'origin/master' into import-new-ui
Conflicts:
	css/contacts.css
	lib/controller/importcontroller.php
2014-08-26 17:42:14 +02:00
Jenkins for ownCloud
f310236add [tx-robot] updated from transifex 2014-08-26 00:48:42 -04:00
Jan-Christoph Borchardt
6aa9919ec2 Merge pull request #609 from ockham/rename-tagmgr-member
Rename $this->tagMgr to $this->tags as that's what they are.
2014-08-26 00:20:27 +02:00
Jenkins for ownCloud
1f97ef460d [tx-robot] updated from transifex 2014-08-25 00:48:30 -04:00
Jenkins for ownCloud
84d09e8903 [tx-robot] updated from transifex 2014-08-24 00:48:33 -04:00
Jenkins for ownCloud
e3d0626823 [tx-robot] updated from transifex 2014-08-23 00:48:41 -04:00
Jenkins for ownCloud
e5ff5d0d48 [tx-robot] updated from transifex 2014-08-22 00:48:36 -04:00