wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
50450 commits 157 branches 562 tags 714 MiB
Commit graph

1030 commits

Author SHA1 Message Date
Jenkins for ownCloud
eb42340fa3 [tx-robot] updated from transifex 2015-11-21 01:54:59 -05:00
Robin Appelman
a95d4c2b22 update tests 2015-11-19 13:32:04 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Lukas Reschke
13e817e901 Throw exception on getPath if file does not exist 
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.

This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.

While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.

I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
 2015-10-25 17:58:21 +01:00
Jörn Friedrich Dreyer
2895c91291 Merge pull request #17641 from owncloud/fix_objectstore_rename 
don't move files in cache twice, fixes renaming for objectstores
 2015-10-19 17:18:57 +02:00
Jenkins for ownCloud
8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Joas Schilling
0d3d75b3b3 Increase the 2nd digit of shipped apps 2015-10-17 08:47:11 +02:00
Jenkins for ownCloud
c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Robin Appelman
d749b9a5ac Fix rename shared versions test 2015-10-16 21:41:51 +02:00
Robin Appelman
22c5c19376 handle versions expire for home storages with unlimited quota 2015-10-16 21:41:51 +02:00
Robin Appelman
54cea05271 Fix preserving file ids when restoring a file with object storage 2015-10-16 21:41:51 +02:00
Jörn Friedrich Dreyer
5646e39248 test objectstore with ceph docker 
use default config for swift primary storage test config

allow testsuite to complete

fix timeout, script cleanup, enable debug for now

use btrfs loopback device, requires privileged container and absolute path

throw exception when storage has problems

debug by echo ...

sleep more, more debug
 2015-10-06 16:27:25 +02:00
Thomas Müller
4b31b349b8 Merge pull request #19595 from owncloud/fix-versions-log-entry 
Reset to auto if not set
 2015-10-06 13:45:35 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Victor Dubiniuk
99f1112e33 Reset to auto if not set 2015-10-05 20:52:25 +03:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Robin Appelman
943c5069d4 Lock files when rolling back version 2015-10-02 17:08:39 +02:00
Thomas Müller
594a3e4e22 Merge pull request #19523 from owncloud/fix-seconds-ago 
Fix moment.js "a few seconds ago" with "seconds ago"
 2015-10-02 14:11:46 +02:00
Morris Jobke
4b3a5a257f Fix moment.js "a few seconds ago" with "seconds ago" 
* fixes #18627
 2015-10-02 10:51:51 +02:00
Vincent Petry
b6114ba2b6 Reload versions list after revert 2015-10-01 17:06:24 +02:00
Vincent Petry
a8fb0038e9 Hide sidebar tab headers conditionally 
Added canDisplay() in DetailsTabView that should return false if the tab
header of this tab must be hidden
 2015-09-28 14:57:44 +02:00
Vincent Petry
5e4a52d3c2 Fix tabs order in files sidebar 2015-09-28 12:30:12 +02:00
Joas Schilling
1694f21387 Add the method to the mock 2015-09-25 11:16:26 +02:00
Thomas Müller
e7bc2a10e3 Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue 
fix issue with version rollback and thumbnails
 2015-09-24 21:06:27 +02:00
Lukas Reschke
36ce254ffd Move dummy backend to Tests namespace 2015-09-22 11:01:11 +02:00
Georg Ehrke
b3ff773bbf delete cached preview when rolling back file's version 
add random number using OC.parseQueryString and _.extend()

version rollback: add missing prefix to OC\Preview::post_delete

add test to assure that the rollback hook is called
 2015-09-20 11:22:40 +02:00
Thomas Müller
8fa4ebaf6d Merge pull request #18724 from owncloud/expiration-cronjob 
Versions expiration cronjob
 2015-09-18 11:11:47 +02:00
Thomas Müller
c18156a4fe Merge pull request #19121 from owncloud/sidebar-design-details 
fix Files sidebar layout of Versions and Sharing
 2015-09-17 18:03:56 +02:00
