Tom Needham
|
b0dc4383e1
|
Clean code slightly
|
2012-07-30 12:57:35 +00:00 |
Tom Needham
|
b563dff10a
|
Record the app that is registering a call to use later with OAuth
|
2012-07-30 12:56:01 +00:00 |
Tom Needham
|
9ffaea480f
|
Add the format parameter inside OC_API
|
2012-07-30 12:44:34 +00:00 |
Tom Needham
|
9072106048
|
Move OCS methods to lib/ocs/.php
|
2012-07-30 12:42:18 +00:00 |
Tom Needham
|
f09ecee63a
|
Move routes to ocs folder
|
2012-07-30 12:41:26 +00:00 |
Tom Needham
|
e33174f115
|
Add core routes and include them in OC_API::call()
|
2012-07-30 10:56:21 +00:00 |
Tom Needham
|
cbc0f0c1c5
|
Include the css for the OAuth page
|
2012-07-30 10:51:48 +00:00 |
Tom Needham
|
138c66a2ba
|
Improve styling of permission request page
|
2012-07-30 10:51:00 +00:00 |
Bjoern Schiessle
|
ee15c40b14
|
comment added
|
2012-07-30 12:43:17 +02:00 |
Bjoern Schiessle
|
1f2aa32d22
|
url needs to be case sensitive to be able to have files and paths as part of the URL
|
2012-07-30 12:39:28 +02:00 |
Bjoern Schiessle
|
23391b3694
|
get/set key files, take shared files into account
|
2012-07-30 12:38:38 +02:00 |
Thomas Tanghus
|
01f25119d5
|
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
|
2012-07-30 12:28:40 +02:00 |
Thomas Tanghus
|
f91783e9ab
|
Fix errors when no addressbook.
|
2012-07-30 12:28:10 +02:00 |
Tom Needham
|
5933d43901
|
Basic template for authorising exernal apps with OAuth
|
2012-07-30 10:25:41 +00:00 |
Bjoern Schiessle
|
e5704bf8bf
|
ocs call to get file key for client side enncryption
|
2012-07-30 10:07:52 +02:00 |
Thomas Tanghus
|
fa62ff62d2
|
Remove deprecated code.
|
2012-07-30 05:31:48 +02:00 |
Thomas Tanghus
|
d614c3b1d5
|
Code style.
|
2012-07-30 05:31:06 +02:00 |
Thomas Tanghus
|
118d9e17b6
|
Check if the are contacts marked as deleted and warn if so.
|
2012-07-30 04:57:14 +02:00 |
Thomas Tanghus
|
b25b73b5b4
|
Fixed potential error in logging.
|
2012-07-30 04:57:14 +02:00 |
Thomas Tanghus
|
fa6d26b53c
|
Removed text/plain header.
|
2012-07-30 04:57:14 +02:00 |
Jenkins for ownCloud
|
3430dcd367
|
[tx-robot] updated from transifex
|
2012-07-30 02:05:41 +02:00 |
Michael Gapczynski
|
5262cde6a6
|
Add additional error handling for emailing private links
|
2012-07-29 18:02:09 -04:00 |
Michael Gapczynski
|
e18639551d
|
Tweak appearance of undo delete notification
|
2012-07-29 18:02:08 -04:00 |
Tom Needham
|
0836366d87
|
Methods to disable and enable users
|
2012-07-29 16:07:51 +00:00 |
Tom Needham
|
038af7e636
|
Add method to check if an app is shipped or not
|
2012-07-29 15:29:26 +00:00 |
Jenkins for ownCloud
|
18f6552a08
|
[tx-robot] updated from transifex
|
2012-07-29 02:06:29 +02:00 |
Tom Needham
|
9dbe5f3703
|
Load routes before calling actions
|
2012-07-28 21:57:24 +00:00 |
Tom Needham
|
c375774fca
|
Fix odd indentation issue
|
2012-07-28 21:50:40 +00:00 |
Tom Needham
|
20838bb9c2
|
Basic structure and functionality of api class
|
2012-07-28 21:40:11 +00:00 |
Michael Gapczynski
|
7ff04be091
|
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
|
2012-07-28 11:06:36 -04:00 |
Michael Gapczynski
|
e02d8d7f7e
|
Remove delete tipsy if file is deleted, fixes bug oc-958
|
2012-07-27 21:28:41 -04:00 |
Jenkins for ownCloud
|
fa4052d6f1
|
[tx-robot] updated from transifex
|
2012-07-28 02:05:38 +02:00 |
Thomas Mueller
|
6bc45f11f7
|
bookmarks.pot and lib.pot added to transifex
|
2012-07-28 00:25:34 +02:00 |
Michael Gapczynski
|
dd4765ad16
|
Set filter to empty if not set by Ampache client
|
2012-07-27 18:10:40 -04:00 |
Michael Gapczynski
|
6a4c46e2c2
|
Set the user id when authenticating user for Ampache, fixes bug oc-219
|
2012-07-27 18:05:18 -04:00 |
Michael Gapczynski
|
df9f5b902a
|
Fix group detection for sharing in case username contains '@', fix for oc-1270
|
2012-07-27 15:34:51 -04:00 |
Bart Visscher
|
896d27de36
|
Chunked upload: Support reusing local chunks
|
2012-07-27 19:35:33 +02:00 |
Bart Visscher
|
1ea33ff36b
|
Chunked upload: Refactor OC_FileChunking to object
|
2012-07-27 19:35:28 +02:00 |
Bart Visscher
|
2d85ef0e04
|
Chunked upload: Refactor to static class
|
2012-07-27 19:32:44 +02:00 |
Michael Gapczynski
|
48f33be848
|
Only call mkdir() if the root folder does not exist for FTP external storage
|
2012-07-27 12:32:03 -04:00 |
Michael Gapczynski
|
db72ce398b
|
Add support for configuring which permissions are possible for items
|
2012-07-27 10:13:23 -04:00 |
Michael Gapczynski
|
4c822df28d
|
Fix incorrect copy/paste for file_put_contents()
|
2012-07-27 09:37:47 -04:00 |
Bjoern Schiessle
|
680eed6bac
|
fix for bug #1295, don't escape password reset link
|
2012-07-27 15:35:36 +02:00 |
Georg Ehrke
|
bccd372565
|
Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
|
2012-07-27 14:17:55 +02:00 |
Bjoern Schiessle
|
f752a27605
|
write keyfiles to server
|
2012-07-27 14:00:41 +02:00 |
Bjoern Schiessle
|
931c4695a6
|
run setup routine only for server side encryption
|
2012-07-27 13:58:58 +02:00 |
Bart Visscher
|
a7a5433108
|
Merge branch 'master' into chunked_upload
Conflicts:
lib/connector/sabre/directory.php
|
2012-07-27 11:40:51 +02:00 |
Michael Gapczynski
|
7050f0fa67
|
Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
|
2012-07-26 23:54:25 -04:00 |
Michael Gapczynski
|
ea2e76eecc
|
Forgot data parameter for file_put_contents() streams pre proxies
|
2012-07-26 23:10:21 -04:00 |
Michael Gapczynski
|
d006a551f4
|
Run pre and post proxies for file_put_contents() streams
|
2012-07-26 22:53:55 -04:00 |