e55f25b64d
handle error situation of rename proper
2013-09-23 22:04:37 +02:00
5d671a84b2
Merge pull request #4869 from owncloud/fixing-4866-master
...
recreate an etag within the scanner if the cache contains an empty etag
2013-09-23 07:13:12 -07:00
910a0338bb
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 15:52:06 +02:00
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
93258e1170
Forgot to return false if add() didn't add anything.
2013-09-23 13:29:21 +02:00
0b4de847a9
Added more error checking in add()
2013-09-23 13:27:43 +02:00
4a9f1cc74d
Merge remote-tracking branch 'owncloud/master' into fixing-4866-master
...
* owncloud/master: (98 commits)
[tx-robot] updated from transifex
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
setting a default on filecache column unencrypted_size
[tx-robot] updated from transifex
remove unneccessary lib in namespace
namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
initialize variable
calculate correct permissions while toggle the password protection
make sure that both $permissions and $oldPermissions have the same type
Add copyright, remove starting blank line
update inherit docs comment
Fix insert/update/delete helper functions for oracle
Add missing return true statements to legacy preferences functions
Add missing static
Convert OC_Preference to object interface
fix race condition in lazy preview loading
use {count} instead of 'One' for more versatile translation
fix double translation of error message
use n to translate title
fixing typos and l10n
...
Conflicts:
tests/lib/files/cache/scanner.php
2013-09-23 12:44:11 +02:00
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
9851f0f4f2
Merge pull request #4896 from owncloud/sharing_allow_disable_password
...
sharing, allow user to disable password protection
2013-09-23 01:20:09 -07:00
03eedb58fc
Merge pull request #4327 from owncloud/scanfile-remove
...
remove deleted files while scanning
2013-09-22 22:40:13 -07:00
811f680457
Merge pull request #4623 from owncloud/convert-oc_preferences
...
Convert OC_Preference to object interface
2013-09-22 10:45:56 -07:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
a1d4eb1f95
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
2013-09-22 01:24:12 +02:00
2a17025d53
Move bool to int conversion to buildParts(), so it also happens for update().
2013-09-21 02:20:01 +02:00
011bca7b7f
Only update the etag. Do not re-submit any other unchanged data.
2013-09-20 23:53:02 +02:00
a2f82da572
Use update() instead of put().
2013-09-20 23:52:05 +02:00
0c6dcdba6b
Add missing implements and fix parameters in IConfig
2013-09-20 22:45:22 +02:00
d3d52dd23f
PHPDoc & get UserManager from container for RooFolder
2013-09-20 21:57:48 +02:00
f83f323269
fixing typos + adding missing filed $activeEntry
2013-09-20 21:45:27 +02:00
e31f6c01e8
fixing PHPDoc
2013-09-20 21:43:17 +02:00
9116303cfc
fixing typos
2013-09-20 21:40:54 +02:00
d84d548618
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
2013-09-20 20:34:17 +02:00
e92abfd4d8
Add Config container class to server container
2013-09-20 20:21:24 +02:00
e3013c5801
Add Navigation class to server container
2013-09-20 20:20:01 +02:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
aa8a85f77d
Add DBConnection to server container
2013-09-20 14:33:45 +02:00
ac73ce1b2a
Add UserSession to server container
2013-09-20 14:32:43 +02:00
944e9b8c69
make sure that both $permissions and $oldPermissions have the same type
2013-09-20 12:40:21 +02:00
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
0a2a4cb12e
update inherit docs comment
2013-09-19 18:59:06 +02:00
55efe1e56c
Fix insert/update/delete helper functions for oracle
2013-09-19 18:13:39 +02:00
f6284bdce7
Add missing return true statements to legacy preferences functions
2013-09-19 18:13:06 +02:00
395cc737a1
Add missing static
2013-09-19 18:13:06 +02:00
445d34a2a9
Convert OC_Preference to object interface
2013-09-19 18:13:06 +02:00
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
9e4d13858c
Fix syntax error
2013-09-19 13:27:41 +02:00
d5126dd6b4
Merge branch 'appframework-master' into server_folder_methods
2013-09-19 12:32:32 +02:00
314ca843e8
Updated method names and added a few more tests.
2013-09-19 11:27:13 +02:00
76f8be3b7a
fixing namespaces and rename hasCategory to hasTag
2013-09-18 22:49:09 +02:00
690e98d45a
Merge branch 'appframework-master' into vcategories_public
...
Conflicts:
lib/server.php
2013-09-18 22:36:25 +02:00
1274d6116d
updating php docs
2013-09-18 22:22:51 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
09d043729a
Note to self 2: Do as you preach. Test!
2013-09-18 15:02:25 +02:00
79cd655920
Note to self: Test before pushing!!!
2013-09-18 14:50:21 +02:00
2ef0b58ff6
Don't try to be clever
2013-09-18 14:25:12 +02:00
dd62ccdb4e
Merge branch 'appframework-master' into public_cache
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-18 13:20:07 +02:00
534933ee9b
Use new emitter system
2013-09-18 13:15:38 +02:00
442a2e074c
Update to adhere to the coding guidelines.
2013-09-18 12:35:46 +02:00
6ba23912a7
Add getUserFolder/getAppFolder to Server.
2013-09-18 12:34:10 +02:00
d3f88ceeb4
Add some docs to the sessions interface.
2013-09-18 12:01:01 +02:00
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
ce58c32c90
using OC_Config::$object->setValue in order to get the underlying exception thrown up to the caller
2013-09-18 11:07:19 +02:00
5ae4d67540
in case the cache cannot be initialized within the autoloader we just shoul not use it
2013-09-18 11:06:00 +02:00
b0762ad3bf
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-18 00:37:00 +02:00
e760343b98
Merge branch 'appframework-master' into vcategories_public
2013-09-17 20:04:51 +02:00
8b4f4a79e2
Still some session leftovers.
2013-09-17 19:46:08 +02:00
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
5bddb5377a
Purge session from Request - and fix some styles
2013-09-17 18:38:18 +02:00
5c19b995db
Add interface for Session and add getter in server container.
2013-09-17 18:31:14 +02:00
1a13062701
Add legacy wrapper
2013-09-17 18:02:37 +02:00
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
b9e943f5d5
fix naming
2013-09-17 09:42:14 +02:00
4cd0ee47a8
Merge branch 'master' into appframework-master
2013-09-17 09:39:45 +02:00
822daa8f8a
class files have to be lowercase
2013-09-17 00:27:22 +02:00
981a41e2cd
adding interface for middleware
2013-09-17 00:26:55 +02:00
c8f9efeb94
etag changes are now propagated up the file tree
2013-09-16 23:32:17 +02:00
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
...
Fix Sharing "Expiration Date" on Oracle
2013-09-16 12:16:44 -07:00
3c026b7cf6
recreate an etag within the scanner if the cache contains an empty etag
2013-09-16 12:09:15 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
eab84d3d96
Add OCP\DB::getErrorMessage() to public namespace.
2013-09-16 02:17:39 +02:00
5d4e9e0d25
/OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized
...
This fixes unit test execution
2013-09-15 23:07:18 +02:00
af0069bf03
adding getRootFolder() to server container and hooking up the new files api
2013-09-15 22:24:57 +02:00
ad82a56f79
Merge branch 'master' into appframework-master
2013-09-15 21:18:59 +02:00
0f4e214a90
adding null check on a mount's storage
2013-09-15 20:40:40 +02:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-13 14:31:11 -07:00
4da8fc6907
Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
2013-09-13 20:57:18 +02:00
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
049e57ac4a
remove unused OC_L10N
2013-09-13 17:41:09 +02:00
8c9add4d32
adding TB and GB to OC_Helper::humanFileSize
2013-09-13 17:22:45 +02:00
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
786017c247
Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc.
2013-09-12 23:43:20 +02:00
7f07d737f8
Create instance of Doctrine\Common\EventManager() in OC_DB.
2013-09-12 23:43:20 +02:00
58ed78aa9e
cleanup public storage interface a bit
2013-09-12 21:58:32 +02:00
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
8543951cf9
adding icons for shared folders and external folders
2013-09-12 00:12:20 +02:00
62eeac3390
Merge pull request #4798 from owncloud/fixing-variable-typos-master
...
no further comment - which dev did not test this BEFORE submitting the p...
2013-09-11 05:58:07 -07:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
bf7f94422f
Bring another enable_avatars to $_ and fix $thus->$this
2013-09-11 07:11:33 +02:00
af2164bbcb
no further comment - which dev did not test this BEFORE submitting the pull request?
...
which reviewer did not test the pull request?
2013-09-11 01:23:37 +02:00
a2ade4294c
Merge pull request #4472 from owncloud/remove-disconnect
...
Remove disconnect function from OC_DB
* owncloud/remove-disconnect:
Remove disconnect function from OC_DB
2013-09-10 21:48:56 +02:00
2e5ce091f0
add storage backend interface to public namespace
2013-09-10 20:13:47 +02:00
9ad7891b4e
improve phpdoc for the public files interface
2013-09-10 20:10:25 +02:00
e271a55783
move filesystem expceptions to global namespace
2013-09-10 19:44:23 +02:00
315344eb9c
move public files api to a clearer namespace
2013-09-10 19:34:38 +02:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
63a5409c6e
Merge pull request #4757 from owncloud/deleteAll-alias
...
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
2013-09-09 15:08:18 -07:00
5e1821f21d
Merge pull request #4772 from owncloud/preview_improvements
...
oc\preview use avconv instead of ffmpeg
2013-09-09 12:32:45 -07:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
46a57a9f05
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
2013-09-07 14:10:51 +02:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
2e1b534957
update phpdoc for public fileapi
2013-09-06 20:55:47 +02:00
0131a32025
extract interfaces from fileapi for public namespace
2013-09-06 20:38:59 +02:00
1cfd03771f
use ===
2013-09-06 20:20:17 +02:00
b8241aa79d
remove some more debug output
2013-09-06 16:07:54 +02:00
edb78c917c
remove some error_logs
2013-09-06 16:07:45 +02:00
d33fabd02d
remove error logs
2013-09-06 16:07:25 +02:00
627b6164c4
if the files doesn't exist yet we start with the parent to search for shares
2013-09-06 16:07:07 +02:00
e9849270e3
Revert "fixes #4574"
...
This reverts commit 81a45cfcf1
2013-09-06 00:28:13 +02:00
221bbd275c
Use \OC_App for checking whether encryption is enabled
2013-09-05 23:26:02 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
2954db165b
use avconv instead of ffmpeg
2013-09-05 09:53:35 +02:00
fbedd643f7
Merge pull request #4477 from owncloud/hooks-view
...
also emit hooks for views that are a subfolder of the user folder
2013-09-04 16:09:22 -07:00
7618cf3005
adding public interface for preview
2013-09-04 23:45:11 +02:00
835f477d8f
Merge branch 'master' into appframework-master
2013-09-04 23:15:17 +02:00
b643c02bd5
Fix some bugs and remove \OCP\Avatar for now
2013-09-04 22:13:59 +02:00
68dce9dde5
fixing style, var name & PHPDoc
2013-09-04 21:22:36 +02:00
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
823b4cce60
More trimming
2013-09-04 08:16:27 +02:00
09187f3b3b
Merge pull request #4449 from owncloud/clean_up_util
...
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
fd7469db9e
coding-style fixes
2013-09-03 13:37:06 +02:00
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
431cf06e99
Merge pull request #4672 from owncloud/ocs_cleanup
...
Ocs cleanup
2013-09-02 14:24:46 -07:00
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
931e90634e
fix db queries
2013-09-02 17:03:35 +02:00
983da0d78f
fix db queries
2013-09-02 17:01:10 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
06870a6e39
Merge pull request #4673 from owncloud/ocsapi_cleanup
...
remove the activity call here. it is not implemented anyways.
2013-09-02 01:46:29 -07:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
74c9223281
Properly check for tmpavatar, invalidate cache, fix debug msgs
2013-09-01 21:17:48 +02:00
a22f9ff301
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-01 19:47:48 +02:00
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
ab70b8c26e
Merge branch 'master' into oc_avatars
2013-09-01 17:52:13 +02:00
36424580b0
Merge pull request #4329 from owncloud/fix_4258
...
Fix #4258 and improve unittest
2013-09-01 08:46:27 -07:00
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
2d6a400381
Check for $this->fileInfo and @depend on testData()
2013-09-01 15:50:58 +02:00
c54994d2e9
fixing this obvious typo directly
2013-09-01 08:23:11 +02:00
235638e5ab
Merge branch 'master' into fix_4258
...
Conflicts:
lib/image.php
2013-08-31 23:48:23 +02:00
206f83941b
move new interfaces into lib/public and OCP
2013-08-31 21:34:29 +02:00
97bdf008b1
PHPDoc added to existing interfaces
2013-08-31 20:57:16 +02:00
f1836a997f
remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
2013-08-31 18:14:46 +02:00
58e036e304
remove knowledgebase calls that are no longer used in ownCloud 5/6
2013-08-31 18:00:53 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
ec9b7d1e84
fixing file header
2013-08-31 01:41:24 +02:00
a9d6b59307
Merge branch 'master' into appframework-master
2013-08-31 01:38:44 +02:00
0869f9b655
Fix #4258 , clean up \OC_Image and improve its unittest
2013-08-30 21:08:37 +02:00
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
0f5df181a3
Merge pull request #4661 from owncloud/separate-app-styles
...
Move CSS for apps and browser-specific fixes out of main styles.css
2013-08-30 09:08:25 -07:00
4bbefdf608
add expiration date if it is already set
2013-08-30 17:20:10 +02:00
10cf1b3a4e
return mailSend status in getItems()
2013-08-30 15:39:43 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
95f42d6544
Merge pull request #4578 from houbaastef/master
...
fixes #4574
2013-08-30 06:20:07 -07:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
30526ded80
Fix \OCP\Avatar
2013-08-30 13:26:13 +02:00
7d398ba622
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
2013-08-30 11:45:16 +02:00
9c23ed580a
move CSS for browser-specific fixes out of styles.css into new fixes.css
2013-08-30 11:42:32 +02:00
cc8e19ad11
move CSS for apps out of styles.css into new apps.css
2013-08-30 11:38:49 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
0104d3df96
Merge pull request #4592 from owncloud/fix-logic
...
fix weird logical behaviour
2013-08-29 08:40:33 -07:00
14b67d6c5f
fixing typo
2013-08-29 16:25:25 +02:00
728fc7f123
fix parameter missing warning
2013-08-29 16:13:16 +02:00
1fa29b4c11
also emmit create hook when creating new files using touch()
2013-08-29 15:31:03 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
301cce54cc
webdav quota information contains the values for used and free - not total
2013-08-29 12:34:48 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
70b6e2161e
invert logic of disable_previews
2013-08-29 10:08:53 +02:00
0ba498119c
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 23:21:26 +02:00
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
d4952bd9df
fix typo
2013-08-28 18:36:32 +02:00
3fd2df4088
Only enable logrotate when configured. Also rotate size is settable.
2013-08-28 17:41:27 +02:00
42f3ecb60f
Check for installed state before registering the logrotate background job
2013-08-28 17:11:43 +02:00
62560ef859
Add description to log rotate class
2013-08-28 17:11:43 +02:00
594a2af75a
Review fixes
2013-08-28 17:11:43 +02:00
b5e2842e00
Very simple log rotation
2013-08-28 17:11:43 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
45076edf4f
Merge pull request #3891 from owncloud/fix_loadAppScriptFile
...
Check if the app is enabled and the app path is found before trying to l...
2013-08-28 06:10:06 -07:00
9843c8e838
Merge pull request #4434 from owncloud/fix_octemplate_escaping
...
Fix octemplate string escaping.
2013-08-28 03:59:43 -07:00
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
e91edabe0f
add documentation
2013-08-27 16:07:25 +02:00
273f162b26
Code style
2013-08-27 15:39:47 +02:00
f14ce1efdc
Add quota to core api
2013-08-27 15:39:43 +02:00
13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07:00
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
6e8bc13aa3
fix weird logical behaviour
2013-08-27 10:58:17 +02:00
d3d91ce347
revert debugging code which accidentially entered this pull request
2013-08-27 10:49:10 +02:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
Thomas Müller
Thomas Tanghus
Andreas Fischer
Bjoern Schiessle
Björn Schießle
Bart Visscher
Robin Appelman
Jörn Friedrich Dreyer
Bernhard Posselt
kondou
VicDeo
Arthur Schiwon
Georg Ehrke
Morris Jobke
Frank Karlitschek
Jan-Christoph Borchardt
Stephane Martin
Tom Needham