Jan-Christoph Borchardt
de1bc0b653 fix sidebar Versions layout 2015-09-17 13:15:45 +02:00
Jenkins for ownCloud
0155bcf278 [tx-robot] updated from transifex 2015-09-17 01:55:25 -04:00
Victor Dubiniuk
e3c067c2e1 Correct method title. Add docblock 2015-09-16 17:22:17 +03:00
Victor Dubiniuk
1f7ac2c309 Postrebase cleanup 2015-09-15 21:12:49 +03:00
Victor Dubiniuk
0cefbd76b9 Add expiration for versions older than max 2015-09-15 21:12:39 +03:00
Victor Dubiniuk
cb529acc5c Follow PSR 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3dc5b0317 Add method docblock 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
f46b434a12 Namespacing, reusing 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3e055549e Improvements 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
b95d1e6683 Add quota status to expiration check 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
7ef937d8ad Add versions obligation 2015-09-15 17:08:54 +03:00
Morris Jobke
4251dcecca Remove unneeded include 
* fixes #18867
* ref #18748
 2015-09-07 10:33:23 +02:00
Vincent Petry
310d797284 Add versions tab to files sidebar 
- move versions to a tab in the files sidebar
- added mechanism to auto-update the row in the FileList whenever values
  are set to the FileInfoModel given to the sidebar
- updated tags/favorite action to make use of that new mechanism
 2015-09-03 16:47:24 +02:00
Thomas Müller
40203d7d1e Remove languages which are no longer maintained on transifex 2015-08-26 12:19:24 +02:00
Jenkins for ownCloud
90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Jenkins for ownCloud
2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Roeland Jago Douma
f0b617b508 Use DI 
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
e84cffc063 Moved core apps to the capabilities manager 
* Files
* Files_Sharing
* Files_Trashbin
* Files_Versions
 2015-08-10 10:45:16 +02:00
Thomas Müller
dba6ba2523 Merge pull request #16964 from owncloud/versions_occ 
add occ tool to delete versions
 2015-07-06 15:34:40 +02:00
Joas Schilling
c7968d202f Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified 
[Master] Delete OCS ID from DB if none is specified
 2015-07-02 12:37:31 +02:00
Lukas Reschke
b100036457 Bump versions 2015-07-02 09:18:41 +02:00
Lukas Reschke
68f8717056 [master] Remove OCS IDs 
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
 2015-07-02 08:45:16 +02:00
Jenkins for ownCloud
d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Morris Jobke
044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util 
Move core apps from OC_Log::write to OCP\Util
 2015-07-01 08:53:16 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Lukas Reschke
3d2ac6dbb6 Use trusted mimetype 
We shall not use untrusted mimetypes in this context
 2015-06-22 15:30:27 +02:00
Bjoern Schiessle
b645d795d2 add occ tool to delete versions 2015-06-16 16:56:27 +02:00
Jenkins for ownCloud
3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Joas Schilling
bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Joas Schilling
4e24486a89 Check whether the user exists before trying to set up his file system 2015-06-05 11:31:49 +02:00
Jenkins for ownCloud
baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Vincent Petry
9a6d253af3 Abort expiration when file is gone 
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.

This prevents showing useless warnings in the log and simply bail out.
 2015-05-29 13:15:12 +02:00
Vincent Petry
7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay 
wait with copying the skeleton untill login and setupfs are done
 2015-05-20 13:52:08 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Robin Appelman
724f88d9ff fix tests 2015-05-18 12:11:32 +02:00
Roeland Jago Douma
7a8072e958 Move core apps from OC_Log::write to OCP\Util 2015-05-18 10:57:52 +02:00
Joas Schilling
03e26a0fbe Merge pull request #16337 from owncloud/versions-expireforowner 
Use owner when expiring versions, not the logged in user
 2015-05-15 15:02:26 +02:00
Vincent Petry
f8a4cc0284 Added unit tests for versions storing 2015-05-15 12:24:34 +02:00
Jenkins for ownCloud
1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Vincent Petry
033b3dac92 Use owner when expiring versions, not the logged in user 2015-05-13 18:40:35 +02:00
Vincent Petry
20d2d8d3dd Merge pull request #15881 from owncloud/share-moveversionsproperly 
Fix version rename with files and folders
 2015-05-11 18:24:34 +02:00
Joas Schilling
2b092f2e93 Add a test for getting the versions of an empty path 2015-05-07 16:02:35 +02:00
Joas Schilling
05fe2006ee Do not run method when the path is empty 2015-05-07 14:31:21 +02:00
Jenkins for ownCloud
b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Vincent Petry
972e189605 Use moveFromStorage instead of streamCopy when restoring version 2015-04-30 16:15:18 +02:00
Vincent Petry
2228faaa39 Fix version rollback to keep fileid 2015-04-30 16:15:18 +02:00
Robin Appelman
be55a90323 dont use our now non existing hook 2015-04-27 14:07:15 +02:00
Vincent Petry
63e2a4a5fa Fix version rename with files and folders 
- fix moving folder into another folder
- fix moving file or folder into shared folder as recipient
 2015-04-27 13:17:03 +02:00
