cbe31fbf57
Use `int` instead of `string`
2015-02-16 12:01:05 +01:00
a7df23ceba
Manually type-case all AJAX files
...
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈
Fixes https://github.com/owncloud/core/issues/14196 for core
2015-02-13 13:33:20 +01:00
9baf7a0a3f
[tx-robot] updated from transifex
2015-02-11 01:55:07 -05:00
e2d4b3c123
[tx-robot] updated from transifex
2015-02-09 01:54:53 -05:00
77e9c212ed
[tx-robot] updated from transifex
2015-02-04 01:55:49 -05:00
15ae6b47ed
replace hook with storage wrapper
2015-01-19 09:16:15 +01:00
a65f666834
[tx-robot] updated from transifex
2015-01-16 01:55:51 -05:00
87f81e5926
Remove unneeded addTranslations() calls
2015-01-14 14:36:23 +01:00
f367bbb49d
[tx-robot] updated from transifex
2015-01-14 01:55:16 -05:00
331d73c3a3
Merge pull request #13182 from owncloud/download_versions
...
make versions of shared files downloadable
2015-01-12 12:03:21 +01:00
b1031c6355
Merge pull request #13188 from owncloud/add-check-if-user-is-logged-in
...
Add check if user is logged-in
2015-01-09 16:45:53 +01:00
d699d31518
make versions of shared files downloadable
2015-01-09 12:46:24 +01:00
1cfcec8684
Add check if user is logged-in
...
Otherwise a fatal PHP error is thrown since the filesystem is not setup:
```
( ! ) Fatal error: Call to a member function getOwner() on null in /Users/lreschke/Programming/core/lib/private/files/filesystem.php on line 817
Call Stack
1 0.0004 247792 {main}( ) ../index.php:0
2 0.0946 5088776 OC::handleRequest( ) ../index.php:28
3 0.1423 7491280 OC\Route\Router->match( ) ../base.php:748
4 0.1664 8592152 call_user_func:{/Users/lreschke/Programming/core/lib/private/route/router.php:250} ( ) ../router.php:250
5 0.1664 8592216 __lambda_func( ) ../router.php:250
6 0.1665 8599064 require_once( '/Users/lreschke/Programming/core/apps/files_versions/ajax/getVersions.php' ) ../route.php(135) : runtime-created function:1
7 0.1801 9061096 OCA\Files_Versions\Storage::getUidAndFilename( ) ../getVersions.php:7
8 0.1801 9061144 OC\Files\Filesystem::getOwner( ) ../storage.php:45
```
Furthermore this adds the CSRF check as a nice-to-have addition, the requests accessing this are done via the jQuery AJAX methods and thus the header is automatically added to all requests already.
2015-01-09 11:55:18 +01:00
d4fc2f555b
[tx-robot] updated from transifex
2015-01-09 01:55:22 -05:00
573be9092d
[tx-robot] updated from transifex
2014-12-31 01:54:33 -05:00
d8f04f5a97
[tx-robot] updated from transifex
2014-12-23 01:55:23 -05:00
a0a3322b94
Remove unused file
...
That file is apparently unused - introduced with 30b58f5677
2014-12-15 17:29:16 +01:00
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
6daa588e1c
Merge pull request #12556 from owncloud/add-route-for-versions
...
Add route for download of versions
2014-12-03 14:01:58 +01:00
c4e0c02526
Add route for download of versions
...
Otherwise on master it was not possible anymore to download older versions.
Fixes itself.
2014-12-02 17:52:31 +01:00
694003d147
Autoload lib files of versions app
2014-12-02 17:21:19 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
f8421958b3
[tx-robot] updated from transifex
2014-11-21 02:54:26 -05:00
713c8e0dac
Merge pull request #12325 from owncloud/removeunneccessarylang
...
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
995fe4a176
cleanup languages. closes #11274
2014-11-20 14:46:17 +01:00
76ebd3a050
Make apps/ extend the \Test\TestCase and fix overwritten methods
2014-11-19 14:52:09 +01:00
bb540722cd
Use base class to reset the file mapper
2014-11-19 14:52:07 +01:00
5ca869c324
Merge pull request #9177 from owncloud/jsdocexperiment
...
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
79b650a023
Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
...
move versions if a file was renamed in a shared folder
2014-11-03 12:53:14 +01:00
ebe1d3df0a
don't move versions if only the mount point was renamed
2014-10-31 16:42:54 +01:00
0f3e6cb50a
Improved Javascript docs for JSDoc
...
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
9f7c571e40
update all translation files to js and json
2014-10-29 10:13:50 +01:00
206cb5ba63
Fix typo
2014-10-29 10:11:01 +01:00
9d1be0bbaf
get the source path and owner in a pre hook and the target path and owner in a
...
post hook
2014-10-29 10:11:01 +01:00
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
e75c2edba6
[tx-robot] updated from transifex
2014-10-23 01:55:51 -04:00
b091394a90
introduce new app page layout
...
filter installed and not-installed apps properly
kill unneeded file
load category 'Installed' on page load
adding documentation links
new apps mgmt: first style adjustment
apps mgmt: only show license and preview if they exist
adding buttons
new apps mgmt: fix for mobile
use app icon if available
new apps mgmt: position enable/disable toggle to the right
new apps mgmt: proper display of icons or previews
new apps mgmt: fix loading spinner
reenable group selection for apps
new apps mgmt: position enable button normally again
new apps mgmt: clarify wording from 'Installed' to 'Enabled'
reintroduce enable/disable
Move rating image path generation to client-side
Move expression outside of l10n
fix group handling
add buttons for 'More apps' and 'Add your app' again
disable changed date of app for now
adding recommended label
style 'Recommended' app tag
fixing php warning
sort by rating
adding meta-category 'Recommended'
Only show existing documentation links
lacy loading of screenshots
making group based app activation work again
adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'
adding app.svg for all core apps
query string '?installed' is not longer needed
update and uninstall is back + error feedback
remove unneeded parameter
fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
8e077cf1a4
make sure that we always delete oldest first
2014-10-09 19:15:58 +02:00
16cd749065
Add support for keys in the info.xml
...
This allows to have links to different doc base URLs
a.
2014-10-09 15:48:30 +02:00
c7f936cdcb
Updated info.xml with
...
Added description in line with other apps.
2014-10-08 21:27:40 -04:00
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
e6e04bde4f
[tx-robot] updated from transifex
2014-09-01 01:59:19 -04:00
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
53f3b7ab52
[tx-robot] updated from transifex
2014-08-30 01:57:04 -04:00
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
b12af9ea7f
Add routing to files_versions
2014-08-19 15:25:16 +02:00
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
785ae5dc9a
add unit test to make sure getVersions returns the correct result
2014-08-05 17:26:23 +02:00
b7ada5da57
make sure that the versions array contains the correct path
2014-08-05 17:25:55 +02:00
1a797f90bb
add unit test for rename and copy operation
2014-07-30 15:14:01 +02:00
dba2574c52
make sure that we always find all versions
2014-07-30 15:14:01 +02:00
c738f71657
make the versions and encryption app aware of the copy operation
2014-07-30 15:14:01 +02:00
010732019a
[tx-robot] updated from transifex
2014-07-26 01:54:40 -04:00
ddc85a9871
[tx-robot] updated from transifex
2014-07-20 01:54:40 -04:00
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
aab33b8b0e
Remove deleted versions from the cache
2014-07-10 15:19:40 +02:00
b63e646053
Merge pull request #9460 from owncloud/versions-local
...
Dont assume local home storage for files_version
2014-07-10 10:28:24 +02:00
e5e8e28ae7
add ocsids to info.xml
2014-07-07 17:11:50 +02:00
18572b2367
Dont delete versions as local files
2014-07-07 15:49:08 +02:00
2327d41b11
Merge pull request #9269 from owncloud/fix_versions_preview
...
change order of registering api and capabilities to fix file version previews
2014-07-04 15:25:24 +02:00
7760fd4bef
add ellipsizing to restore string if text is too long
2014-07-01 20:37:14 +02:00
eaf9d6eccc
increase width of version dropdown - fixes #9270
2014-07-01 16:17:00 +02:00
12420d08e2
change order of registering api and capabilities to fix file version previews
2014-07-01 14:09:48 +02:00
cc559c5b4b
Merge pull request #9074 from geez0x1/master
...
Update the modified date in UI on file reversion
2014-06-23 23:20:04 +02:00
8052d2901d
initialize array
2014-06-18 13:23:53 +02:00
7576dde0a3
Update the modified date in UI on file reversion
2014-06-17 22:22:03 +02:00
f4a183e753
wwe no longer have a versions table
2014-06-10 14:47:32 +02:00
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
8ee15025f0
Fix merge conflict
2014-06-03 19:05:21 +02:00
2bb902d028
use OC_DB::dropTable()
2014-06-02 18:57:53 +02:00
7ad0fee0b5
let file cache handle the versions size
2014-06-02 18:55:13 +02:00
ef59c69dc8
Distinguish legacy file actions from regular file actions
...
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.
New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.
Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
2014-05-30 10:06:29 +02:00
06e53b359a
Added "dir" in file actions handler context and fixed versions
...
Added "dir" in file actions handler context so that handlers can know
what the path of the file was without having to look it up from the file
list.
Fixed versions app to use the context.dir instead of the old $('#dir')
element. This makes the versions popup work in the sharing overview.
2014-05-30 10:06:29 +02:00
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
6c4b650524
Merge pull request #8585 from owncloud/phpdoc-improvements-apps
...
PHPDoc improvements /apps
* owncloud/phpdoc-improvements-apps:
Fix whitespace issues
Reduce double-space with single-space.
Remove spaces around | operator in doc block.
Fix more missing or broken PHPDoc
PHPDoc fixes for user_ldap
Fix PHPDoc in /apps
2014-05-19 14:08:42 +02:00
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
58857b8df5
@returns -> @return
2014-05-13 19:09:15 +01:00
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
1abd9c1305
[tx-robot] updated from transifex
2014-04-19 01:56:06 -04:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
e3b951f412
Merge pull request #7724 from owncloud/mobile
...
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
ea8705bac8
additional class is added to the file actions called e.g. 'action-share', 'action-rename'
...
in order to allow proper translations of the action's display name an additional parameter has been added to the register function
2014-03-17 20:15:10 +01:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
9a5c2d0080
add preDelete hook for files_versions app
2014-03-11 14:17:08 +01:00
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
46745895ae
Merge pull request #5153 from owncloud/core-em-to-px
...
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
932e8f9f58
Fixes width of the dropdown menus as per computed styles.
2014-01-26 02:59:28 +05:30
a567f74d86
fix array order
2014-01-22 11:13:15 +01:00
8d36ddcf03
code clean-up
2014-01-22 11:10:32 +01:00
0b89a45f11
fix size calculation of getAllVersions()
2014-01-22 11:10:23 +01:00
85269641db
add first unit test for the versioning app
2014-01-21 16:22:08 +01:00
9efd07fbab
isolate getExpireList function to make it testable
2014-01-21 16:22:08 +01:00
37e278f2a9
don't use the user id within the versions preview call as it could be used to access previews of another user
2014-01-21 13:50:56 +01:00
ca57a849ff
When reading the size of "files" mountpoints need to be excluded
...
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.
This is because the default call (legacy) used to return the size of
mount points as well.
Fixes #6731
2014-01-20 17:11:33 +01:00
fd49d3c5c5
Fixes typo in versions.css
2014-01-16 14:45:23 +05:30
775e08e0ee
Merge branch 'master' into core-em-to-px
...
Conflicts:
apps/files_sharing/css/public.css
apps/user_ldap/css/settings.css
core/css/multiselect.css
core/css/share.css
2014-01-16 14:42:37 +05:30
76fa7bab63
call getFileInfo to enforce a file cache entry for the new version, fix #6286
2014-01-15 11:37:47 +01:00
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
e345f3f511
[tx-robot] updated from transifex
2013-12-29 01:55:36 -05:00
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
409b510889
Moved content disposition code+workarounds to OCP\Response
...
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
519f63ee97
Revert "[fix] Center Share Dropdown & Versions Dropdown"
...
This reverts commit 1dbbfcf3dc
2013-12-03 08:23:13 -06:00
1dbbfcf3dc
[fix] Center Share Dropdown & Versions Dropdown
...
Center Share Dropdown & Versions Dropdown
2013-12-03 08:14:06 -06:00
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
41a1a32e5a
Merge pull request #6099 from owncloud/fix_source_not_found_warnings
...
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
348706854c
use better coding style
2013-11-28 19:31:35 +01:00
bef5108218
detect mimetype from the original filename, without the versioning timestamp
2013-11-28 18:59:38 +01:00
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
34a8c3c4cd
Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
...
move files to owners trash
2013-11-27 10:24:55 -08:00
f8fcd567a7
move files to owners trash
2013-11-25 16:51:31 +01:00
acf74b24f2
remove unused variable
2013-11-22 16:10:30 +01:00
c309067c81
use oc filesystem operations to calc the versions size. This makes sure that we can handle missing directories correctly
2013-11-19 12:23:14 +01:00
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
29e9f2833d
Merge pull request #5214 from owncloud/no_extra_slashes
...
Don't double-slash filenames at the root.
2013-11-14 07:53:51 -08:00
238e4bc3eb
implement delete hooks in file versions lib
2013-11-12 14:06:32 +01:00
e431ba5ce8
[tx-robot] updated from transifex
2013-11-11 05:47:59 -05:00
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
41c6c44221
Disable versions app JS in public mode
...
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.
Fixes #4545
2013-10-17 21:04:18 +02:00
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
9baedb4102
remove debug output
2013-10-11 17:06:43 +02:00
c32c5979d8
Merge branch 'master' into versioning_preview_shared
2013-10-11 17:00:21 +02:00
a0de5dd325
some small fixes
2013-10-11 10:34:34 +02:00
f4e86045de
make files versions root a class constant
2013-10-10 20:09:38 +02:00
87cccb2e32
some small changes/fixes
2013-10-10 20:06:42 +02:00
4c2e3919de
make previews work for shared files in the versions drop-down
2013-10-10 17:23:27 +02:00
92009c5d8e
fix getVersions() for sub directories
2013-10-10 16:58:11 +02:00
bb3b38947d
add missing preview link
2013-10-10 14:57:25 +02:00
e56947255e
don't use glob() and getLocalFile(), this can lead to problems on windows servers
2013-10-10 14:43:40 +02:00
c737b521ab
Don't double-slash filenames at the root.
...
Replace either the end of the dir string that isn't preceded by a slash or the slash at the end of the dir string with a slash and the filename.
This prevents the root directory from ending up as two slashes, which breaks files_versions on Windows servers. See #4079 for an explanation.
2013-10-08 12:48:59 -04:00
cf84154ee0
Cleans up Core apps for relative(em) to absolute(px) styles.
2013-10-06 23:38:24 +05:30
54dd91b859
remove hover effect from preview image
2013-10-04 15:13:05 +02:00
2cfb5fb2d2
vertical align versions text
2013-10-04 14:13:48 +02:00
b0a71bde15
maxX and maxY should be a integer
2013-10-02 16:34:05 +02:00
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
6ae6dc00e5
Merge pull request #4427 from owncloud/fix_4425
...
use OC files API to create missing directory
2013-08-17 08:09:07 -07:00
f28f528431
switched to dirname()
2013-08-17 13:49:42 +02:00
db8fdd5032
added missing parameter documentation
2013-08-17 13:46:33 +02:00
1af2ec1724
Merge pull request #4481 from owncloud/fix_versioning_size_check
...
first check if file exists before checking the files size
2013-08-17 04:37:09 -07:00
f71794f0d5
added createMissingDirectories() method
2013-08-17 13:28:35 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
e761cba808
Merge pull request #4480 from owncloud/remove-ru_RU-master
...
remove ru_RU - fixes #3135
2013-08-17 03:10:42 -07:00
50147bfbd1
Merge pull request #4193 from owncloud/versions_fix_css
...
Versions fix css
2013-08-17 03:01:24 -07:00
16efd81a0e
first check if file exists before checking the files size
2013-08-17 11:57:50 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
137cd2ca89
increase width of versions dialog
2013-08-17 11:01:43 +02:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
a3d009e3b5
also create root dir if it doesn't exist yet
2013-08-14 20:51:36 +02:00
d314729cea
use OC files API to create missing directory which should handle special chars in every environment correctly
2013-08-14 17:58:41 +02:00
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
c2f40d2495
Merge pull request #4243 from owncloud/no_empty_versions
...
don't create empty versions
2013-08-08 03:57:43 -07:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
9923fe655b
[tx-robot] updated from transifex
2013-08-04 02:01:28 -04:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
853b106bb2
don't create empty versions
2013-07-30 16:01:27 +02:00
22b8967031
check if app is enabled
2013-07-30 12:19:01 +02:00
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
0fde473cb7
[tx-robot] updated from transifex
2013-07-29 01:57:04 -04:00
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
62f84ff79c
css for button no longer needed
2013-07-25 12:29:39 +02:00
e5b0c1e78b
remove unused code; use jquery
2013-07-25 11:15:24 +02:00
16d8074d77
fix css
2013-07-25 11:15:01 +02:00
9394fc5d4a
new version drop down
...
Squashed commit of the following:
commit 0dc404a557fa8253e3a87c7babefba6de8e6dab5
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 25 10:26:48 2013 +0200
fix 'more versions' button for IE8
commit 5836e652857204d68dfdfa8b3318de8e2fe02493
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:56:46 2013 +0200
clean-up some unused code
commit ac83e53fa24073783a165796fc3016dc7beca293
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:49:03 2013 +0200
fix order of the versions, newest version should come first
commit f150a88843af316ff505728941287406f25a0751
Merge: bc713c7 b8e399b
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 16:19:36 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit bc713c7b0c3207d00d2f19b10a905a82724c0709
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 16:11:07 2013 +0200
fix position of more versions button
commit b8e399b1754ae7656c3cb8cef2c53f6976a83d61
Merge: 24825b0 7b6e39d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:04:08 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit 24825b02004efa953197e72b470b9b033030aeee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:02:53 2013 +0200
umark previous row if a new row gets selected
commit 7b6e39d2939f1b3bba4fff37ca9087dbc7795f03
Merge: 5bfb0ac 7b54644
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:37:19 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit 5bfb0ac5c102bdfd3b27a37cea8c792f69b3b803
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:37:09 2013 +0200
more style adjustments for version dropdown
commit 7b54644d3036ffba448f0525ca09f6e8898b9950
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 15:12:53 2013 +0200
remove debug output
commit a75662bcfdce34d4f14020a539172c7ef1b894d3
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:12:26 2013 +0200
reword Revert to Restore
commit e784644daeac12bc6fa6844f24214a039266ae86
Merge: d07abfd 9978c96
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 15:00:11 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit d07abfdbb49778a8be30b2a6adbe326e1b1f238f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 14:59:17 2013 +0200
if another drop-down is already open, always close it first
commit 9978c967a6ecbd2d0e5003df3cf4cdba09dab468
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:49:47 2013 +0200
more style improvements for versions
commit a13355f16e6172c02069930a60a49aba4ebfa227
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:44:13 2013 +0200
position fixes for versioning
commit 02c1d6b5eabc4075749c2a7a852c9ed7bbb3644d
Merge: c5a9462 203f544
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:31:16 2013 +0200
merge versions style changes
commit c5a946231a3d011748248db13b6b95ce51eb3e4c
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:29:56 2013 +0200
bigger clickable area for versions
commit 203f544825bd49b168f2316cf2a04caca75438c8
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 14:15:38 2013 +0200
changes visual changes, as suggested by Jan
commit 90b1e93676d235a61f318768661b25e5815a9784
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:12:23 2013 +0200
remove superfluous selector from ID
commit 9768254fe3b2469293fca23151e54cde69bd4661
Merge: c961278 b91c682a94c55b
2013-07-25 10:35:19 +02:00
b16c5a6df7
fix array access and change variable names according to the coding style
2013-07-12 11:25:40 +02:00
15f7bb296c
continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota
2013-07-12 11:25:31 +02:00
fbf34f3bf6
fix some var names according to our style guide
2013-07-12 11:25:23 +02:00
2f0d88cae4
adjust comments
2013-07-12 11:25:12 +02:00
e7959d3da0
fix typo in comment
2013-07-12 11:25:04 +02:00
e8760d7284
also expire versions on rename, to update the history more regularly
2013-07-12 11:24:52 +02:00
d6c1e5490d
it is enough to call the expire function once
2013-07-12 11:24:31 +02:00
e159143165
call expire function before writing the new version to make sure to have enough free space
2013-07-12 11:24:19 +02:00
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
efb026c664
don't normalize absolute local path
2013-06-17 14:42:18 +02:00
f91b02e9b6
only escape glob pattern
2013-06-14 15:07:06 +02:00
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
b3834b49c3
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations
2013-05-30 22:05:52 +02:00
afdad5c74d
[tx-robot] updated from transifex
2013-05-21 02:04:52 +02:00
96ff19a703
fix history template, print_unescaped() needs to include closing tags
2013-05-14 21:22:30 +02:00
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
bda8187f3b
rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file
2013-05-08 23:00:13 +02:00
b9134dcd6a
touch file relative to users file folder, otherwise the hooks will be ignored
2013-05-08 22:59:49 +02:00
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
7ea2f785f4
[tx-robot] updated from transifex
2013-04-26 01:58:21 +02:00
a7b4469b2e
[tx-robot] updated from transifex
2013-04-24 02:01:20 +02:00
ddde1b65db
adapt free space calculation to the way it is done for the trash bin
2013-04-17 10:43:12 +02:00
01d203c773
add explenation of the expire function to the apps description
2013-04-16 12:31:33 +02:00
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +02:00
33ee2e2f10
[tx-robot] updated from transifex
2013-04-12 02:11:02 +02:00
544a46c690
remove used space for versions from db is a user was deleted
2013-04-11 14:39:56 +02:00
b02db643d0
[tx-robot] updated from transifex
2013-04-11 02:10:41 +02:00
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
29d33ff7c2
[tx-robot] updated from transifex
2013-04-02 00:04:27 +02:00
cfd8b911b6
[tx-robot] updated from transifex
2013-03-31 00:03:46 +01:00
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
5924d1d95c
add backticks around table names
2013-03-25 12:29:13 +01:00
63e3f978ab
[tx-robot] updated from transifex
2013-03-20 00:02:44 +01:00
418fb98c40
remove backticks around table names
2013-03-15 12:10:21 +01:00
e37e884d7a
add backtick for db queries to prevent postgresql errors
2013-03-15 12:10:07 +01:00
92a8676350
Merge pull request #2317 from owncloud/create_version_on_upload
...
create new version if the same file is uploaded again over the web interface
2013-03-15 01:18:20 -07:00
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
f78594c0ae
fix var name
2013-03-14 17:09:48 +01:00
93b2ada6f6
fix var name
2013-03-14 17:08:16 +01:00
0cf50d63bf
create new version if the same file is uploaded again over the web interface
2013-03-14 16:47:59 +01:00
f3a2daaa9d
[tx-robot] updated from transifex
2013-03-13 00:06:21 +01:00
dfbf57207d
Merge pull request #1584 from owncloud/ocs_multiple_methods
...
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
0525bbd73c
Merge pull request #2189 from owncloud/versioning_sync_client
...
fix versioning for the sync client - distinguish between touch and write operation
2013-03-08 03:05:28 -08:00
8d26400cb5
remove some debug output; move code to the right function
2013-03-08 11:27:25 +01:00
45869afa5a
remove debug output
2013-03-08 10:51:28 +01:00
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
48bb53030c
distinguish between touch and write
2013-03-07 15:51:44 +01:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
2a5d9ca9c5
damn copy&paste, fix wrong var name
2013-03-04 12:59:48 +01:00
21bad1fcc0
fix type in var name
2013-03-04 12:33:16 +01:00
94dab96dba
fix quota calculation for trash and versions
2013-03-04 12:17:57 +01:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
10b108ed8a
Merge pull request #2030 from j-ed/master
...
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
70014d37dc
fix expire function
2013-03-04 17:20:14 +01:00
20a45d547a
Update app.php
...
suppress log messages like `include path for class \"OCA\\Files_Versions\\Storage\" starts with \"apps\/\"`.
2013-03-02 12:26:13 +01:00
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
a01540a300
fix getVersions() call for the history view
2013-03-01 13:55:10 +01:00
e81b6395d4
make sure that the version app always work on the users real home folder and not on the mount point
2013-03-01 13:54:26 +01:00
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
a319fa8d47
Fix window.location mistakes in previous code
...
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);
However this is just tested in google chrome.
2013-02-28 11:26:42 +08:00
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
fc5331eaec
[files_versions] From echo to p
2013-02-27 21:50:22 +01:00
f8bcd38d4d
remove admin settings from app.php
2013-02-27 15:53:08 +01:00
6cf147003f
Merge branch 'master' into versions_cleanup
2013-02-27 15:50:08 +01:00
9b220d0b93
rename History to Versions
2013-02-27 15:46:49 +01:00
d9e75c2b92
remove admin settings for versions
2013-02-27 15:44:02 +01:00
5c7e3cf2e2
escape regular expressions; fix typo in variable name
2013-02-27 10:51:32 +01:00
b917646516
fix quota calculation
2013-02-25 16:12:44 +01:00
4c980a4851
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
2013-02-25 14:26:59 +01:00
3f48bebe92
Merge pull request #1827 from owncloud/fix_getVersions
...
fix getVersions(), we need to get the correct user and filename
2013-02-25 04:59:47 -08:00
632ca9f06d
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
9edec542c5
mount users home before write/read file to it, necessary to deal with external homes
2013-02-22 13:15:47 +01:00
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
db8dbb9847
Style cleanup files_versions
2013-02-21 23:47:21 +01:00
629097bee7
increase db fileds for usernames
2013-02-21 22:44:44 +01:00
0a5457c550
fix getVersions(), we need to get the correct user and filename
2013-02-21 14:40:16 +01:00
c24ec867f9
calculate versions size per user
2013-02-21 12:20:29 +01:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
57fbfaf86a
Merge pull request #1787 from maelzx/patch-1
...
Update apps/files_versions/js/versions.js
2013-02-20 08:32:36 -08:00
d426a09f90
Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api
...
Versioning app use new filesystem api
2013-02-20 03:38:37 -08:00
94e5de8fd0
Update apps/files_versions/js/versions.js
...
Fix "All version..." button not clickable.
Reason is Google Chrome blocking inline javascript execution.
2013-02-20 11:14:24 +08:00
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
f343d9d247
files_versions no longer contains a personal settings page -> remove the call
2013-02-18 23:04:22 +01:00
efa024cc62
fix getUidAndFilename() function
2013-02-18 11:19:40 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
08b68aac6c
check if glob() returns any results, fix for stable45 was already approved by pull request #1695
2013-02-15 12:29:52 +01:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
b05f05ec4a
make store function static
2013-02-14 14:26:49 +01:00
87b98dab25
use new filesystem to mount users home
2013-02-14 11:56:41 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
ff09a1f37b
don't use OC_FilesystemView()
2013-02-10 14:17:18 +01:00
e63c4e3ea8
Change capabilities exposure for files_versions since it extends files
2013-02-10 12:41:27 +01:00
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
5102596e6d
Add capabilities exposure to the versioning app
2013-02-09 11:53:54 +00:00
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
e0212c1174
l10n support enhanced in files_versions
2013-02-07 16:34:57 +01:00
488ab0dba2
l10n support enhanced in files_version
2013-02-07 16:17:54 +01:00
81792448ae
Merge pull request #1472 from owncloud/files_versions-cleanup
...
files_versions cleanup
2013-02-06 08:53:20 -08:00
0e548283fc
Replace OC_FileCache usage in files_versions
2013-02-06 08:00:57 +01:00
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
929b8c3e69
fix files_version hooks
2013-01-28 20:04:10 +01:00
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
f15deaf556
listen to post delete event to allow the trash bin to create a copy of the version first
2013-01-22 15:32:57 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
2b9c925a2b
Merge pull request #1192 from schiesbn/versioning_history_issue_1189
...
fix for issue #1186 , missing variables added
2013-01-16 01:26:43 -08:00
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +01:00
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
dca0fda2ad
keep track of the size of the versions directory
2013-01-10 18:04:30 +01:00
417498d519
add complete size of versions to array
2013-01-10 10:36:55 +01:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
d51fba7781
every 1000s run reduce the number of versions for all files, not only for the currently edited file
2013-01-09 17:11:46 +01:00
a0b0a1d294
adjust timestamp of the file copied from the version history
2013-01-07 15:13:32 +01:00
619c3ef56d
use limits defined in issue https://github.com/owncloud/core/issues/860
2013-01-07 12:06:31 +01:00
7042b5bf1f
remove silly assignment
2013-01-06 23:53:05 +01:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
7c5150ce32
Merge pull request #913 from owncloud/fix_settings
...
cleaning up the settings
2012-12-18 15:27:52 -08:00
ec3c5f36cb
debug output removed
2012-12-18 13:26:10 +01:00
21cdf93616
remove DEFAULTMAXFILESIZE limit and make percentage of available space for versions configurable
2012-12-18 12:57:28 +01:00
e6e9d332cb
add missing bracket
2012-12-18 12:37:24 +01:00
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
0e0d54dc58
get timestamp from file instead from time(); typo fixed
2012-12-17 18:00:11 +01:00
2a42344781
don't check for min interval, no longer needed
2012-12-17 17:14:24 +01:00
75a871ecd7
expire all operation no longer needed; delete oldest versions if limit of empty space is reached
2012-12-17 16:32:09 +01:00
a7bb4b128f
personal settings removed, there is no need to expire versions manually
2012-12-17 13:34:17 +01:00
acc902a0b6
remove blacklist
2012-12-17 13:30:18 +01:00
0a49fcf9d1
update files history according the given intervals
2012-12-17 13:28:40 +01:00
ee1ce6714b
add size to versions array
2012-12-17 11:39:57 +01:00
24d4f701bf
calculate free space for versions
2012-12-17 11:39:57 +01:00
63a2271c78
Change post_write hook to write to prevent creating a duplicate of the original file on upload
2012-12-16 15:08:18 -05:00
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
85bd28c508
Fix some of "Closing brace must be on a line by itself"
2012-12-15 00:43:46 +01:00
f39454ed12
Fix "Line indented incorrectly"
2012-12-15 00:43:46 +01:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
f66ebea5ca
fix typo in variable name
2012-12-02 12:50:07 +01:00
bafb78ac94
fix regression in file versioning for shared files
2012-12-02 12:46:07 +01:00
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
6c3f43b061
[tx-robot] updated from transifex
2012-11-29 00:04:57 +01:00
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
3358bface5
fix incorectly merged versions.php
2012-11-16 12:24:28 +01:00
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
9795bc19bf
Checkstyle: Fix the last two InvalidEOLChar
2012-11-04 18:42:18 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +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
72aebe3aa3
fix broken paths in versions app
2012-10-27 18:08:00 +02:00
7891add286
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 18:06:14 +02:00
f151376ad5
remove remaining line from merge conflict
2012-10-27 17:06:13 +02:00
a93660d37a
fix broken paths in versions app
2012-10-27 15:52:48 +02:00
c1a0e809bf
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 15:50:17 +02:00
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
5708488b3e
make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs
2012-10-15 18:16:27 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
e45f36c2d4
Sanitize user input
2012-10-12 14:09:58 +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
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
4a712bdd48
only check if #dropdown hasClass drop-versions if a drop down is open. Otherwise it will never open the history drop-down
2012-10-10 13:46:51 +02:00
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
33dcb3b1f4
fix missing dir creation for file versions (OC_Filesystemview::mkdir doesn't work here because it doesn't create directories recursively)
2012-10-10 11:49:16 +02:00
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
f29f1cad1d
Prevent Versions click handler from closing sharing dropdown
2012-10-09 13:00:33 +03:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +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
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +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
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
5f997021d1
Fix syntax bug
2012-09-19 21:29:16 +02:00
ee32d1aad5
Fix versioning of shared files
2012-09-19 21:29:16 +02:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
b04c7175dc
Check if the versioned file exists before trying to do the versioning
...
This didn't work with chunked uploading
2012-09-17 20:00:31 +02:00
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
9d533fcd72
add a legend tag. it´s consistent and looks nicer
2012-09-16 17:13:16 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
10b74f9d05
Don't hide errors doing the versioning copy
2012-09-13 00:09:00 +02:00
9bfdf47cd4
Fixed bug oc-1659 - history dialogue cannot be closed once opened
2012-09-12 14:10:12 +01:00
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
785aa751bb
Whitespace fixes
2012-09-07 14:10:43 +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
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02: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
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02: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
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
dc3bec6211
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
2012-08-25 03:13:59 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02: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
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02: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
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
Lukas Reschke
Jenkins for ownCloud
Bjoern Schiessle
Vincent Petry
Björn Schießle
Thomas Müller
Morris Jobke
Joas Schilling
Volkan Gezer
MTRichards
Robin Appelman
Georg Ehrke
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
geez0x1
Andreas Fischer
Robin McCorkell
Scrutinizer Auto-Fixer
raghunayyar
zombiehugs
Morris Jobke
Frank Karlitschek
ringmaster
Christopher
Florin Peter
Tom Needham
Tom Needham
Bernhard Posselt
j-ed
Lukas Reschke
maelzx
Bart Visscher
Michael Gapczynski
Felix Moeller
Arthur Schiwon
VicDeo
scambra
Sam Tuke
jfd