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 |
|
Bjoern Schiessle
|
b95996c02c
|
- when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
- don't allow renaming if a file/directory with the name already exists
|
2012-06-29 15:23:04 +02:00 |
|
Georg Ehrke
|
08e707d258
|
some work on OC_Calendar_Import
|
2012-06-29 14:32:07 +02:00 |
|
Bjoern Schiessle
|
60ec46f706
|
- remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
- if secure is set to true add 's' to http
|
2012-06-29 12:01:23 +02:00 |
Frank Karlitschek
|
bd908affa3
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-29 11:08:43 +02:00 |
|
Frank Karlitschek
|
6917d74193
|
move the ownCloud version to admin which makes more sense. A normal user can´t update ownCloud anyways.
|
2012-06-29 11:07:41 +02:00 |
Robin Appelman
|
75af5778a4
|
pass progresskey the correct way during calender import
|
2012-06-29 00:49:37 +02:00 |
|
Michael Gapczynski
|
31bba86e87
|
Fix external storage UI for Admin page
|
2012-06-28 17:55:22 -04:00 |
|
Bart Visscher
|
1ccbbfad53
|
Spelling fix
|
2012-06-28 22:11:04 +02:00 |
|
Bart Visscher
|
02e4e0e08f
|
Gallery: Get all the image information for a directory at once
|
2012-06-28 22:11:04 +02:00 |
|
Bart Visscher
|
bf09edcbf1
|
Remember the app root information.
|
2012-06-28 22:11:04 +02:00 |
|
Bart Visscher
|
19bb4e83c9
|
Remove redundant code from OC_Helper::linkTo
|
2012-06-28 22:11:04 +02:00 |
Brice Maron
|
b2cbf1199d
|
Pg setup enhancement
do not create a db if already existing .. and reset the user password instead of creating if the user already exists
|
2012-06-28 19:38:03 +00:00 |
|
Georg Ehrke
|
91d92aed02
|
fix for previous commit
|
2012-06-28 19:13:43 +02:00 |
|
Georg Ehrke
|
4b3af1f73b
|
use OC_Calendar_Export for publicly shared calendars
|
2012-06-28 19:12:50 +02:00 |
|
Georg Ehrke
|
930bbeabd4
|
Calendar Export: replace spaces with dashes in the name of the calendar / event
|
2012-06-28 19:04:14 +02:00 |
|
Georg Ehrke
|
9dd7ca2667
|
some changes and more doc for OC_Calendar_Export class
|
2012-06-28 18:54:13 +02:00 |
|
Georg Ehrke
|
9a4709e68d
|
fix calendar export for Apple iCal - i hate bloody line ends
|
2012-06-28 16:41:00 +02:00 |
|
Georg Ehrke
|
c4f5639cb4
|
Merge branch 'master' into calendar_export
|
2012-06-28 15:24:30 +02:00 |
|
Bjoern Schiessle
|
bdd1baeb85
|
use public API
|
2012-06-28 14:18:57 +02:00 |
|
Bjoern Schiessle
|
e5792cc064
|
adjust the name and/or location of the stored versions if the actual file gets moved or renamed
|
2012-06-28 14:06:20 +02:00 |
|
Bjoern Schiessle
|
f22f49671b
|
move hook to erase versions from deleted files to the right place
|
2012-06-28 12:42:47 +02:00 |
|
Bjoern Schiessle
|
52f99a7570
|
delete file versions if the user deletes a file
|
2012-06-28 11:48:57 +02:00 |
|
Bjoern Schiessle
|
dac539b619
|
handover the correct timestamp
|
2012-06-28 11:46:17 +02:00 |
|
Georg Ehrke
|
3cea1b062e
|
Merge branch 'master' into calendar_export
|
2012-06-28 09:27:54 +02:00 |
|
Michael Gapczynski
|
81953e7bb5
|
Return login errors for PostgreSQL setup
|
2012-06-27 20:24:06 -04: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 |
|
Michael Gapczynski
|
db6139fd41
|
Don't overwrite fake directory stream for Amazon S3 storage
|
2012-06-27 19:44:52 -04:00 |
Tom Needham
|
426193cf6c
|
Migration: Fix contacts and bookmarks
|
2012-06-27 21:18:31 +00:00 |
|
Thomas Tanghus
|
77b7f214d2
|
Load contactlist progressivly.
|
2012-06-27 22:44:28 +02:00 |
|
Tom Needham
|
7284e57c91
|
Migration: fix app paths
|
2012-06-27 20:43:33 +00:00 |
|
Georg Ehrke
|
e029e8cb14
|
Merge branch 'master' into calendar_export
|
2012-06-27 22:27:55 +02:00 |
|
Georg Ehrke
|
8712754f8c
|
fix style of some doc
|
2012-06-27 22:27:48 +02:00 |
|
Georg Ehrke
|
1f738d8c9f
|
Merge branch 'master' into calendar_export
|
2012-06-27 22:24:12 +02:00 |
|
Brice Maron
|
2706988225
|
Set table prefix if not set in postgresql install
|
2012-06-27 16:08:46 -04:00 |
|
Michael Gapczynski
|
9b605969f1
|
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
|
2012-06-27 15:23:49 -04:00 |
|
Georg Ehrke
|
77c66e8cc4
|
move some documentation to the right place
|
2012-06-27 21:05:46 +02:00 |
|
Georg Ehrke
|
25a50f00bd
|
add merge calendar function and add some documentation to OC_Calendar_Calendar
|
2012-06-27 20:56:58 +02:00 |