LEDfan
2ad05e3bdb
Merge pull request #710 from owncloud/fix_404
...
Fix 404 contact not found with shared addressbook
2014-12-05 07:33:58 +01:00
Jenkins for ownCloud
8024bdd177
[tx-robot] updated from transifex
2014-12-05 00:48:22 -05:00
Jenkins for ownCloud
101f035315
[tx-robot] updated from transifex
2014-12-04 00:48:22 -05:00
Jörn Friedrich Dreyer
aed04416cb
make search results app specific
2014-12-02 17:42:54 +01:00
ionum
15d2d74246
extend func getIDFromUri
...
uri is no unique value; only combination of uri and addressbookid is unique
2014-12-01 13:16:52 +01:00
jbtbnl
9862f45652
Merge pull request #720 from owncloud/drop-oc_preferences
...
migrate from OC_Preferences to DI config object
2014-12-01 11:19:16 +01:00
Jenkins for ownCloud
a2d23c0d89
[tx-robot] updated from transifex
2014-11-29 00:48:23 -05:00
Morris Jobke
f6ac4ea683
migrate from OC_Preferences to DI config object
2014-11-28 16:51:10 +01:00
Jenkins for ownCloud
eb79b4ddce
[tx-robot] updated from transifex
2014-11-28 00:48:22 -05:00
Jenkins for ownCloud
da3c58d554
[tx-robot] updated from transifex
2014-11-27 00:48:35 -05:00
jbtbnl
63a9a50c45
Merge pull request #718 from owncloud/fix-session
...
migrate OC::session to OC::server->getSession
2014-11-26 11:20:50 +01:00
Morris Jobke
550b8f125c
migrate OC::session to OC::server->getSession
2014-11-26 09:29:05 +01:00
jbtbnl
a72cf63661
Merge pull request #714 from owncloud/remove
...
Remove OC_Migrate provider
2014-11-24 11:43:30 +01:00
Lukas Reschke
bb7cf6d4fb
Remove OC_Migrate provider
...
See https://github.com/owncloud/core/pull/12380
2014-11-24 11:07:58 +01:00
Jenkins for ownCloud
66657b23e7
[tx-robot] updated from transifex
2014-11-22 00:48:42 -05:00
LEDfan
579819bee8
also search for shared contacts
2014-11-21 13:03:15 +01:00
LEDfan
b6cdd06db2
Fix double line
2014-11-21 11:47:09 +01:00
jbtbnl
c08bd79ad8
Merge pull request #709 from owncloud/rmobslang
...
remove obsolete lang #11274
2014-11-21 11:42:41 +01:00
LEDfan
2e9dbc4a38
Remove uneeded func
2014-11-21 11:37:08 +01:00
LEDfan
bd9706756d
Use join instead of 2 queries
2014-11-21 11:36:28 +01:00
LEDfan
825884adc7
Refactor code to make it simpler
2014-11-21 11:06:54 +01:00
LEDfan
7ce883b33d
First step to fix 404's with a shared addressbook
2014-11-21 11:05:06 +01:00
Jenkins for ownCloud
d969e068c1
[tx-robot] updated from transifex
2014-11-21 02:51:26 -05:00
Volkan Gezer
a744595d91
remove obsolete lang #11274
2014-11-20 14:51:58 +01:00
Jenkins for ownCloud
ee92495944
[tx-robot] updated from transifex
2014-11-20 00:48:31 -05:00
Jenkins for ownCloud
0614e80fc6
[tx-robot] updated from transifex
2014-11-19 00:48:23 -05:00
Bernhard Reiter
d00185384c
Merge pull request #708 from owncloud/bower2
...
User bower to load JS dependencies
2014-11-18 17:44:17 +01:00
Bernhard Reiter
3973218580
Merge pull request #687 from owncloud/css-fix
...
Correct trashcan and hamburger icon size
2014-11-18 17:43:05 +01:00
jbtbnl
21f37e46c0
Fix scrutinizer exclude path
2014-11-18 13:08:33 +01:00
jbtbnl
d8714363fb
Fix for TravisCI: Errors parsPHP Parse error: syntax error, unexpected
...
'[' in /home/travis/build/owncloud/contacts/templates/contacts.php on
line 4
2014-11-18 13:02:08 +01:00
LEDfan
8c3d7ccdba
install multi-select and combobox via bower
...
Remove old combobox
user bower for onfontresize
Add jcrop + md5
Add files to scrutinizer ignore list
Remove misplaced text
Selected the right MultiSelect library via bower
Move bower dependencies to correct location
2014-11-18 12:54:33 +01:00
Lukas Reschke
d5a26d7abb
Merge pull request #563 from owncloud/app-group-enable-remote
...
fix caldav when the calendar app is only enabled for specific groups
2014-11-18 10:16:59 +01:00
Bernhard Reiter
66f8c5d882
Merge pull request #668 from ockham/share-contact-groups2
...
Share contact groups
2014-11-17 16:51:07 +01:00
Jenkins for ownCloud
963894423d
[tx-robot] updated from transifex
2014-11-17 00:48:24 -05:00
Jenkins for ownCloud
1ae87f55a0
[tx-robot] updated from transifex
2014-11-15 00:48:22 -05:00
Jenkins for ownCloud
c6f1510178
[tx-robot] updated from transifex
2014-11-13 00:48:23 -05:00
Jenkins for ownCloud
c174d39f4d
[tx-robot] updated from transifex
2014-11-12 00:48:37 -05:00
Jenkins for ownCloud
f45f6591e6
[tx-robot] updated from transifex
2014-11-11 00:48:24 -05:00
Jenkins for ownCloud
bf82152691
[tx-robot] updated from transifex
2014-11-10 00:48:23 -05:00
Jenkins for ownCloud
24c7d1bb24
[tx-robot] updated from transifex
2014-11-09 00:48:23 -05:00
jbtbnl
dd35cf54be
Merge pull request #696 from owncloud/new-md5-and-jcrop-locations
...
Load md5 and Jcrop scripts and styles from their new locations.
2014-11-08 17:11:07 +01:00
Bernhard Reiter
ea7e3b4844
Load resources from template using script() and style() functions.
2014-11-08 16:35:22 +01:00
Jenkins for ownCloud
1ef5765637
[tx-robot] updated from transifex
2014-11-08 00:48:30 -05:00
Bernhard Reiter
5728c8663b
Load md5 and Jcrop scripts and styles from their new locations.
...
They could not be loaded as they have been replaced by their bower
counterparts with
owncloud/core@49fbd766c2 and
owncloud/core@73569b29bc
2014-11-07 21:44:56 +01:00
Bernhard Reiter
0e170091e4
Merge pull request #686 from owncloud/issue-654
...
Display correct number of contacts in shared addressbooks.
2014-11-07 21:11:00 +01:00
Robin Appelman
abac66f81c
fix caldav when the calendar app is only enabled for specific groups
2014-11-07 16:14:19 +01:00
Jenkins for ownCloud
f677316858
[tx-robot] updated from transifex
2014-11-04 00:48:23 -05:00
Jenkins for ownCloud
e9b412db22
[tx-robot] updated from transifex
2014-10-30 06:57:13 -04:00
Jenkins for ownCloud
43a97c6a97
[tx-robot] updated from transifex
2014-10-30 00:48:25 -04:00
Jenkins for ownCloud
4773cdc6f9
[tx-robot] updated from transifex
2014-10-29 00:48:39 -04:00
