822e4d5f6c
Check for redirect_url for logged in users
...
This checks if there is a redirect_url for logged in users
2012-11-01 22:37:37 +01:00
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
553b1072b6
fix archive tar include path
2012-11-01 16:15:25 +01:00
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +01:00
8cffbb5f7d
Added some more error checking on db queries.
2012-10-31 20:47:04 +01:00
5a738380f6
Cast object ids to integers.
2012-10-31 20:06:39 +01:00
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -07:00
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
6d09752940
DRY for creating htaccess to protect data-directory
2012-10-30 20:57:19 +01:00
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
5af8adc169
code style changes
2012-10-30 12:17:15 +01:00
b032819ab9
check for database error in userExists
2012-10-30 11:08:32 +01:00
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
3fdf239b47
Merge pull request #147 from owncloud/htaccess-upgrade-check
...
Generate .htaccess when upgrading from old versions
2012-10-29 16:28:46 -07:00
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
f6b6780072
Don't use OC_Setup as it will show up the installer
2012-10-29 22:44:49 +01:00
6903475841
Generate .htaccess when upgrading from old versions
...
When upgrading from old ownCloud versions like 2.x the .htaccess is not
generated - which exposes the data to the internet. This fix will
generate a .htaccess when upgrading. (And no one exists)
Fixes #127
2012-10-29 22:03:18 +01:00
2e1199acb8
Merge pull request #133 from fmms/checkstyle02
...
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
ac784baef6
Generate only one CSRF token
2012-10-29 16:35:29 +01:00
4d61eb3e4c
Fix a typo
2012-10-29 16:33:39 +01:00
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
40fe6c6346
Remove subnavigation key, not used
2012-10-29 15:04:55 +01:00
4d03b3dbaf
Add ETag caching for Javascript routes
2012-10-29 15:04:55 +01:00
a7806076b1
Move generating cache key from files from OC_Minimizer to OC_Cache
2012-10-29 15:04:55 +01:00
5aec26a37c
Fix MySQL install, bug fix for issue 132
2012-10-28 19:50:26 -04:00
a6e18e0b6d
Check if error_report() is equal to 0, so suppressed errors aren't logged e.g. the htaccesstext.txt fopen failing
2012-10-28 19:38:57 -04:00
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
5d640f9ae3
NoSpaceAfterComma
2012-10-28 18:28:16 +01:00
b7a02f0c93
NoSpaceAfterComma
...
first in new branch
2012-10-28 18:12:31 +01:00
6bc156ba69
add svg mimetype to default htaccess
2012-10-28 16:03:52 +01:00
be215a097a
check if RUNTIME_NOAPPS is set before using it
2012-10-28 15:10:22 +01:00
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
b8a48b55a3
make sure all filesystem apps are loaded when setupFS is proceeded, to make sure the emmited setup-hook is received. Fixes #89
2012-10-28 13:48:08 +01:00
5b9ba2e033
remove whitespaces, no code change
2012-10-28 13:48:08 +01:00
bf3dac05d1
added functions for printing escaped and unescaped values
2012-10-28 13:28:22 +01:00
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
b079447988
Add API method for sharing a file, currently only via a link.
2012-10-28 11:06:47 +00:00
07111ff672
Allow apps to pass defaults and requirements for their API calls
2012-10-28 11:04:23 +00:00
b07672821b
check for changes when using the cache api
2012-10-28 11:43:45 +01:00
fba7be1194
add filesystem watcher to detect updates
2012-10-28 11:39:37 +01:00
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
c964fe9f8d
merge master into filesystem
2012-10-27 18:11:52 +02:00
79d0ac21cc
delete child entries when a folder gets removed from cache
2012-10-27 18:08:00 +02:00
56e9ce44c3
add a way to recalucale the size of a folder in the cache
2012-10-27 18:08:00 +02:00
0d3f68cc7a
fix function documentation
2012-10-27 18:08:00 +02:00
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
894d44e796
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
...
Conflicts:
lib/base.php
2012-10-27 16:33:10 +02:00
8a3eda16f2
fix function documentation
2012-10-27 15:53:10 +02:00
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
5bfff6c56e
use absolute paths when resolving mount points
2012-10-27 12:17:35 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
43e8293d9c
Change Symfony/Component/Routing from submodule to composer fetching
2012-10-27 11:32:16 +02:00
3437071cf1
remove old searchByMime
2012-10-27 10:40:27 +02:00
fcc92a9f43
add searchByMime to new cache api
2012-10-27 10:34:25 +02:00
d0bbd9416b
Add BackgroundJob::setExecutionType() to public API
2012-10-27 10:15:39 +02:00
9cf9d41e51
Add a new backgroundjob class to access the type of background jobs easily
2012-10-27 10:08:56 +02:00
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
695405dfeb
add permissions data to the results of the cache api
2012-10-27 10:01:20 +02:00
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
9953427197
also use new cache api here
2012-10-26 23:26:12 +02:00
7d6da68d53
prove some compatibility with the old cache api
2012-10-26 23:25:52 +02:00
a48734bcb5
fixed user/group sharing hooks
2012-10-26 23:15:37 +02:00
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
fe75793815
Split database setup code to functions
2012-10-26 22:48:57 +02:00
4b616764e8
Merge branch 'master' into filesystem
2012-10-26 22:32:44 +02:00
b7bf28d1c7
Hook emission on sharing stuff
2012-10-26 20:53:32 +02:00
d428d72dab
Fix mimetype detection with the 'file' utility
2012-10-26 21:02:04 +03:00
c22a723785
add file permissions cache
2012-10-26 19:07:29 +02:00
ad5957207d
merge master into filesystem
2012-10-26 18:29:24 +02:00
ad720c4c17
possible fix for bombarding the server with the htaccess test during setup
2012-10-26 18:24:06 +02:00
286fd78865
Merge branch 'master' into filesystem
2012-10-26 17:40:57 +02:00
8bce661e4d
add search to the filecache api
2012-10-26 13:23:49 +02:00
1888ac0d41
add the possibility to add an preupdate.php
2012-10-26 13:10:56 +02:00
7ef0ffe8ad
add View->putFileInfo to the filecache api
2012-10-26 12:43:23 +02:00
e63e246c48
fix problem with normalizePath when there was a double leading slash
2012-10-26 12:37:49 +02:00
39adadd3e3
move the cache api from OC_Files to filesystem(view)
2012-10-26 12:30:25 +02:00
0e2bf8d373
Merge branch 'master' into filesystem
2012-10-26 10:42:41 +02:00
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
d9d8da0a5c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-25 20:34:03 +02:00
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
228a05a792
Check for iconv
2012-10-25 16:49:55 +02:00
55277c8e5a
Allow any characters in the groupname
...
Fixes #82
2012-10-25 11:54:31 +02:00
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
2fc495a91a
Also delete category/object relations when deleting a category.
2012-10-24 22:39:34 +02:00
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
515e1b467e
Merge pull request #81 from fmms/master
...
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
0c2a4264c9
normalize path
2012-10-24 17:39:39 +02:00
5a3d6805a2
cleanup OC_Files a bit
2012-10-24 15:52:30 +02:00
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
a7eb56c799
Merge pull request #76 from fmms/master
...
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
f112d8cd69
Merge pull request #75 from fmms/master
...
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
561cbb2de6
NoSpaceAfterComma II
2012-10-23 23:01:10 +02:00
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
73f85c3b81
Merge pull request #62 from fmms/master
...
More Checkstyle warnings
2012-10-23 08:07:01 -07:00
d18ea0e76c
Merge pull request #40 from scambra/dateformat-fixes
...
Dateformat fixes
2012-10-23 08:06:28 -07:00
56c7ee799c
use strtotime on non-nummeric times in oc_filesystem::touch
2012-10-23 16:37:46 +02:00
7fdbce6ac1
use strtotime on non-nummeric times in oc_filesystem::touch
2012-10-23 16:36:09 +02:00
9601352d46
fix strftime in windows, use %#d instead of %e in windows
2012-10-23 16:24:54 +02:00
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
ab944094e2
Merge pull request #12 from scambra/fixes
...
check free space using folder's owner
2012-10-23 07:02:21 -07:00
fbe059afd3
Merge pull request #59 from fmms/master
...
Starting point to take care of Checkstyle warnings
2012-10-23 06:58:15 -07:00
726409b272
Merge pull request #58 from fmms/master
...
Translate headings in search results (fixes #55 )
2012-10-23 04:43:25 -07:00
b43b85c849
get effective username after webdav login, fixes oc-2108
2012-10-23 13:38:46 +02:00
b66dd3ebef
Merge pull request #38 from scambra/datepicker-l10n
...
Translate Datepicker
2012-10-22 23:53:24 -07:00
36d0d75901
Codestyle: FunctionCallArgumentSpacing
2012-10-23 08:35:54 +02:00
ff5f9370c4
Checkstyle: MultiLineCondition
2012-10-23 08:25:30 +02:00
ddfcc96ab5
Checkstyle: LowerCaseConstant
2012-10-23 08:20:17 +02:00
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
befdd6b63b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-23 06:23:03 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
6a00a6b9ed
Make Jenkins more happy.
...
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
65619af05b
Disable enhancedauth by default
...
Admins can still enable it via config.php
2012-10-22 23:04:39 +02:00
03581ef463
Correct a first issue Checkstyle is complaining about ...
...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
37296b8b6d
Adding the t() function to have the labels in the search results translated
...
This should solve #55
2012-10-22 20:55:05 +02:00
126d16f16d
Fixing undefined $language
2012-10-22 17:09:34 +03:00
69cf89c5f6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-22 15:41:39 +02:00
b5817dcc2e
Added missing backtick to sql query.
2012-10-22 15:41:00 +02:00
d68b89cae4
add parameter to specify user for which OC_Filesystem should be initialized.
...
(needed to share files via public links where no user is logged in)
2012-10-22 14:55:53 +02:00
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
707bd68bb4
automatically scan files when needed
2012-10-21 22:05:29 +02:00
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
2522c25af7
use OC_Files::getFileInfo and OC_Files::getDirectoryContent as high level api for the filecache
...
most apps would want to use this api instead of using the cache directly
2012-10-21 02:12:58 +02:00
01594b8610
remove chroot from filesystem api
2012-10-21 00:54:34 +02:00
3ff0772a05
add getCache and getScanner to storage api in order to allow storage backends to overwride caching behaviour
2012-10-21 00:31:32 +02:00
1901ac8b17
drop depricated is_readable and is_writable
2012-10-21 00:13:16 +02:00
cfa036eaa9
drop filectime from the filesystem api's
2012-10-20 23:58:07 +02:00
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
051dde08db
Check for file exists before loading app version file
2012-10-20 23:49:55 +02:00
26618704a9
Fix accidentally creating new categories with the id as name.
2012-10-20 13:45:18 +02:00
ab167c3e2c
Filter out special Favorites category.
2012-10-20 13:42:57 +02:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
2456401672
Remove redundant class wrapping.
2012-10-19 18:11:13 +02:00
10e29da8be
Use self::prepare() instead of self::$connection->prepare.
2012-10-19 17:21:23 +02:00
394e4e4d5f
Removed useless ORDER BY from query.
2012-10-19 16:15:47 +02:00
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
1803260285
Renamed OC_VCategories::add() to addMulti() and let the add() method return the id of the newly created category.
2012-10-19 13:21:05 +02:00
0e4ed2887c
Return result from OC_DB::insertIfNotExist().
2012-10-19 13:20:08 +02:00
afa3f49c93
Make categories var static.
2012-10-19 02:26:36 +02:00
4827de4a27
White space fix.
2012-10-19 00:20:27 +02:00
3b6cfe4977
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 00:17:28 +02:00
8a777022e4
Formatting
2012-10-19 00:16:53 +02:00
09e26145b7
Add favorite handling methods to OC_VCategories.
2012-10-19 00:15:58 +02:00
1f7baeb974
Use consts all places and rename some daft method names.
2012-10-19 00:13:34 +02:00
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +02:00
08ee2fcf93
check if mount point was already loaded to avoid redundant read operations
2012-10-18 17:30:01 +02:00
65b0824d35
typo from previous commit fixed
2012-10-18 17:15:30 +02:00
2499c24b8b
load system wide configured mount points before accessing shared files
2012-10-18 17:15:30 +02:00
00ed2e87c9
check for mount points if file was shared from a different user
2012-10-18 17:15:30 +02:00
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
a7d8519550
when using oracle use LOWER() to make searching files case insensitive
2012-10-18 14:19:34 +02:00
265f3654af
all unit files_encryption crypt unit tests now passing after merge
2012-10-17 16:35:19 +01:00
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
b2b84f3a6f
Update Sabre to version 1.7.1
2012-10-17 16:17:36 +02:00
44287d680b
Check for file exists before loading app version file
2012-10-17 14:06:25 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
26e92094a6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-17 12:30:14 +02:00
04824162d9
core.js and core.css don't need to be absolute
2012-10-17 10:52:16 +02:00
8cd268fc82
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-17 00:16:37 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
c00f5d164f
Fix unshareAll()
2012-10-16 16:27:23 -04:00
379b775a56
Delete user files in /data/ after deleting a user
2012-10-16 22:05:06 +02:00
012ea1ed83
Add unshareAll() function to Share API
2012-10-16 15:38:52 -04:00
247626b5c2
Merge pull request #36 from scambra/filecache-fixes
...
delete fscache on deleting user
2012-10-16 11:46:50 -07:00
d8eb62232e
don't duplicate locales with country code
2012-10-16 20:31:46 +02:00
ec253f1354
Use strftime to format date with translated month names
2012-10-16 20:19:35 +02:00
de7b46c66a
Use `get_magic_quotes_gpc()` to determine if magic_quotes is enabled
...
set_magic_quotes_runtime gives a PHP warning
2012-10-16 19:42:17 +02:00
8b01286a5d
Merged branch 'master'
2012-10-16 16:57:07 +01:00
e8441becdb
delete fscache on deleting user
2012-10-16 17:34:35 +02:00
102dd1242e
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-16 16:57:25 +02:00
e7c9d5fe54
Set oc_token to httponly
2012-10-16 13:53:40 +02:00
59404b5675
Merge pull request #31 from visit1985/persistentcookies
...
reresubmit: improved persistent cookies :)
2012-10-16 04:46:22 -07:00
e299c241df
Make enhanced auth configurable
2012-10-16 01:08:05 +02:00
c85c35dfae
Don't add the enhanced auth time to the configuration
2012-10-16 01:04:34 +02:00
5c0407306c
Set a standard value for enhanced auth time
2012-10-16 01:04:20 +02:00
6f2e8788ca
Make enhanced auth time configurable
2012-10-16 01:02:03 +02:00
f4142bd2a8
Move isUserVerified to OC_Util
2012-10-16 00:47:38 +02:00
77e18b01ba
Move the ( to the right position
2012-10-16 00:47:38 +02:00
91d4b23efe
Fix PHP notice
2012-10-16 00:47:38 +02:00
1a187d1ca5
Fix PHP notice
2012-10-16 00:47:38 +02:00
097f429816
Add isUserVerified()
2012-10-16 00:47:38 +02:00
ddcd738357
Merge branch 'extended_log'
...
PHP errors logging into the owncloud log
2012-10-16 01:30:45 +03:00
c9ac1364d1
"deny from all" instead directory
2012-10-15 23:35:27 +02:00
3eb43c1fbe
Show a warning in the installer if .htaccess is not working
2012-10-15 23:25:15 +02:00
9c9f5ef2d6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-15 21:41:38 +02:00
8be9c04a3a
128byte is not 128bit - now we realy use 256bit (same as PHPSESSID)
2012-10-15 20:04:22 +02:00
fa71e51e67
Use /dev/urandom instead of /dev/random
...
The usage of /dev/urandom is enough secure
2012-10-15 19:21:37 +02:00
6e045b9ea1
Check if $_Post
2012-10-15 17:42:38 +02:00
1c865f702c
Change verifyUser so that external json files can call it
2012-10-15 17:42:38 +02:00
4d7b0e9bb3
verifyUser() for the json part
2012-10-15 17:42:38 +02:00
d33bec09fe
Verify password page for users
2012-10-15 17:42:38 +02:00
f08ff3b6e6
Correct formatting
2012-10-15 15:25:40 +03:00
c930ac9f88
Merge pull request #30 from visit1985/logonpage
...
extend logon page to display multiple error messages
2012-10-15 03:52:11 -07:00
22fa23b4da
extend configkey column to hold 128bit values
2012-10-14 22:37:05 +02:00
ae1f33db54
implement fixed php session timeout and session id regeneration
2012-10-14 22:36:26 +02:00
b92fd984aa
removed username and password from token generation
2012-10-14 22:36:26 +02:00
a6c4046f48
fixed typo and redundant method call
2012-10-14 22:36:25 +02:00
d8fe6fbb40
added a warning message to the log when a cookie is rejected
2012-10-14 22:36:25 +02:00
382f8d060c
fixed wrong variable usage
2012-10-14 22:36:25 +02:00
38b9bffaea
call unsetMagicInCookie if token is invalid
2012-10-14 22:36:25 +02:00
eb79ccafe3
forgot a class name
2012-10-14 22:36:25 +02:00
2ea06f67bd
delete all tokens on password change
2012-10-14 22:36:25 +02:00
45f1c3f120
further improvements on multiple login token support
...
outdated tokens are deleted before checking against cookies
if an invalid token is used we delete all stored tokens for saveness
used token will be replaced by a new one after successful authentication
2012-10-14 22:36:25 +02:00
ee5d0f328f
improve token security
...
switched from time() to internal method OC_Util::generate_random_bytes()
2012-10-14 22:36:25 +02:00
4b799a6982
Make the lifetime of the remember login cookie
2012-10-14 22:36:25 +02:00
7f3e0b5566
Cleanup login tokens on login success
2012-10-14 22:36:25 +02:00
1012d317e3
Add support for multiple login cookie tokens
2012-10-14 22:36:25 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
7095b3a083
extend logon page to display multiple error messages
2012-10-14 19:57:24 +02:00
2c427f050e
Show a warning in the installer if no secure RNG is available
2012-10-14 17:18:30 +02:00
d6c4b83f13
Fallback to /dev/random if openssl_random_pseudo_bytes not available
2012-10-14 16:14:45 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
93cbd96662
don't increase the size of the users home folder twice
2012-10-13 14:52:58 +02:00
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
77fbdb2ca8
Fix the require path
2012-10-13 01:10:04 +02:00
e38b736a1e
fix bug #1977 : remove etags from database after version rollback so that the client can detect the changes
2012-10-12 17:37:59 +02:00
079f0788d2
this is no longer needed, commit cb91e27ab3 should fix the issue
2012-10-12 17:35:57 +02:00
d4fd83301a
remove unneeded variable
2012-10-12 16:33:57 +02:00
cb91e27ab3
check if directory already exist before executing mkdir
2012-10-12 16:31:03 +02:00
9a35bd76fb
Use resolved path for require_once in autoloader
2012-10-12 15:47:41 +02:00
351f724193
whitespace fixes
2012-10-12 15:47:41 +02:00
d589869a34
disable log when running tests
2012-10-12 15:45:05 +02:00
d7f43945e7
nortmalize path before adding it to the fscache to avoid multiple fscache entries for the same file
2012-10-12 10:26:49 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
c721eefe8e
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-11 22:25:20 +02:00
86d978be78
add *.ai files to the mimetypes list
2012-10-11 16:14:29 +02:00
4d451f649d
fixed offset calculation (bug #1961 )
2012-10-11 12:42:57 +02:00
7a30f46543
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-10 23:00:46 +02:00
2c3674ea87
Add logging when stripping apps from autoload include path
2012-10-10 21:06:15 +02:00
d4feb77eaf
Remove unused search code
2012-10-10 21:06:15 +02:00
c5983d37ad
No need to use array_search
2012-10-10 21:06:15 +02:00
fe40277ec2
Use __DIR__ instead of __FILE__ to get SERVERROOT
2012-10-10 21:06:15 +02:00
4da67b0a08
Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests
2012-10-10 18:40:59 +01:00
d525654fcd
Correct indentation
2012-10-10 19:01:32 +02:00
cda2135966
Send a HSTS HTTP header to enforce SSL
2012-10-10 18:56:14 +02:00
5c6e9518ed
drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath
2012-10-10 17:46:29 +02:00
fe5b4d2fba
marks as 5.0 pre alpha
2012-10-10 15:35:19 +02:00
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
c88c54bbb0
make sure we can do our tests again
2012-10-10 12:51:15 +02:00
4b9fbf46e5
add depricated OC_Filessystem for compatibility
2012-10-10 12:50:57 +02:00
07c5384189
fix namespaces in filesystem and filesystemview
2012-10-10 12:25:46 +02:00
9df60d27bd
move some code around
2012-10-10 11:54:44 +02:00
d717a5e55c
remove old filecache
2012-10-10 11:51:14 +02:00
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
38e9bc2adb
extract the right parent directory from the path
...
add parent directory to the file cache if it does not exist yet.
2012-10-09 16:24:49 +02:00
8e0676a66b
4.5 final
2012-10-09 16:02:01 +02:00
2bd4035076
$CONFIG_DBTYPE was never assigned but used in this function
2012-10-09 11:17:10 +02:00
003241e847
fix for bug #1942 : Allow user to share with every group if "allow users to share with anyone" is set
2012-10-09 10:36:24 +02:00
67a4aa7cf0
RC 3
2012-10-08 23:58:17 +02:00
035d83fe91
don't use the workaround for shared files on the /Shared folder
2012-10-08 23:37:50 +02:00
025d308929
Actually fix shared webdav access
2012-10-08 17:21:52 -04:00
33d1906f23
Fix getting file info for subfolders in shared folders
2012-10-08 16:05:57 -04:00
dc116b994d
reenable hack to use CURRENT_TIMESTAMP for postgresql when creating the database, fixes oc-1852
...
TODO for OC5: use CURRENT_TIMESTAMP for all databases. mysql supports it as a default for DATETIME since 5.6.5 [1]
as a fallback we could use <default>0000-01-01 00:00:00</default> everywhere
[1] http://bugs.mysql.com/bug.php?id=27645
http://dev.mysql.com/doc/refman/5.0/en/timestamp-initialization.html
http://www.postgresql.org/docs/8.1/static/functions-datetime.html
http://www.sqlite.org/lang_createtable.html
http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
2012-10-08 17:24:15 +02:00
b296328c61
put all the calls into one function and use tabs instead of spaces. Thanks to danimo for bugging me :-)
2012-10-08 15:58:50 +02:00
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
13515effc9
add Cache::getStatus
2012-10-08 14:58:21 +02:00
e7899e17de
merge phpunit into filesystem
2012-10-08 13:53:53 +02:00
3affeb5bd7
destroy invalid sessions
2012-10-08 13:36:11 +02:00
8357754ff1
added "uid_owner" to select statement
2012-10-08 13:22:08 +02:00
e9f04bedd4
add a sane socket timeout so that the interface stays responsive with a slow or not working internet connection
2012-10-08 12:00:29 +02:00
b7a5cc2fda
use socket timeout of 10 sec to stay responsive even with a slow internet connection or a not working server
2012-10-08 11:53:00 +02:00
5f462ec6f7
Fix - "Correct checking item source for share from same owner when generating item target"
2012-10-06 18:13:11 -04:00
5eaf95eedd
check for SimpleXML which seems to bw non default on Free BSD
2012-10-06 17:37:38 +02:00
5d196f14db
set folder size to 0 when scanning the filesystem
2012-10-05 22:35:51 +02:00
c2b4e53453
Add API description to OC_Route and OC_Router
2012-10-05 17:42:46 +02:00
ee6d96b7a8
really fix checkstyle on archive tar
2012-10-05 12:54:18 +02:00
b5f11195af
fix checkstyle on archive zip/tar
2012-10-05 12:42:11 +02:00
00b34a09ea
cache tar archive headers
2012-10-05 12:29:36 +02:00
f493e97f5d
always generate access token, also for forms shown to anonymous users (e.g. public shares)
2012-10-05 10:32:38 +02:00
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
ccf8df4405
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-05 02:11:30 +02:00
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
667d60e133
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-03 17:44:34 +02:00
b9b9fd9dba
more tests and fixes for the filesystem scanner
2012-10-03 13:07:19 +02:00
2d86258fc3
RC2
2012-10-03 12:39:48 +02:00
85be00be65
add some more test cases for the scanner
2012-10-03 11:40:09 +02:00
3c8e5ea358
this index cant be unique due to collisions of the root of different storages
2012-10-03 11:31:13 +02:00
e415e90c6d
make filestorage scanner non-static and add a simple test case
2012-10-03 11:24:49 +02:00
96d7cd5997
correct namespace usage in common filestorage backend
2012-10-03 11:24:10 +02:00
636c75ce06
better parent path bahaviour for the filecache
2012-10-03 11:23:33 +02:00
6134e554f2
new filecache table
2012-10-02 23:46:35 +02:00
92555eff71
add encrypted column to the new filecache
2012-10-02 23:34:45 +02:00
ac44506b40
Merge branch 'master' into filesystem
2012-10-02 23:29:13 +02:00
2c1c7eadaf
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-02 23:24:54 +02:00
6bfb2ca2a8
Added post_deleteUser hook to VCategories. Added methods for adding/removing object/category relations.
2012-10-02 22:47:59 +02:00
68c8faf39c
Correct checking item source for share from same owner when generating item target
2012-10-02 16:37:39 -04:00
431d92e7b2
we are sharing the same file again if item_source of the already shared file and the newly shared file is the same. Therefore we can use the same target name
2012-10-02 21:37:10 +02:00
db954f5aba
remove unnecessary code and add missing items to select statement
2012-10-02 18:59:20 +02:00
3e3038cafc
merge all possible conflicts into on array
2012-10-02 13:10:46 +02:00
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
783c02eda9
fix create folder and upload file issue on win, fixes oc-1747, solution follows suggestion from bug tracker
2012-10-02 11:45:47 +02:00
c6c0fcc7c8
We can't rely on the assumption that if the matching target is from the same owner that the share type will be different.
...
Files in different folders can have the same name. Therefore also a unique name has to be generated if the matching
target it from the same user. Also for folders and files with the same name a unique target name has to be generated
If matching target is from the same owner, use the same target. The share type will be different so this isn't the sa
2012-10-02 11:41:26 +02:00
7d25443937
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-01 23:41:21 +02:00
68fa2b10da
Search: fix Notice and thus broken search with activiated error reporting
2012-10-01 19:11:26 +02:00
b7eb3f3dff
merge master into filesystem
2012-10-01 14:21:49 +02:00
91d12a2f3d
update the filecache by setting mtimes to 0 when the mount configuration has changed instead of clearing the cache
2012-09-30 16:12:16 +02:00
113c339c41
fix updating the filecache for when contents of a folder has changed
2012-09-30 16:11:01 +02:00
241862756e
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-09-30 06:51:40 +02:00
258782584e
fix mimetype detection using the 'file' command in some edge cases
2012-09-30 03:58:58 +02:00
f8eebcbb01
reload the current url when login in instead of always redirecting to the default app (oc-1873)
2012-09-30 03:47:37 +02:00
e8afb3d312
Fix a typo
2012-09-30 00:08:20 +03:00
210ea4d9d9
fix actioninclude
2012-09-29 18:03:34 +02:00
ef57e9294b
Fallback for systems without openssl
2012-09-29 16:44:02 +02:00
992c2c9d4b
mt_rand() is not secure from a cryptographic point of view, let's use openssl_random_pseudo_bytes() here
2012-09-29 15:41:13 +02:00
578aa4e425
Removed sectoken
...
This token is completly useless since an attacker can easily extract it
from the page.
2012-09-29 15:18:38 +02:00
bd804b74c4
mt_rand() is not secure from a security point of view and predictable. Let's use openssl_random_pseudo_bytes() instead.
...
Before: 26 bits entropy
After: 72 bits entropy
2012-09-29 15:03:09 +02:00
dc66e94ee3
[tx-robot] updated from transifex
2012-09-29 02:04:55 +02:00
d0bd2bbf27
Convert menu entries of settings pages to use router
2012-09-28 23:20:17 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
dbdf3bde7c
Implement route for download in OC_Search_Provider_File
2012-09-28 22:20:17 +02:00
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
fed34aecfa
Fix syntax error in removeETagHook
2012-09-28 21:30:06 +02:00
24bb7d16b7
urlencode filename in search result, fixes problems with & in name
2012-09-28 21:18:20 +02:00
366ae6661d
Simplify generating file search results
2012-09-28 21:18:20 +02:00
cfc9839812
Merge pull request #19 from arkascha/master
...
Reimplementation of CSRF protection strategy
2012-09-28 10:54:11 -07:00
71454b1bca
Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations)
2012-09-28 18:57:20 +02:00
35357f3afb
etag has to be removed after version rollback to enable the sync client to detect the changes (bug #1829 )
2012-09-28 18:50:36 +02:00
f8f73e2675
move back to "lastmodified" property since "getlastmodified" is protected by webdav
2012-09-28 18:50:36 +02:00
bf1057143c
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
2012-09-28 15:38:49 +02:00
4dbd4c35c5
Merge branch 'master' of git://github.com/owncloud/core
2012-09-28 13:31:01 +02:00
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
e8df2eeefc
some more sane column sizes for appconfig and preferences
2012-09-27 22:49:01 +02:00
cf14ad2f7d
RC 1
2012-09-27 04:10:19 +02:00
88bca9bc49
Merge branch 'master' into filesystem
2012-09-26 17:52:28 +02:00
522d7df860
convert Cache to a non-static class that handles the cache for a single storage backend
2012-09-26 17:52:02 +02:00
a7292e897a
The mtime in the file cache has to be updated after version rollback (copy from outside of the regular files root) (fixes bug #1720 )
2012-09-26 17:03:54 +02:00
2b6869bcea
Uncaught exception logging
2012-09-26 14:38:06 +03:00
50d7cfbbe7
prepare server for move of property name "lastmodified" to "getlastmodified" according to RFC4918.
...
Depreciated const can be removed after sync client update and release
2012-09-26 13:06:43 +02:00
fcd70246db
Merge branch 'master' of github.com:owncloud/core
2012-09-26 10:50:06 +02:00
c3c6e52104
- take webdav namespace for properties into account
...
- change update routine to add the namesapce to all stored properties
2012-09-26 10:48:30 +02:00
b4e40b1c21
Fix unsetting share expiration date
2012-09-26 00:09:35 -04:00
f967bfc956
Properly format the share expiration time for the database, fixes bug oc-1779
2012-09-25 23:54:46 -04:00
737a6730db
Add OC_Files::searchByMime function
...
Include shared files in result
2012-09-25 21:15:01 +02:00
c4fc291fa7
Passwords containing a ":" don't work with this explode
...
Thanks to mETz
2012-09-25 19:57:40 +02:00
a8ff1505d6
backwards compat to older xcache versions, don't fail when trying to clear cache by prefix
2012-09-25 11:47:53 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
a80e0403a1
Fix getting individual shared file information
2012-09-24 21:12:32 +02:00
1e2074b4eb
use file instead of dir in search provider file fix result urls
2012-09-24 19:24:20 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
dcf995fff3
add Cache::getFolderContent
2012-09-23 15:25:03 +02:00
eed1ccd164
Merge branch 'master' into filesystem
2012-09-23 02:41:31 +02:00
4131b205d4
fix some more phpdoc
2012-09-23 02:40:03 +02:00
f71f731f1c
fix phpdoc and handle some edges cases better in oc_db
2012-09-23 02:40:03 +02:00
6fafd5d4e9
this should be done elsewhere if needed
2012-09-23 01:46:52 +02:00
97b0eabc85
fix several problems in the new filecache in order to complete the tests
2012-09-22 15:43:48 +02:00
46896be0d4
fix namespace error in temporary storage backend
2012-09-22 15:03:17 +02:00
b206d16b10
add support for loading namespaced test cases
2012-09-22 14:51:34 +02:00
153cd802a9
add partial file data to the result of Cache::get
2012-09-22 14:40:04 +02:00
93292516d9
Merge branch 'master' into filesystem
2012-09-22 14:28:14 +02:00
80aa44565b
Sanitize user input
2012-09-22 10:51:03 +02:00
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
ac69974d73
Merge pull request #17 from scambra/4.5-l10n-fixes
...
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
40a1899bd9
Catch exceptions when updating an app
2012-09-21 23:32:52 +02:00
4f4498e0d6
Fix undefined user var, use getUser
2012-09-21 21:29:37 +02:00
8820cd934a
Forgot to return the fileinfo
2012-09-21 21:28:53 +02:00
b6dc6c5bb9
Don't use OC_FileCache directly, but use the functions in OC_Files
...
This adds getFileInfo to OC_Files to also get fileinfo from shared files
2012-09-21 13:31:12 +02:00
e48811017d
fix translation for core/lostpassword
2012-09-21 11:54:47 +02:00
59a00f95c3
use AL32UTF8 charset to connect to oracle, fixes file name encoding problems
2012-09-20 21:07:54 +02:00
a4082a526f
escape user column in OC_FileCache::clear
2012-09-20 21:06:46 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
74ec2765b3
db indexes for appconfig and preferences
2012-09-20 01:36:52 +02:00
2b5133a1c4
check free space using folder's owner
2012-09-19 21:31:29 +02:00
86c3761615
Catch unreadable app folder error
2012-09-19 19:26:57 +00:00
fe7288b65a
beta 4
2012-09-19 16:32:40 +02:00
93d0defe9a
set configuvalue in table appconfig back to clob. Likely to break LDAP settings, probably responsible for some bugs with it. Might also cause damage in other apps. That's why it was once already set to clob
2012-09-19 12:55:07 +02:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
703aff6c35
Run proxies and emit signals when finising chunked upload
...
Otherwise the file cache and the quota isn't checked
2012-09-18 20:23:17 +02:00
30188847a3
Only try to delete migration.db if it was created.
2012-09-18 16:25:34 +00:00
be76a55ef0
Allow exporting of users from any user backend, fixed oc-1645
2012-09-18 16:24:39 +00:00
9df403f051
Added failsafes for retrieving remote apps on settings->apps page, in case categories or app data are not found
2012-09-18 16:55:03 +01:00
2570ea7114
don't interpret strpos '0' as 'false' in while loop
2012-09-18 16:14:04 +02:00
dc0dc56d48
Merge branch 'master' of https://github.com/owncloud/core
2012-09-18 14:36:08 +01:00
b765e883f3
Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
...
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
2a8ff8a0d4
fix problem with quota proxy when using copy
2012-09-17 22:16:07 +02:00
82ffefb99b
dont trigger filesystem hooks when not using the default view
2012-09-17 22:16:07 +02:00
b1bab6d113
Check format of chunked filename
2012-09-17 20:00:31 +02:00
ce10e1c19a
Fix return statement
2012-09-17 20:00:31 +02:00
ab33578add
Normalize path before calling removeETagPropertyForPath
...
This should also fix the dirname problem on windows
2012-09-17 20:00:31 +02:00
92413217b3
Merge branch 'master' of github.com:owncloud/core
2012-09-17 17:03:57 +02:00
1207ae1f99
add leading '?' to parameter list (fixes bug #1732 )
2012-09-17 17:02:17 +02:00
9da150cd3b
use user name as db name for oracle connection made with service name
2012-09-17 16:32:24 +02:00
3273beb887
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-09-17 16:11:20 +02:00
b1a6acde30
Added separate table for OC_VCategories and category/object (event/contact etc.) relations.
2012-09-17 16:03:15 +02:00
ffe04182a8
Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist().
2012-09-17 16:01:25 +02:00
88b786e8dd
Merge branch 'master' into ocs_api
2012-09-17 12:09:34 +00:00
3ea01df1cd
API: Parse PUT and DELETE variables
2012-09-17 12:08:17 +00:00
8926038591
API: Fix merge conflict remnants
2012-09-17 12:07:42 +00:00
a3718ca036
i just learned that we also have to check if directories are readable. it seams that is_readable also checks for 'x' right.
2012-09-16 22:49:03 +02:00
954596c251
rework filecache to work directly on storage backends wip
2012-09-16 16:52:32 +02:00
fbdefd5601
[tx-robot] updated from transifex
2012-09-15 02:05:52 +02:00
0f07226270
API: Allow admins to access SUBADMIN api methods
2012-09-14 13:41:06 +00:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
fdecee1bda
Check if categories is an array.
2012-09-13 17:30:26 +02:00
a8c82440d0
API: Use http authentication, check the auth level required
2012-09-13 15:18:38 +00:00
8b409dfe2a
API: Default to user authentication level
2012-09-13 14:15:04 +00:00
b261c980c7
Fix autoloader merge conflict
2012-09-13 10:50:10 +00:00
182f890110
Remove a merge conflict
2012-09-13 10:32:35 +00:00
227ada3257
Fix merge conflicts
2012-09-13 10:23:41 +00:00
fa5dff22a0
API: Require api calls to register the required auth level
2012-09-13 09:41:20 +00:00
5a149dcfab
mark as an updated beta 3 with some more fixes
2012-09-13 11:39:26 +02:00
e3e4a2bec2
Enable post_write trigger
...
This is used when uploading a file with webdav. The trigger will add the file to the cache and make it show up in listings
2012-09-13 00:12:10 +02:00
78a022fda6
dirname can also return '.' for empty path
2012-09-13 00:09:00 +02:00
c94fe38d39
add getPermissions to storage backends to get all permission flags in one go
2012-09-12 23:25:57 +02:00
d3553ce33d
correctly calculate the MDB2 portability
2012-09-12 23:10:45 +02:00
c7054f374c
log details for an error when upgrading the schema
2012-09-12 23:03:56 +02:00
b2d60ed6b7
add proper logging to filecache
2012-09-12 23:03:56 +02:00
68f65b657c
add OC_Filesystem::resolvePath to get the storage backend and internal path for a file in one go
2012-09-12 22:53:10 +02:00
e8d3a47685
add getId to storage backends
2012-09-12 22:50:10 +02:00
bbf8bb0bb3
Log PHP errors to the OC log
2012-09-12 22:30:04 +03:00
3efe1d3b24
Add linkToRoute functionality
2012-09-12 18:00:33 +02:00
0fe3354c61
add proper error logging in OC_User database queries
2012-09-12 12:47:33 +02:00
e31dfb643a
add getErrorMessage to OC_DB
2012-09-12 12:47:33 +02:00
f31264a0c2
this is now 4.5 beta 3
2012-09-12 12:12:23 +02:00
c5f9b887ff
Don't call clearCache() for OC_Minimizer statically, create OC_Minimizer objects for both CSS and JS to clear cache after upgrade
2012-09-12 01:18:07 -04:00
ca6322465d
Treat getUsers() as case insensitive, helpful for showing proper results in the share with autocomplete
2012-09-12 01:12:25 -04:00
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
b194ac3dde
Add expiration column to share table and bump version number
2012-09-12 01:01:45 -04:00
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
5c1a79210f
added hint to restart the web server in case recetly installed php modules are still not available
2012-09-11 23:51:12 +02:00
b6a106a920
allow using only dbname for oracle
2012-09-11 18:12:38 +02:00
bf2d1e78f2
don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again
2012-09-11 13:16:34 +02:00
37f0b85d3f
Fix problem with non share collection item types being treated as collections
2012-09-11 00:37:31 -04:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
463b48b2e1
fix file upload
2012-09-10 14:41:27 +02:00
86c3f9b8fe
Merge branch 'master' of github.com:owncloud/core
2012-09-10 14:14:49 +02:00
db7a18455f
use tabs for indentation
2012-09-10 14:14:36 +02:00
5a65c5a46c
Respect coding style
2012-09-10 14:59:08 +03:00
0444877218
Respect coding style
2012-09-10 12:35:15 +03:00
c6cd1b77d3
Respect coding style
2012-09-10 12:32:49 +03:00
5721bd2786
Respect coding style
2012-09-10 12:31:57 +03:00
1a10955644
Respect coding style
2012-09-10 12:29:35 +03:00
2271a97992
Respect coding style
2012-09-10 12:28:09 +03:00
9a2bc5255b
Respect coding style
2012-09-10 12:26:20 +03:00
23f348c99f
Respect coding style
2012-09-10 12:25:42 +03:00
87e1a27fde
Respect coding style
2012-09-10 12:23:55 +03:00
f34588d1ff
Respect coding style
2012-09-10 12:21:54 +03:00
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
3e7951e1e6
Normalize the file path for shared children as a precaution
2012-09-08 23:42:24 -04:00
fe7f095b08
Insert id for unique user group share rows
2012-09-08 23:09:58 -04:00
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
f23f719d99
Fix unsharing from self for group shares and add test for it
2012-09-08 20:15:47 -04:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
46422e6dbe
don't use regular expresions for a simple string replace
2012-09-08 23:40:23 +02:00
697061fa9f
add OC_Image::fitIn
2012-09-08 23:26:19 +02:00
abc930c57c
Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security.
2012-09-08 17:58:59 +02:00
2b42893fa9
style fixes for public util api
2012-09-08 16:18:47 +02:00
89f3afe2fe
style fixes for public user api
2012-09-08 16:17:01 +02:00
439ede2a1d
style fixes for public response api
2012-09-08 16:15:42 +02:00
a16565a7fa
style fixes for public json api
2012-09-08 16:14:06 +02:00
89e5b85fa7
style fixes for public files api
2012-09-08 16:02:11 +02:00
6b2b8b10ee
style fixes for public db api
2012-09-08 16:00:32 +02:00
221257d2fb
style fixes for public config api
2012-09-08 15:58:28 +02:00
eca24f74f7
style fixes for public app api
2012-09-08 15:54:30 +02:00
c692dfc1ab
style fixes for public app api
2012-09-08 15:52:29 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
bd83422095
put filestorages in a namespace
2012-09-07 18:30:48 +02:00
edcd297476
Move handling of core remotes to OC_TemplateLayout
2012-09-07 16:42:46 +02:00
631df21de6
Prevent loading all apps twice from overwriting the core scripts and styles
2012-09-07 16:20:13 +02:00
ceec5e593c
Remove redundant loadApps
2012-09-07 16:19:08 +02:00
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
285c198c36
EOL fixes
...
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
5e55b4d6e7
Whitespace fixes in lib
2012-09-07 14:08:29 +02:00
386d1ac49f
Fix setEtagHeader function
2012-09-07 13:42:22 +02:00
cd4b8dbacd
Change caching checks for minimized files
...
Only use a ETag, but include last modified time into this
Also added the filesize to this. And used the ETag for the
internal cache.
2012-09-07 13:42:22 +02:00
ff42da58b9
Global file cache should also be able to clear with prefix
2012-09-07 13:42:22 +02:00
9ea7817a40
Remove core.{css,js} cache on upgrade
2012-09-07 13:42:22 +02:00
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
294cff27a7
add check for zlib
2012-09-07 01:39:11 +02:00
d4fd47d43f
clear user filecache after the user mount configuration has changed
2012-09-06 23:14:43 +02:00
2144b2f37a
clear the filecache if the mount configuration has changed
2012-09-06 23:10:33 +02:00
39577495e1
Add a directory separator to filter app directories with the same
...
prefix.
Fixes: oc-1663
2012-09-06 22:27:56 +02:00
837eb1871d
Don't delete the file anymore to replace it in the UI, just overwrite it
2012-09-05 22:13:50 -04:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
24977d0fd0
Respect coding style
2012-09-05 15:49:42 +03:00
e5cb638c09
Respect coding style
2012-09-05 15:42:06 +03:00
d5fd5cd584
Respect coding style
2012-09-05 15:40:21 +03:00
28a11959d7
API: Fix /person/check api method
2012-09-05 12:32:54 +00:00
9eccc0121a
Respect coding style
2012-09-05 13:22:38 +03:00
470b87f625
Fix ocs/person/check
2012-09-05 09:07:15 +00:00
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
1e2d582123
fixing button to add additional site
2012-09-04 23:42:49 +02:00
41f135daee
Remove () from return statement
2012-09-04 21:27:36 +02:00
69ee842521
Fixing: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617
2012-09-04 17:13:34 +03:00
4224eb8831
API: remove OAuth auth check, respond in ocs formatted xml/json
2012-09-04 13:50:56 +00:00
7901fc33a8
fixing syntax error
2012-09-04 15:54:38 +03:00
aff08925c1
fixing syntax error - sorry for that
2012-09-04 15:46:43 +03:00
2028500c0a
fixing syntax error - sorry for that
2012-09-04 15:42:58 +03:00
e4e0b5a822
Respect coding style
2012-09-04 15:34:09 +03:00
d14f8fa681
Respect coding style
2012-09-04 15:21:52 +03:00
37bb16becb
API: Add callback_fail, add OC_OAuth::init and bespoke request token method
2012-09-04 11:10:42 +00:00
9760b5e153
Respect coding style
2012-09-04 13:32:27 +03:00
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
5153b8b293
Add url-params to url with new parameter in linkTo function
2012-09-03 21:51:32 +02:00
1a46192433
Add args parameter to linkTo(Absolute) function, to append the args automaticly
2012-09-03 21:51:32 +02:00
bb65e173d4
4.5 beta 2
2012-09-03 20:38:50 +02:00
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
4c065deb55
Listen to post_deleteGroup hook in Share API
2012-09-02 20:01:09 -04:00
dc569ea300
Fix some warnings from Jenkins in the Share API
2012-09-02 19:30:01 -04:00
db37a454b3
Add parameter documentation
2012-09-02 18:29:55 -04:00
f0f2d93908
Restructure generateTarget for the post_addToGroup hook
2012-09-02 18:23:19 -04:00
a77c16371f
Make item targets be based off of the parent item target for reshares
2012-09-02 18:23:19 -04:00
5f2751c672
in some cases no translations are loaded because $this->lang is empty not null
2012-09-02 14:15:03 +02:00
3c784ede83
use str_ireplace instead of duplicate str_replace
2012-09-02 13:58:01 +02:00
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
2508f64efe
set debug mode if an xdebug session is active
2012-09-01 20:52:13 +02:00
2c1f732880
use null instead of -1 on all getUser()
2012-09-01 20:50:03 +02:00
828ca2ba36
translate UNIX_TIMESTAMP() into sqlite and pgsql equivilents
2012-09-01 20:38:14 +02:00
6d48f3fab8
we still need this for pgsql
2012-09-01 16:49:29 +02:00
a7255181ad
fix autoloader throwing errors for non-oc classes
2012-09-01 15:36:52 +02:00
c0c48cb3ee
[tx-robot] updated from transifex
2012-09-01 13:37:28 +02:00
3dacf149de
allow configuring user backends in config.php
2012-09-01 02:50:27 +02:00
f67aef608f
load authentication apps on login
2012-09-01 02:50:27 +02:00
ebd813ae95
don't throw errors in the autoloader when a class doesn't exist
2012-09-01 02:50:27 +02:00
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
efa0478d2d
Remove share permission for encrypted files
2012-08-31 17:31:28 -04:00
72e80bf6bd
send the current owncloud version to the ocs server so that we can filter for compatible apps
2012-08-31 20:22:03 +02:00
6f8efcfe61
l18n support lib/updater.php
2012-08-31 10:51:35 +02:00
bd809574dc
fix translations within subfolder /lib
2012-08-31 00:43:50 +02:00
58b1e841f1
fix translations within subfolder /lib
2012-08-30 23:51:44 +02:00
b5234a4f34
allow html inside app descriptions
2012-08-30 22:17:54 +02:00
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
67c2d56be8
Add ownCloud OAuth store backend. WIP
2012-08-30 14:02:31 +00:00
0d1d2c0b61
Fix class name
2012-08-30 14:01:27 +00:00
598815b21e
More info about not compatible apps (app id)
2012-08-29 22:38:06 +02:00
c958d5ba80
Fix filesystem setup for shared public link with logged in user
2012-08-29 21:35:55 +02:00
301baf0215
$storage shouldn't be static in OC_Cache_File
2012-08-29 14:42:40 -04:00
8d490b9880
Fix shared storage working with user backend defined data directories
2012-08-29 14:39:13 -04:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
9e32e07306
Fix OC_Cache_File
2012-08-29 20:29:43 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
52f2e7112e
Whitespace fixes in lib
2012-08-29 20:28:45 +02:00
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
e5cbc532c3
Fix password authentication for links and fix template problems for links by creating a new base layout
2012-08-29 11:54:49 -04:00
d786194ddc
fixing: apps/files/ajax/scan.php
2012-08-29 01:39:42 +02:00
32721e7b07
Remember storage view in OC_Cache_File
2012-08-28 23:10:32 +02:00
53e51fe46b
Clean user cache on login
2012-08-28 23:07:28 +02:00
8a02a8852f
Add background job for global file cache cleanup
2012-08-28 23:07:28 +02:00
ff076caeee
Check usernames in the database as case insensitive, they are still stored case sensitive. Bug fix for oc-422 and oc-1514
2012-08-28 11:28:38 -04:00
fd2ca21fc2
Allow share_with column to be null for links
2012-08-28 09:51:00 -04:00
70b71338cd
beta 1
2012-08-28 07:22:31 +02:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
0ad16e84c5
Fix share collection query
2012-08-27 20:37:38 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
3b83c7fa74
update now(), current_timestamp and backtick replacement
2012-08-27 18:37:16 +02:00
2e796b563f
urldecode private- and public-key
2012-08-27 17:51:02 +02:00
ead7de6bff
only mount every single homefolder when using sharing app
2012-08-27 16:10:37 +02:00
b56a46bdea
fix filesharing for multiple data directories
2012-08-27 15:55:46 +02:00
0f379fd28a
OC_User: getHome is an optional method, taking it out of the Interface
2012-08-27 14:07:28 +02:00
3970d0e636
Merge branch 'master' of github.com:owncloud/core
2012-08-27 14:00:17 +02:00
15cdde74d3
return standard SQL values (sqlite3 understands CURRENT_...)
2012-08-27 13:33:24 +02:00
16aff1045d
make use of OC_User::getHome in lib/migrate.php
2012-08-27 13:21:40 +02:00
18517f6adb
Fix share getItems() limit
2012-08-26 21:34:37 -04:00
cd5c217c0d
use OC_User::getHome in lib/filesystem.php
2012-08-26 22:24:08 +02:00
045c94ec3e
enable user backends to define their own place where to store the data
2012-08-26 22:04:31 +02:00
5586054961
fix c&p fail from earlier commit today
2012-08-26 22:04:31 +02:00
44f5033e29
Merge branch 'master' of github.com:owncloud/core
2012-08-26 16:30:30 +02:00
8c8496aff9
don't allow group admins to change admin's accounts
2012-08-26 16:29:10 +02:00
5a4854079f
implement getHome in OC_User
2012-08-26 16:24:25 +02:00
39a9a4e73e
Merge branch 'master' of github.com:owncloud/core
2012-08-26 15:05:28 +02:00
9822cd30c0
fix sharing bug introduced with oracle support
2012-08-26 14:57:33 +02:00
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
1bfe26bb09
remove superflous LIMIT
2012-08-25 02:26:50 +02:00
379f27ed03
fix missing $
2012-08-25 02:17:44 +02:00
bc90a34b07
remove duplicate method
2012-08-25 02:13:32 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
0c0ae928dc
escape all identifiers with backticks
2012-08-24 15:08:57 +02:00
f86f4c8bfd
4.0.7
...
and remove some ^M while at it
2012-08-24 15:00:53 +02:00
12df81fe0b
Check blacklist when renaming files
2012-08-24 15:00:52 +02:00
5cb2d58c9f
Also check some other files
2012-08-24 15:00:52 +02:00
1dfa6f3d8f
Fix OC_Connector_Sabre_Locks for SQLite
2012-08-24 15:00:52 +02:00
0ac8434670
fix for bug 879 - add parent directory to file cache if it does not exist yet.
...
For example this can happen if the sync client is used before the user created the root directory (e.g. through web login).
2012-08-24 14:58:47 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
c90c358f0d
Only load js and css once.
2012-08-23 05:02:30 +02:00
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
1d7018158e
4.5 alpha 1
2012-08-21 18:47:26 +02:00
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
cb0464ca4e
Bump version number for Share API
2012-08-19 22:36:19 -04:00
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
5eca531f99
Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
2012-08-19 22:14:38 -04:00
f987e22d85
Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions
2012-08-19 16:30:38 -04:00
50cc5d5921
fix creating nested folders inside tar files
2012-08-19 05:54:16 +02:00
3da1339cd8
fix error when adding string data to an archive
2012-08-19 05:04:58 +02:00
154ce0f68d
also add getLocalFolder to OC_Filsystem and OC_FilesystemView
2012-08-19 02:42:15 +02:00
9b44d0cb32
add OC_FileStorage::getLocalFolder
2012-08-19 02:30:33 +02:00
5962469892
add OC_Archive::addRecursive
2012-08-18 22:42:35 +02:00
850ee93711
add impress mimetype
2012-08-17 12:39:05 +02:00
53a888cc81
more path normalization
2012-08-17 01:22:54 +02:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
9cb3113f42
Fix problems exposed by tests
2012-08-15 11:59:08 -04:00
137e4cb342
Add tests for Share API, all tests passing :)
2012-08-15 11:55:54 -04:00
63af75586b
Merge branch 'master' into routing
2012-08-15 17:39:00 +02:00
d039f11905
provide ocs calls and keymanager functions to get/set both keys (private, public) of a user together
2012-08-15 13:18:11 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
ddfa760a5e
Change to correct function call getItemSharedWithBySource()
2012-08-14 17:06:41 -04:00
b440dfc67e
Remove setTarget() function, changing target names only leads to confusion
2012-08-14 17:05:38 -04:00
9661a63a72
Ensure permissions can't be escalated during a reshare
2012-08-14 16:54:38 -04:00
028c79fc9d
Use if instead of switch for detecting share type and throw exceptions when setting permissions
2012-08-14 16:30:13 -04:00
937d1b29d8
Retrieve all file dependent items when looking for file item type
2012-08-14 11:02:29 -04:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
1522f7f211
fix some minor problems with path noramlization
2012-08-14 03:07:14 +02:00
0c8ce0bb32
some basic path normalization
2012-08-14 02:44:45 +02:00
863d3a43b2
Catch exceptions and write to log when creating storage object fails
2012-08-13 17:10:58 -04:00
34f93ac765
check if user has write access to a given file before updating the filekey
2012-08-13 11:31:15 +02:00
e72a57f595
Also check for some other files
2012-08-13 00:57:01 +02:00
64ef1e2181
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
2012-08-12 14:49:41 -04:00
16dacba490
Routing: And start using them from php
2012-08-12 16:53:00 +02:00
db4111f6d5
Routing: Add some core routes
2012-08-12 16:52:36 +02:00
8c02494744
Routing: Prepare load funtions to be called from OC_Router
2012-08-12 16:16:22 +02:00
4d3d4522f9
Backgroundjobs: Fix wrong var names
2012-08-12 12:14:27 +02:00
deef1f73db
Backgroundjobs: fix bug in QueuedTask
2012-08-12 09:02:20 +02:00
a1c88a3e39
Add search, limit, offset parameters to usersInGroups()
2012-08-11 16:25:28 -04:00
4f1b3631ba
Change limit parameter in OC_User as well
2012-08-11 16:25:28 -04:00
874f31b8d7
Make getting all users and groups the default
2012-08-11 16:25:27 -04:00
8d1eb674ec
Add search, limit, and offset parameters to getUsers() and getGroups()
2012-08-11 16:25:27 -04:00
1d7e3071e0
bump version to reate new tables
2012-08-11 17:32:17 +02:00
0d8df3f55c
Revert "Combine install checks in lib/base.php"
...
This reverts commit aa9fbf6639
2012-08-11 17:07:35 +02:00
465767670b
Check blacklist when renaming files
2012-08-11 11:04:04 -04:00
1025e451a7
Add router match to OC::handleRequest
2012-08-11 01:36:16 +02:00
1763de08d0
Routing: Fix construction of RequestContext
2012-08-11 00:57:46 +02:00
c2160433cd
Merge branch 'master' into routing
...
Conflicts:
lib/base.php
2012-08-11 00:43:26 +02:00
87d1cdb945
Fix for running doing routing in lib/ocs.php
2012-08-11 00:04:43 +02:00
f63b9b44d8
Routing: combine all routes into one set
2012-08-10 23:31:21 +02:00
72b2324b68
Move loading of routes to OC::getRouter function
2012-08-10 23:31:11 +02:00
Lukas Reschke
Robin Appelman
Thomas Tanghus
Thomas Müller
Bart Visscher
scambra
Jörn Friedrich Dreyer
Sam Tuke
Michael Gapczynski
Felix Moeller
Arthur Schiwon
Georg Ehrke
Bernhard Posselt
Tom Needham
Björn Schießle
Jakob Sack
Florian Hülsmann
Victor Dubiniuk
icewind1991
Sam Tuke
Susinthiran Sithamparanathan
Michael Göhler
Frank Karlitschek
Christian Reiner
Christian Reiner
Brice Maron
Björn Schießle
jfd
jfd