Joas Schilling
3f3f8c2f99 Fix usage of deprecated private constants 2015-04-18 10:30:02 +02:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Bjoern Schiessle
9a7fbbbc5a fix versions tests 2015-04-07 13:30:31 +02:00
Thomas Müller
1b42b492dc kill OC_FileProxy 💥 2015-04-07 13:30:28 +02:00
Thomas Müller
3bf269e565 Merge pull request #15229 from owncloud/response-setContentLengthHeader 
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
 2015-04-03 22:51:36 +02:00
Lukas Reschke
c8c722bc6d Merge pull request #15129 from owncloud/version-command-bus 
expire versions in a background command
 2015-03-26 19:55:13 +01:00
Jan-Christoph Borchardt
e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style 
popover style for apps and user dropdown menus
 2015-03-26 18:07:35 +01:00
Robin Appelman
6447962f2a teardown after we're done 2015-03-26 17:30:43 +01:00
Robin Appelman
1969c8d5c8 save uid instead of user object in command 2015-03-26 17:11:34 +01:00
Robin Appelman
176fba83ea Setup the filesystem in the expire command 2015-03-26 17:07:02 +01:00
Robin Appelman
7ec8f12ad4 expire versions in a background command 2015-03-26 17:07:01 +01:00
Andreas Fischer
0f58315543 Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround. 
Do not send Content-Length headers with a value larger than PHP_INT_MAX
(2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647
instead.

When X-Sendfile is enabled, Apache will send a correct Content-Length header,
even for files larger than 2147483647 bytes. When X-Sendfile is not enabled,
ownCloud will not send a Content-Length header. This prevents progress bars
from working, but allows the actual transfer to work properly.
 2015-03-26 16:37:38 +01:00
Jan-Christoph Borchardt
f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Thomas Müller
df3c73de72 Merge pull request #14403 from owncloud/update-license-headers 
Update license headers
 2015-02-23 13:53:16 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Jenkins for ownCloud
f63b09faca [tx-robot] updated from transifex 2015-02-23 01:55:10 -05:00
Lukas Reschke
602e563d99 Merge pull request #14366 from owncloud/remove-old-l10n-files 
Remove some old l10n files they arent loaded anymore
 2015-02-19 23:31:21 +01:00
Joas Schilling
e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Lukas Reschke
cbe31fbf57 Use int instead of string 2015-02-16 12:01:05 +01:00
Lukas Reschke
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
Jenkins for ownCloud
9baf7a0a3f [tx-robot] updated from transifex 2015-02-11 01:55:07 -05:00
Jenkins for ownCloud
e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Bjoern Schiessle
15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud
a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Vincent Petry
87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Jenkins for ownCloud
f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Björn Schießle
331d73c3a3 Merge pull request #13182 from owncloud/download_versions 
make versions of shared files downloadable
 2015-01-12 12:03:21 +01:00
Thomas Müller
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
Bjoern Schiessle
d699d31518 make versions of shared files downloadable 2015-01-09 12:46:24 +01:00
Lukas Reschke
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
Jenkins for ownCloud
d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Lukas Reschke
a0a3322b94 Remove unused file 
That file is apparently unused - introduced with 30b58f5677

I guess we can remove it...
 2014-12-15 17:29:16 +01:00
Morris Jobke
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
Thomas Müller
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
Lukas Reschke
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
Joas Schilling
694003d147 Autoload lib files of versions app 2014-12-02 17:21:19 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Lukas Reschke
713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang 
cleanup languages. closes #11274
 2014-11-20 16:12:49 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Joas Schilling
76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Joas Schilling
bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Vincent Petry
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
Björn Schießle
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
Bjoern Schiessle
ebe1d3df0a don't move versions if only the mount point was renamed 2014-10-31 16:42:54 +01:00
Vincent Petry
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
Thomas Müller
f776bcd4a0 remove unnecessary require calls - the ownCloud class loader is supposed to take care of this 2014-10-30 17:20:40 +01:00
Thomas Müller
9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Lukas Reschke
206cb5ba63 Fix typo 2014-10-29 10:11:01 +01:00
Bjoern Schiessle
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
Vincent Petry
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
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Thomas Müller
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
Bjoern Schiessle
8e077cf1a4 make sure that we always delete oldest first 2014-10-09 19:15:58 +02:00
Lukas Reschke
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
MTRichards
c7f936cdcb Updated info.xml with 
Added description in line with other apps.
 2014-10-08 21:27:40 -04:00
Jenkins for ownCloud
0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
Jenkins for ownCloud
e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud
53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Jenkins for ownCloud
1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Jenkins for ownCloud
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Lukas Reschke
b12af9ea7f Add routing to files_versions 2014-08-19 15:25:16 +02:00
Lukas Reschke
69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese 
remove obsolete japanese lang code
 2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Jenkins for ownCloud
411f6c7704 [tx-robot] updated from transifex 2014-08-11 01:54:32 -04:00
Bjoern Schiessle
785ae5dc9a add unit test to make sure getVersions returns the correct result 2014-08-05 17:26:23 +02:00
Bjoern Schiessle
b7ada5da57 make sure that the versions array contains the correct path 2014-08-05 17:25:55 +02:00
Bjoern Schiessle
1a797f90bb add unit test for rename and copy operation 2014-07-30 15:14:01 +02:00
Bjoern Schiessle
dba2574c52 make sure that we always find all versions 2014-07-30 15:14:01 +02:00
Bjoern Schiessle
c738f71657 make the versions and encryption app aware of the copy operation 2014-07-30 15:14:01 +02:00
Jenkins for ownCloud
010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Jenkins for ownCloud
ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Jenkins for ownCloud
b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04:00
Robin Appelman
aab33b8b0e Remove deleted versions from the cache 2014-07-10 15:19:40 +02:00
Vincent Petry
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
Georg Ehrke
e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Robin Appelman
18572b2367 Dont delete versions as local files 2014-07-07 15:49:08 +02:00
Thomas Müller
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
Jan-Christoph Borchardt
7760fd4bef add ellipsizing to restore string if text is too long 2014-07-01 20:37:14 +02:00
Morris Jobke
eaf9d6eccc increase width of version dropdown - fixes #9270 2014-07-01 16:17:00 +02:00
Jörn Friedrich Dreyer
12420d08e2 change order of registering api and capabilities to fix file version previews 2014-07-01 14:09:48 +02:00
Morris Jobke
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
Bjoern Schiessle
8052d2901d initialize array 2014-06-18 13:23:53 +02:00
geez0x1
7576dde0a3 Update the modified date in UI on file reversion 2014-06-17 22:22:03 +02:00
Bjoern Schiessle
f4a183e753 wwe no longer have a versions table 2014-06-10 14:47:32 +02:00
Thomas Müller
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
Jenkins for ownCloud
f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Thomas Müller
8ee15025f0 Fix merge conflict 2014-06-03 19:05:21 +02:00
Thomas Müller
2bb902d028 use OC_DB::dropTable() 2014-06-02 18:57:53 +02:00
Bjoern Schiessle
7ad0fee0b5 let file cache handle the versions size 2014-06-02 18:55:13 +02:00
Vincent Petry
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
Vincent Petry
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
Vincent Petry
c64e920b4d Adjust core apps to use "requiremin" instead of "require" 
Also added a few missing authors.
 2014-05-27 11:54:44 +02:00
Jenkins for ownCloud
3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Morris Jobke
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
Andreas Fischer
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
Jenkins for ownCloud
a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Robin McCorkell
6930ae22e4 Fix more missing or broken PHPDoc 2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Thomas Müller
58857b8df5 @returns -> @return 2014-05-13 19:09:15 +01:00
Thomas Müller
4dd1a49a68 remove legacy aka deprecated code: OC_Filesystem 2014-05-12 16:20:07 +02:00
Thomas Müller
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
Jenkins for ownCloud
1abd9c1305 [tx-robot] updated from transifex 2014-04-19 01:56:06 -04:00
Jenkins for ownCloud
796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Thomas Müller
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
Robin McCorkell
50dba97bde Miscellaneous text fixes for core apps 2014-03-26 15:43:03 +00:00
Thomas Müller
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
Jenkins for ownCloud
4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Georg Ehrke
9a5c2d0080 add preDelete hook for files_versions app 2014-03-11 14:17:08 +01:00
Jenkins for ownCloud
b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Scrutinizer Auto-Fixer
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
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +01:00
Robin Appelman
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Jan-Christoph Borchardt
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
raghunayyar
932e8f9f58 Fixes width of the dropdown menus as per computed styles. 2014-01-26 02:59:28 +05:30
Bjoern Schiessle
a567f74d86 fix array order 2014-01-22 11:13:15 +01:00
Bjoern Schiessle
8d36ddcf03 code clean-up 2014-01-22 11:10:32 +01:00
Bjoern Schiessle
0b89a45f11 fix size calculation of getAllVersions() 2014-01-22 11:10:23 +01:00
Bjoern Schiessle
85269641db add first unit test for the versioning app 2014-01-21 16:22:08 +01:00
Bjoern Schiessle
9efd07fbab isolate getExpireList function to make it testable 2014-01-21 16:22:08 +01:00
Thomas Müller
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
Vincent Petry
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
raghunayyar
fd49d3c5c5 Fixes typo in versions.css 2014-01-16 14:45:23 +05:30
raghunayyar
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
Bjoern Schiessle
76fa7bab63 call getFileInfo to enforce a file cache entry for the new version, fix #6286 2014-01-15 11:37:47 +01:00
Vincent Petry
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
Thomas Müller
2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition 
Files androidcontentdisposition
 2014-01-07 11:06:20 -08:00
Jenkins for ownCloud
d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud
e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud
77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Vincent Petry
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
Jenkins for ownCloud
079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
zombiehugs
519f63ee97 Revert "[fix] Center Share Dropdown & Versions Dropdown" 
This reverts commit 1dbbfcf3dc.
 2013-12-03 08:23:13 -06:00
zombiehugs
1dbbfcf3dc [fix] Center Share Dropdown & Versions Dropdown 
Center Share Dropdown & Versions Dropdown
 2013-12-03 08:14:06 -06:00
Jenkins for ownCloud
1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Morris Jobke
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
Bjoern Schiessle
348706854c use better coding style 2013-11-28 19:31:35 +01:00
Bjoern Schiessle
bef5108218 detect mimetype from the original filename, without the versioning timestamp 2013-11-28 18:59:38 +01:00
Bjoern Schiessle
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
Björn Schießle
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
Bjoern Schiessle
f8fcd567a7 move files to owners trash 2013-11-25 16:51:31 +01:00
Bjoern Schiessle
acf74b24f2 remove unused variable 2013-11-22 16:10:30 +01:00
Bjoern Schiessle
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
Jenkins for ownCloud
c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
Frank Karlitschek
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
Georg Ehrke
238e4bc3eb implement delete hooks in file versions lib 2013-11-12 14:06:32 +01:00
Jenkins for ownCloud
e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Jenkins for ownCloud
e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Vincent Petry
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
Jenkins for ownCloud
630be99ddf [tx-robot] updated from transifex 2013-10-16 00:31:48 -04:00
Bjoern Schiessle
9baedb4102 remove debug output 2013-10-11 17:06:43 +02:00
Bjoern Schiessle
c32c5979d8 Merge branch 'master' into versioning_preview_shared 2013-10-11 17:00:21 +02:00
Bjoern Schiessle
a0de5dd325 some small fixes 2013-10-11 10:34:34 +02:00
Bjoern Schiessle
f4e86045de make files versions root a class constant 2013-10-10 20:09:38 +02:00
Bjoern Schiessle
87cccb2e32 some small changes/fixes 2013-10-10 20:06:42 +02:00
Bjoern Schiessle
4c2e3919de make previews work for shared files in the versions drop-down 2013-10-10 17:23:27 +02:00
Bjoern Schiessle
92009c5d8e fix getVersions() for sub directories 2013-10-10 16:58:11 +02:00
Bjoern Schiessle
bb3b38947d add missing preview link 2013-10-10 14:57:25 +02:00
Bjoern Schiessle
e56947255e don't use glob() and getLocalFile(), this can lead to problems on windows servers 2013-10-10 14:43:40 +02:00
ringmaster
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
raghunayyar
cf84154ee0 Cleans up Core apps for relative(em) to absolute(px) styles. 2013-10-06 23:38:24 +05:30
Bjoern Schiessle
54dd91b859 remove hover effect from preview image 2013-10-04 15:13:05 +02:00
Morris Jobke
2cfb5fb2d2 vertical align versions text 2013-10-04 14:13:48 +02:00
Bjoern Schiessle
b0a71bde15 maxX and maxY should be a integer 2013-10-02 16:34:05 +02:00
Bjoern Schiessle
eb1216f949 add previews to versions dialog 2013-10-02 15:23:51 +02:00
Jenkins for ownCloud
a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Jenkins for ownCloud
6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Jenkins for ownCloud
556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Jenkins for ownCloud
72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Jenkins for ownCloud
e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jenkins for ownCloud
0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Jenkins for ownCloud
fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Jenkins for ownCloud
d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Thomas Müller
c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Christopher
90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou 
Fix some JSLint warnings
 2013-08-20 12:45:10 -07:00
Björn Schießle
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
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou
edd92e4c09 Merge branch 'master' into fix_jslint_kondou 
Conflicts:
	apps/files/js/file-upload.js
 2013-08-18 00:38:52 +02:00
Morris Jobke
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
Bjoern Schiessle
f28f528431 switched to dirname() 2013-08-17 13:49:42 +02:00
Bjoern Schiessle
db8fdd5032 added missing parameter documentation 2013-08-17 13:46:33 +02:00
Björn Schießle
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
Bjoern Schiessle
f71794f0d5 added createMissingDirectories() method 2013-08-17 13:28:35 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Thomas Müller
e761cba808 Merge pull request #4480 from owncloud/remove-ru_RU-master 
remove ru_RU - fixes #3135
 2013-08-17 03:10:42 -07:00
Morris Jobke
50147bfbd1 Merge pull request #4193 from owncloud/versions_fix_css 
Versions fix css
 2013-08-17 03:01:24 -07:00
Bjoern Schiessle
16efd81a0e first check if file exists before checking the files size 2013-08-17 11:57:50 +02:00
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Bjoern Schiessle
137cd2ca89 increase width of versions dialog 2013-08-17 11:01:43 +02:00
Jenkins for ownCloud
6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Bjoern Schiessle
a3d009e3b5 also create root dir if it doesn't exist yet 2013-08-14 20:51:36 +02:00
Bjoern Schiessle
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
Jenkins for ownCloud
9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Jenkins for ownCloud
98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Björn Schießle
c2f40d2495 Merge pull request #4243 from owncloud/no_empty_versions 
don't create empty versions
 2013-08-08 03:57:43 -07:00
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Jenkins for ownCloud
9923fe655b [tx-robot] updated from transifex 2013-08-04 02:01:28 -04:00
Jenkins for ownCloud
b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
kondou
aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Bjoern Schiessle
853b106bb2 don't create empty versions 2013-07-30 16:01:27 +02:00
Bjoern Schiessle
22b8967031 check if app is enabled 2013-07-30 12:19:01 +02:00
Jenkins for ownCloud
88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Jenkins for ownCloud
0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00
Jenkins for ownCloud
48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Jenkins for ownCloud
fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Björn Schießle
62f84ff79c css for button no longer needed 2013-07-25 12:29:39 +02:00
Björn Schießle
e5b0c1e78b remove unused code; use jquery 2013-07-25 11:15:24 +02:00
Björn Schießle
16d8074d77 fix css 2013-07-25 11:15:01 +02:00
Björn Schießle
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 b91c682
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 12:28:06 2013 +0200

    Merge branch 'master' into new_versions_dropdown

commit c9612781e10a4de9e9405244f87c4e29428a0d3f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 11:05:25 2013 +0200

    replace modal dialog with a OC.Notification

commit 3dc7508a4c271818247afbaed0ce0b03706a8db6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 10:33:05 2013 +0200

    use image path without extension for proper svg to png fallback

commit 23ea7ad46c73fa4b86021070eb58a3b92bc8362e
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 17:53:58 2013 +0200

    some css fixes

commit 8d01499ae17e43a7d7960841a7c2127fa6de5a56
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 17:40:16 2013 +0200

    small fixes and improvements according to @Kondou-ger comments

commit 985b6461e81035967959659fab8ea59c733e00eb
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 15:58:19 2013 +0200

    replace == with ===

commit bc8fc3b4a664db2d819e0a7091f31207ffcfe44a
Merge: c1da183 a94c55b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 13:55:45 2013 +0200

    Merge branch 'master' into new_versions_dropdown

commit c1da183d13b8098eb33e708d4fdd04111bdc33a5
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 13:53:37 2013 +0200

    translate timestamps into strings like "X minutes ago" for the versions drop-down

commit c78d2b4bfb0a6800ab8516ac115ba42268be019a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 12:52:44 2013 +0200

    download versions directly from the versions drop-down

commit 14aaf9907625fc76bc153cd846704b7efd15db46
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 11:01:21 2013 +0200

    only show 'more versions' button of necessary

commit a0d8cb46b2255be3d9b3f9bd5f835a173c9665b8
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:49:17 2013 +0200

    remove unneeded code

commit 47eec0679ce16ece0b7890e9b41bf28d7613b131
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:44:58 2013 +0200

    add title for revert and download action

commit df87ccb24327b5c2770f7c23c97e41b143d65ec3
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:36:40 2013 +0200

    add download button to versions drop-down

commit 622c87ec37c14b7b3237bc9ca980b7f35689a933
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:36:08 2013 +0200

    adapt css file for the new versions drop-down

commit 300699024fe74a9f0f998c1cce4024484311f50c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jun 7 17:28:34 2013 +0200

    revert on click

commit 6673ae6ed45bbda1e0d962e9b32e943afc7123c0
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jun 7 16:50:08 2013 +0200

    new versions list, show the latest 5 with a button to retrieve more versions if needed
 2013-07-25 10:35:19 +02:00
Björn Schießle
b16c5a6df7 fix array access and change variable names according to the coding style 2013-07-12 11:25:40 +02:00
Björn Schießle
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
Björn Schießle
fbf34f3bf6 fix some var names according to our style guide 2013-07-12 11:25:23 +02:00
Björn Schießle
2f0d88cae4 adjust comments 2013-07-12 11:25:12 +02:00
Björn Schießle
e7959d3da0 fix typo in comment 2013-07-12 11:25:04 +02:00
Björn Schießle
e8760d7284 also expire versions on rename, to update the history more regularly 2013-07-12 11:24:52 +02:00
Björn Schießle
d6c1e5490d it is enough to call the expire function once 2013-07-12 11:24:31 +02:00
Björn Schießle
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
Jenkins for ownCloud
7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
Jenkins for ownCloud
3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jenkins for ownCloud
01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Björn Schießle
efb026c664 don't normalize absolute local path 2013-06-17 14:42:18 +02:00
Björn Schießle
f91b02e9b6 only escape glob pattern 2013-06-14 15:07:06 +02:00
Jenkins for ownCloud
3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Jenkins for ownCloud
67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Florin Peter
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
Jenkins for ownCloud
afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Björn Schießle
96ff19a703 fix history template, print_unescaped() needs to include closing tags 2013-05-14 21:22:30 +02:00
Jenkins for ownCloud
74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Björn Schießle
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
Björn Schießle
b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Jenkins for ownCloud
7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Jenkins for ownCloud
7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +02:00
Jenkins for ownCloud
a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +02:00
Björn Schießle
ddde1b65db adapt free space calculation to the way it is done for the trash bin 2013-04-17 10:43:12 +02:00
Björn Schießle
01d203c773 add explenation of the expire function to the apps description 2013-04-16 12:31:33 +02:00
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Jenkins for ownCloud
33ee2e2f10 [tx-robot] updated from transifex 2013-04-12 02:11:02 +02:00
Björn Schießle
544a46c690 remove used space for versions from db is a user was deleted 2013-04-11 14:39:56 +02:00
Jenkins for ownCloud
b02db643d0 [tx-robot] updated from transifex 2013-04-11 02:10:41 +02:00
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Jenkins for ownCloud
ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Jenkins for ownCloud
29d33ff7c2 [tx-robot] updated from transifex 2013-04-02 00:04:27 +02:00
Jenkins for ownCloud
cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
Jenkins for ownCloud
5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Jenkins for ownCloud
0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Björn Schießle
5924d1d95c add backticks around table names 2013-03-25 12:29:13 +01:00
Jenkins for ownCloud
63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Björn Schießle
418fb98c40 remove backticks around table names 2013-03-15 12:10:21 +01:00
Björn Schießle
e37e884d7a add backtick for db queries to prevent postgresql errors 2013-03-15 12:10:07 +01:00
Frank Karlitschek
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
Jenkins for ownCloud
0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Björn Schießle
f78594c0ae fix var name 2013-03-14 17:09:48 +01:00
Björn Schießle
93b2ada6f6 fix var name 2013-03-14 17:08:16 +01:00
Björn Schießle
0cf50d63bf create new version if the same file is uploaded again over the web interface 2013-03-14 16:47:59 +01:00
Jenkins for ownCloud
f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Tom Needham
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
Tom Needham
e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud
0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Bernhard Posselt
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
Björn Schießle
8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Björn Schießle
45869afa5a remove debug output 2013-03-08 10:51:28 +01:00
Jenkins for ownCloud
308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Björn Schießle
48bb53030c distinguish between touch and write 2013-03-07 15:51:44 +01:00
Jenkins for ownCloud
c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Tom Needham
370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Björn Schießle
2a5d9ca9c5 damn copy&paste, fix wrong var name 2013-03-04 12:59:48 +01:00
Björn Schießle
21bad1fcc0 fix type in var name 2013-03-04 12:33:16 +01:00
Björn Schießle
94dab96dba fix quota calculation for trash and versions 2013-03-04 12:17:57 +01:00
Jenkins for ownCloud
844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Jenkins for ownCloud
6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Bernhard Posselt
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
Björn Schießle
70014d37dc fix expire function 2013-03-04 17:20:14 +01:00
j-ed
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
Jenkins for ownCloud
c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke
5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Björn Schießle
a01540a300 fix getVersions() call for the history view 2013-03-01 13:55:10 +01:00
Björn Schießle
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
Jenkins for ownCloud
d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01:00
maelzx
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
Jenkins for ownCloud
a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke
fc5331eaec [files_versions] From echo to p 2013-02-27 21:50:22 +01:00
Björn Schießle
f8bcd38d4d remove admin settings from app.php 2013-02-27 15:53:08 +01:00
Björn Schießle
6cf147003f Merge branch 'master' into versions_cleanup 2013-02-27 15:50:08 +01:00
Björn Schießle
9b220d0b93 rename History to Versions 2013-02-27 15:46:49 +01:00
Björn Schießle
d9e75c2b92 remove admin settings for versions 2013-02-27 15:44:02 +01:00
Björn Schießle
5c7e3cf2e2 escape regular expressions; fix typo in variable name 2013-02-27 10:51:32 +01:00
Björn Schießle
b917646516 fix quota calculation 2013-02-25 16:12:44 +01:00
Björn Schießle
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
Bernhard Posselt
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
Björn Schießle
632ca9f06d Merge branch 'master' into update-expire-function 
Conflicts:
	apps/files_trashbin/lib/trash.php
 2013-02-25 11:14:06 +01:00
Robin Appelman
4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer
e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Björn Schießle
9edec542c5 mount users home before write/read file to it, necessary to deal with external homes 2013-02-22 13:15:47 +01:00
Bart Visscher
59582e0f3f Fix review issues 2013-02-22 00:21:06 +01:00
Jenkins for ownCloud
734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher
db8dbb9847 Style cleanup files_versions 2013-02-21 23:47:21 +01:00
Björn Schießle
629097bee7 increase db fileds for usernames 2013-02-21 22:44:44 +01:00
Björn Schießle
0a5457c550 fix getVersions(), we need to get the correct user and filename 2013-02-21 14:40:16 +01:00
Björn Schießle
c24ec867f9 calculate versions size per user 2013-02-21 12:20:29 +01:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Frank Karlitschek
57fbfaf86a Merge pull request #1787 from maelzx/patch-1 
Update apps/files_versions/js/versions.js
 2013-02-20 08:32:36 -08:00
Björn Schießle
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
maelzx
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
Jenkins for ownCloud
99758dce2b [tx-robot] updated from transifex 2013-02-20 00:03:28 +01:00
Jenkins for ownCloud
76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Thomas Mueller
f343d9d247 files_versions no longer contains a personal settings page -> remove the call 2013-02-18 23:04:22 +01:00
Björn Schießle
efa024cc62 fix getUidAndFilename() function 2013-02-18 11:19:40 +01:00
Jenkins for ownCloud
3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Jenkins for ownCloud
c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Björn Schießle
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
Jenkins for ownCloud
b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Björn Schießle
b05f05ec4a make store function static 2013-02-14 14:26:49 +01:00