ed14541aea
Removed stray debug log write
2013-10-02 16:44:38 +02:00
b0a71bde15
maxX and maxY should be a integer
2013-10-02 16:34:05 +02:00
31e1c15db7
Added dateOnly argument to relative_modified_date
...
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
551e809790
Merge pull request #5076 from owncloud/fix_filepicker_kondou
...
Fix require in apps/files/ajax/rawlist.php
2013-10-02 05:59:24 -07:00
78c60c25c8
only perform files upgrade in case there are actually entries in the old fscache table
2013-10-02 13:00:05 +02:00
feb7028a78
Remove require in rawlist.php
...
Thanks @tanghus for pointing out the unneccessity of it.
2013-10-02 12:45:30 +02:00
013e9c27d2
Fix require in apps/files/ajax/rawlist.php
2013-10-02 12:21:52 +02:00
1adadf36fc
Merge pull request #5071 from owncloud/fix-autoloader-master
...
Fix autoloader regression
2013-10-02 03:10:10 -07:00
ceeb22aa5f
fix unit tests
2013-10-02 11:25:44 +02:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
535ed8369f
Merge pull request #4894 from owncloud/fixing-4620-master
...
Fixing broken layout in master due to APC enabled
2013-10-01 17:51:33 -07:00
5bb4330ea4
Fix autoloader regression
2013-10-02 00:58:51 +03:00
9eab8b39df
Merge branch 'master' into fixing-4620-master
2013-10-01 22:57:46 +02:00
8035787cb9
Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
2013-10-01 20:16:11 +02:00
a2cabd4c2a
Remove getContent() from IRequest
2013-10-01 20:15:04 +02:00
0f13ffb773
Remove JSON request parsing from Server
2013-10-01 20:15:04 +02:00
7cd8088845
Add assertions for ->params and array access with json
2013-10-01 20:15:03 +02:00
973bcccd7c
Implement PUT an PATCH support
2013-10-01 20:13:13 +02:00
36d1156cf8
Add interface docs to IRequest.
2013-10-01 20:13:13 +02:00
cd2e1d0cfe
Add patch method to OC_Route
2013-10-01 20:13:13 +02:00
bdad7697ac
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
5ade595911
Merge pull request #5039 from owncloud/lib-private-master-2
...
Public API OC6 - introduce lib/private
2013-10-01 09:15:24 -07:00
e2fe71b6e7
Merge branch 'master' into lib-private-master-2
2013-10-01 16:11:59 +02:00
b66e492d6e
Merge pull request #5026 from owncloud/channels
...
put the current version and edition into a seperate file to simplify
2013-10-01 05:36:00 -07:00
6cda88b49d
add explanation
2013-10-01 14:28:59 +02:00
bf0f3bf0da
use a 4 digit number
2013-10-01 12:37:19 +02:00
02d6976263
Merge branch 'master' into lib-private-master-2
2013-09-30 21:29:58 +02:00
7c659eb291
use public api for session access from server container
2013-09-30 20:28:00 +02:00
bed27b603d
Merge branch 'master' into channels
...
Conflicts:
lib/util.php
2013-09-30 20:21:51 +02:00
2cf26ee0b1
put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later
...
Conflicts:
lib/ocsclient.php
lib/util.php
2013-09-30 20:19:26 +02:00
69dd6af574
use ===
...
Shoudn't make a difference in this case but just in case
Conflicts:
lib/ocsclient.php
2013-09-30 20:15:16 +02:00
b948c1a1b6
prepare the updater for the new update channels
2013-09-30 20:14:18 +02:00
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
8e0060405d
reorganize file in lib
2013-09-30 16:39:03 +02:00
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
26785c9e0d
Remove getContent() from IRequest
2013-09-30 16:30:36 +02:00
4e9a95f3e9
Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
...
Conflicts:
lib/appframework/http/request.php
tests/lib/appframework/http/RequestTest.php
2013-09-30 16:27:00 +02:00
b0be2c79dc
Remove JSON request parsing from Server
2013-09-30 16:24:47 +02:00
1d2466c6d1
Add assertions for ->params and array access with json
2013-09-30 16:23:43 +02:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
d4fed61871
Merge pull request #5012 from owncloud/check_keyfiles_exists
...
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-30 06:55:56 -07:00
092b4e7b53
Implement PUT an PATCH support
2013-09-30 15:35:07 +02:00
2115db3892
Add interface docs to IRequest.
2013-09-30 15:35:07 +02:00
35fae7aaf8
Add patch method to OC_Route
2013-09-30 15:35:07 +02:00
50fc5e8792
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-09-30 15:35:07 +02:00
67d4b77e8e
revert changes in personal template
2013-09-30 15:11:01 +02:00
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
084f76fd14
grammar fixes
2013-09-30 13:33:49 +02:00
17aa49a890
fix mail subject; don't show time for expire date
2013-09-30 13:33:02 +02:00
Vincent Petry
Bjoern Schiessle
Morris Jobke
Thomas Müller
kondou
Owen Winkler
Victor Dubiniuk
Thomas Tanghus
Frank Karlitschek