Lukas Reschke
|
f5e0e5587d
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-07-02 10:25:53 +02:00 |
|
Lukas Reschke
|
f8cebed348
|
Don't display error messages
|
2012-07-02 10:24:22 +02:00 |
Georg Ehrke
|
e4960c3bb4
|
fix a small PHP fail
|
2012-07-02 10:23:32 +02:00 |
|
Georg Ehrke
|
e89a0949c4
|
remove some whitespace
|
2012-07-01 23:32:21 +02:00 |
|
Georg Ehrke
|
5ff72f2cd7
|
fix a small PHP fail
|
2012-07-01 21:51:46 +02:00 |
|
Georg Ehrke
|
803f2c2517
|
some work on calendar import
|
2012-07-01 21:36:09 +02:00 |
Michael Gapczynski
|
eca2e073f8
|
Don't reload the page after sending private link to email address
|
2012-07-01 11:54:32 -04:00 |
|
Michael Gapczynski
|
7ceba61413
|
Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
This reverts commit 265d7e50f5.
|
2012-07-01 11:29:02 -04:00 |
|
Lukas Reschke
|
4e63981da9
|
Disable mimesniffing
|
2012-07-01 13:45:20 +02:00 |
|
Georg Ehrke
|
6a060ecd23
|
use light grey instead of white
|
2012-07-01 01:02:54 +02:00 |
Tom Needham
|
b2cb7d54d1
|
Fixed app path
|
2012-06-30 22:56:47 +00:00 |
|
Tom Needham
|
cfc78d44bb
|
Return correct json response, fix syntax
|
2012-06-30 22:56:47 +00:00 |
|
Tom Needham
|
c7a4075aaa
|
Updates contacts migration provider
|
2012-06-30 22:56:47 +00:00 |
|
Georg Ehrke
|
be11f71d27
|
fix doc for OC_Calendar_Calendar::generateTextColor()
|
2012-07-01 00:31:05 +02:00 |
|
Georg Ehrke
|
601237a0c3
|
add algorithm to generate the calendar's text color
|
2012-07-01 00:09:33 +02:00 |
|
Georg Ehrke
|
ce331bd1d3
|
improvements for dropoimport
|
2012-06-30 23:18:41 +02:00 |
|
Georg Ehrke
|
a705b19cd5
|
little fix for import
|
2012-06-30 22:45:12 +02:00 |
|
Georg Ehrke
|
f15941a967
|
improve dropimport
|
2012-06-30 22:26:29 +02:00 |
|
Georg Ehrke
|
4890bbb30d
|
Merge branch 'master' into calendar_import
|
2012-06-30 22:08:36 +02:00 |
|
Georg Ehrke
|
376431fa0d
|
import works now for dropimport
|
2012-06-30 22:08:30 +02:00 |
|
Georg Ehrke
|
fa5b31ac9c
|
fix documentation style
|
2012-06-30 17:09:20 +02:00 |
Florian Hülsmann
|
4ed55315e7
|
fixed linkTo()
|
2012-06-30 16:53:41 +02:00 |
|
Georg Ehrke
|
8e0addebc3
|
fix some doc
|
2012-06-30 15:39:20 +02:00 |
|
Georg Ehrke
|
34b2486d53
|
some improvements for calendar export
|
2012-06-30 15:23:21 +02:00 |
|
Georg Ehrke
|
390f5cc89f
|
some work on (drop)import)
|
2012-06-30 15:17:29 +02:00 |
|
Tom Needham
|
51173163ce
|
Contacts: align the bottom control buttons
|
2012-06-30 11:22:09 +00:00 |
|
Tom Needham
|
704a1c655e
|
Contacts: fix add contact icon path
|
2012-06-30 11:07:54 +00:00 |
|
Georg Ehrke
|
433d15d309
|
Merge branch 'master' into calendar_import
|
2012-06-30 12:50:26 +02:00 |
|
Georg Ehrke
|
6e6f90a8a2
|
fix merge conflicts
|
2012-06-30 12:44:51 +02:00 |
|
Georg Ehrke
|
34d4eb8edd
|
some more work on calendar import class
|
2012-06-30 12:42:36 +02:00 |
|
Michael Gapczynski
|
edc6a648d1
|
Fix placeholder value for optional fields in external storage UI
|
2012-06-29 19:35:57 -04:00 |
Robin Appelman
|
2c35e185f7
|
make sure the filesystem is setup properly for oc_cache_file tests
|
2012-06-30 01:14:01 +02:00 |
|
Robin Appelman
|
d43ed43b5a
|
cant to ttl tests for xcache
|
2012-06-30 01:13:33 +02:00 |
|
Robin Appelman
|
252453cd34
|
fix encryption test cases when not logged in
|
2012-06-30 01:05:18 +02:00 |
|
Michael Gapczynski
|
c992482e92
|
Prevent duplicate group showing in multiselect that added the group
|
2012-06-29 17:52:44 -04:00 |
Thomas Tanghus
|
a4614f83ff
|
Don't add duplicate contacts in the list when en-/disable an address book.
|
2012-06-29 23:18:47 +02:00 |
|
Michael Gapczynski
|
8e4832bd12
|
Prevent adding a duplicate to a multiselect
|
2012-06-29 16:44:08 -04:00 |
|
Michael Gapczynski
|
05cb94801a
|
Add new group to other user's group select forms
|
2012-06-29 16:29:58 -04:00 |
|
Georg Ehrke
|
246894243a
|
Merge branch 'master' into calendar_import
|
2012-06-29 21:46:09 +02:00 |
|
Michael Gapczynski
|
719c7f7f6e
|
Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
|
2012-06-29 13:01:00 -04:00 |
Bart Visscher
|
3ed7738d5e
|
Increment user_openid version to load new app type
|
2012-06-29 18:38:04 +02:00 |
|
Bart Visscher
|
f61793aa14
|
Coding style fixes
|
2012-06-29 18:38:04 +02:00 |
|
Bart Visscher
|
2b4ecbaba0
|
Whitespace fixes
|
2012-06-29 18:38:04 +02:00 |
|
Georg Ehrke
|
652a874fa6
|
fix displaying of events
|
2012-06-29 18:13:52 +02:00 |
|
Georg Ehrke
|
3bcf176a53
|
add some hooks to fix calendar sharing
|
2012-06-29 17:27:29 +02:00 |
|
Michael Gapczynski
|
7e9455c382
|
Allow multiple Google Drive and Dropbox external storages to be configured
|
2012-06-29 11:22:54 -04:00 |
|
Michael Gapczynski
|
2d49a491fb
|
Clear the mount point value for the new mount point row
|
2012-06-29 11:10:51 -04:00 |
|
Michael Gapczynski
|
f311c2a2ff
|
Hide the delete button on new mount point row
|
2012-06-29 11:10:51 -04:00 |
Bjoern Schiessle
|
94add1c000
|
typo fixed
|
2012-06-29 16:49:22 +02:00 |
|
Georg Ehrke
|
bda0026374
|
fix birthday calendar
|
2012-06-29 15:43:18 +02:00 |