Arthur Schiwon
0b90cc0b4b
Ldap Wizard: also disable tabs, if the first step is not complete
2013-10-17 19:13:29 +02:00
Arthur Schiwon
6b160d8507
LDAP Wizard: make Back and Continue work
2013-10-17 19:13:29 +02:00
Arthur Schiwon
63e9c56d48
LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port detection
2013-10-17 19:13:29 +02:00
Arthur Schiwon
f64ae75107
LDAP Wizard: fix couple more or less nasty bugs aka polishing
2013-10-17 19:13:28 +02:00
Arthur Schiwon
7ad8319488
do not instantiate LDAP Proxy if there are no active configurations
2013-10-17 19:13:28 +02:00
Arthur Schiwon
109ddde944
Wizard: autodetection of group-member-assoc attribute
2013-10-17 19:13:28 +02:00
Arthur Schiwon
5606b60f36
LDAP: set displayname as default attribute for user display name
2013-10-17 19:13:28 +02:00
Arthur Schiwon
c975021a67
clean up
2013-10-17 19:13:28 +02:00
Arthur Schiwon
3ae696f843
Wizard does not need data-defaults here
2013-10-17 19:13:28 +02:00
Arthur Schiwon
f6b60c6586
LDAP Wizard: add forgotten templates
2013-10-17 19:13:28 +02:00
Arthur Schiwon
def834b0a1
LDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean up Advanced settings, too. This is all done via Wizard, now.
2013-10-17 19:13:28 +02:00
Arthur Schiwon
b2ccb712e2
Ldap Wizard: Group Filter configuration
2013-10-17 19:13:28 +02:00
Arthur Schiwon
7c6a9c2256
Ldap Wizard: Login filter UI, detection of username attribute, composing of login filter
2013-10-17 19:13:28 +02:00
Arthur Schiwon
e903db7887
LDAP Wizard: create user list filter, show number of user that will have access to OC
2013-10-17 19:13:28 +02:00
Arthur Schiwon
5c99645f7d
Cleanup code, sort results
2013-10-17 19:13:27 +02:00
Arthur Schiwon
162bfb231a
Ldap Wizard: find out whether server supports memberOf in LDAP Filter and disable group chooser if not
2013-10-17 19:13:27 +02:00
Arthur Schiwon
e87b091536
cleanup and coding style
2013-10-17 19:13:27 +02:00
Arthur Schiwon
87bd5a2bbb
cleanup, doc and todo
2013-10-17 19:13:27 +02:00
Arthur Schiwon
3cafcc2d47
LDAP Wizard: add detection, load and save of LDAP groups for filter purposes
2013-10-17 19:13:27 +02:00
Arthur Schiwon
5425511259
Remove debug output
2013-10-17 19:13:27 +02:00
Arthur Schiwon
ee1b597345
css cleanup
2013-10-17 19:13:27 +02:00
Arthur Schiwon
3b1822cf91
LDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes
2013-10-17 19:13:27 +02:00
Arthur Schiwon
8290929aa6
LDAP Wizard: autodetect base DN
2013-10-17 19:13:14 +02:00
Arthur Schiwon
7c60384f20
ignore autodetect-attribute on public save method
2013-10-17 19:13:14 +02:00
Arthur Schiwon
3fe400a3ca
Simplify WizardResult
2013-10-17 19:13:14 +02:00
Arthur Schiwon
53db1fe5ac
First stage of new Wizard, neither feature complete nor ready
2013-10-17 19:13:14 +02:00
Arthur Schiwon
652caa1c88
LDAP: move Configuration out of Connection into class of its own. The new wizard requires it.
2013-10-17 19:13:14 +02:00
Arthur Schiwon
02f292d0fd
Doc fix
2013-10-17 19:01:08 +02:00
Morris Jobke
d8f22160a4
Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero
...
Fixed zip download button for unlimited filesize in public mode
2013-10-17 08:23:20 -07:00
Bjoern Schiessle
e7dc6b21c8
split up reset()['path'] to make it compatible with older PHP versions
2013-10-17 15:47:36 +02:00
Vincent Petry
b4bffad99a
Fixed zip download button for unlimited filesize in public mode
...
Added missing condition to check whenever allowed zip size is unlimited.
Fixes #3717
2013-10-17 15:30:08 +02:00
Vincent Petry
467f864db4
Fixed sharing status update for new/uploaded files
...
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.
For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.
Performance should improve as the sharing list is now only loaded once
per navigation session.
In OC.Share, split loadIcons into loadIcons + updateIcons.
Fixes #4977
2013-10-17 12:55:10 +02:00
Morris Jobke
ea4f6e2431
Merge pull request #5378 from owncloud/files-permissionsafteruploadfix
...
Fixed upload permissions distinction between public and logged in upload
2013-10-17 03:50:26 -07:00
Bjoern Schiessle
99738ae0bc
add test for the reshare option
2013-10-17 12:23:37 +02:00
Bjoern Schiessle
ab6ee79e11
adjust tests
2013-10-17 11:23:07 +02:00
Bjoern Schiessle
abf10ac9bd
new option to add reshares to the result
2013-10-17 11:10:31 +02:00
Vincent Petry
9cfb438ff7
Fixed upload permissions distinction between public and logged in upload
...
Fixes #5370
2013-10-17 10:46:55 +02:00
Frank Karlitschek
d70a6c3f98
Merge pull request #4935 from owncloud/webdav-depth-fix-master
...
WebDAV depth infinity support - the dirty way
2013-10-17 01:37:38 -07:00
Morris Jobke
a132144eca
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
...
Fixed conflict dialog in IE8
2013-10-16 12:52:41 -07:00
Morris Jobke
db31541fe1
Merge pull request #5353 from owncloud/files-dndtodirbroken
...
Fixed drag and drop to subfolder and breadcrumb
2013-10-16 04:52:35 -07:00
Björn Schießle
9f8d52ee44
Merge pull request #5329 from owncloud/enc_fix_unencrypted_size
...
try to fix unencrypted file size if it doesn't look plausible
2013-10-16 02:25:28 -07:00
Bjoern Schiessle
6bfd8bdf63
revert last changes
2013-10-16 11:24:56 +02:00
Morris Jobke
97905775b0
Merge pull request #5354 from owncloud/enc_tests
...
added simple test for getFileSize proxy
2013-10-16 02:14:35 -07:00
Jenkins for ownCloud
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
Bjoern Schiessle
0811d2e304
added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong
2013-10-15 17:52:06 +02:00
Bjoern Schiessle
beaed2195d
fix comment
2013-10-15 17:36:52 +02:00
Bjoern Schiessle
0d4117f6d5
added simple test for getFileSize proxy
2013-10-15 17:33:31 +02:00
Morris Jobke
04ea419f50
Merge pull request #5334 from owncloud/files-sharing-actionsafterupload
...
Files sharing actions + navigation fixes
2013-10-15 08:11:17 -07:00
Vincent Petry
c6f14001bb
Fixed drag and drop upload to breadcrumb
2013-10-15 16:14:23 +02:00
Vincent Petry
92e646413a
Fixed drag and drop onto folders
...
Fixes #5351
2013-10-15 15:59:45 +02:00
Morris Jobke
52501d6ba3
Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files
...
check if we are writing to user/files, otherwise skip encryption
2013-10-15 02:44:14 -07:00
Björn Schießle
a6d9319328
Merge pull request #5269 from owncloud/ocs_share_api_add_received_from
...
ocs share api: add "received_from" and "received_from_displayname" field
2013-10-15 02:17:23 -07:00
Vincent Petry
4ae1d08241
Merge pull request #5330 from owncloud/files-removedfileactionsbkg
...
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 09:23:06 -07:00
Vincent Petry
fab4102c51
Disabled ajax mode for public files view
...
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
2013-10-14 17:47:38 +02:00
Vincent Petry
09b084dfed
Fixed file permissions after public upload
...
Fixes #5328
2013-10-14 17:28:53 +02:00
Bjoern Schiessle
d3af7a9aa4
check if we are writing to user/files, otherwise skip encryption
2013-10-14 17:13:14 +02:00
Vincent Petry
e79d853867
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 17:05:24 +02:00
Bjoern Schiessle
58196304b8
fix array key
2013-10-14 16:43:18 +02:00
Bjoern Schiessle
4151fd3ed9
try to fix unencrypted file size if it doesn't look plausible
2013-10-14 16:34:14 +02:00
Vincent Petry
b8285ca316
Added missing "grid" class on external storage's table
2013-10-14 14:02:39 +02:00
Jenkins for ownCloud
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
Morris Jobke
a021a12b3b
Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator
...
Fixed external storage status indicator in admin page
2013-10-13 13:03:02 -07:00
kondou
f828b51ede
Hide files list header, when theres no files to see
2013-10-12 17:28:20 +02:00
Thomas Müller
bff6ca212a
Merge pull request #5301 from owncloud/versioning_preview_shared
...
versioning preview also for shared files
2013-10-12 01:32:25 -07:00
Morris Jobke
22bb9762fd
Merge pull request #5304 from owncloud/files-deleteiconpositionfix
...
Fixed position of "delete" icon in files app
2013-10-11 12:39:33 -07:00
Thomas Müller
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Vincent Petry
a4a52733f9
Fixed position of "delete" icon in files app
...
There was an issue where only Chrome allows setting position: relative
on a td element.
This fix now works in IE8, Firefox and Chrome.
Fixes #5056
2013-10-11 18:01:15 +02:00
Vincent Petry
067475a907
Merge pull request #5302 from owncloud/files-missingfileactionsafteradd
...
File actions are now updated after create/upload file
2013-10-11 08:45:42 -07:00
Vincent Petry
b2986e1994
Merge pull request #5274 from owncloud/files-ie8-deletecheckbox
...
Fixed delete icon alignment in IE8
2013-10-11 08:24:57 -07:00
Vincent Petry
e98ea06890
File actions are now updated after create/upload file
...
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.
Fixes #4971 and #4993
2013-10-11 17:07:48 +02: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
Björn Schießle
5c664704a3
Merge pull request #5261 from owncloud/versioning_no_glob
...
versioning: don't use glob() and getLocalFile()
2013-10-11 07:57:14 -07:00
Björn Schießle
9a15aa8ee9
Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines
...
fix setting dialog headlines for the encryption app
2013-10-11 07:15:58 -07:00
Bjoern Schiessle
57beef1e36
fix setting dialog headlines for the encryption app
2013-10-11 15:56:08 +02:00
Björn Schießle
034968c612
Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing
...
encryption: block file access if share keys are missing
2013-10-11 06:37:53 -07:00
Bjoern Schiessle
3ee7711284
fix another typo
2013-10-11 15:26:30 +02:00
Bjoern Schiessle
2d79a79202
change error code to 403
2013-10-11 15:24:49 +02:00
Bjoern Schiessle
83c78bc7a8
fix typo in error message and change error code to 403
2013-10-11 15:23:12 +02:00
Vincent Petry
2b2a548610
Fixed IE8 misaligned date
...
Removed display: block to let the element be displayed inline and let
itself aligned by vertical-align: middle of the parent
This works in IE8 and other browsers.
Fixes #5288
2013-10-11 14:23:37 +02:00
Bjoern Schiessle
39d710e737
block file access if share keys are missing
2013-10-11 14:20:46 +02:00
Vincent Petry
39b150921d
Moved IE8 inline styles in files.css
2013-10-11 14:10:00 +02:00
Vincent Petry
bced346c3b
Now using smaller spinner image for status indicator
...
To make the status indicator appear smaller, even in IE8 that doesn't
support background-size, there is no a smaller animated gif
"loading-small" for that purpose.
2013-10-11 12:36:30 +02:00
Björn Schießle
4336d42ab0
Merge pull request #5233 from owncloud/enc_filter_users
...
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Bjoern Schiessle
a0de5dd325
some small fixes
2013-10-11 10:34:34 +02:00
Bjoern Schiessle
7a1705d28e
fix api tests
2013-10-11 10:28:01 +02:00
Jenkins for ownCloud
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
Vincent Petry
75629a1f00
Fixed delete icon alignment in IE8
...
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056 )
2013-10-11 00:16:41 +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
3dd313dca2
add "received_from" and "received_from_displayname" field in case of a reshared file to the output
2013-10-10 19:46:45 +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
Vincent Petry
e2a4417079
Fixed conflict dialog in IE8
...
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +02:00
Bjoern Schiessle
909af2b62e
don't cache if the encryption is enabled, this can lead to problems during unit testing
2013-10-10 15:02:52 +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
Morris Jobke
e276ffedd3
Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken
...
Fixed files view regular file actions in IE8
2013-10-10 05:14:09 -07:00
Morris Jobke
cf554fd804
Merge pull request #5182 from owncloud/fix-sharring-with-password-screen
...
Fix password screen for public shares
2013-10-10 04:49:47 -07:00
blizzz
666e52a46b
Merge pull request #5114 from owncloud/ldap_uuid_attr_groups
...
LDAP: allow different UUID attributes for groups and users
2013-10-10 03:27:28 -07:00
Vincent Petry
bf00ccd1d6
Fixed files view regular file actions in IE8
...
Fixes #5256
A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
2013-10-10 12:21:02 +02:00
Vincent Petry
e88b493136
Fixed external storage status indicator in admin page
...
- Fixes #5241
- Fixed indicator to appear, its selector was wrong
- Added spinner while saving an entry's settings
- Removed ajax "async: false" that blocked the browser while saving
2013-10-10 11:12:21 +02:00
VicDeo
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
Bjoern Schiessle
a1719deabe
make sure that we are logged in ad user1 while performing the tests
2013-10-10 10:47:35 +02:00
Vincent Petry
3a3819b303
Merge pull request #5134 from owncloud/trashbin-homeiconbroken
...
Do not call changeDirectory() when no dir set on breadcrumb
2013-10-09 09:01:43 -07:00
Vincent Petry
b1f1357957
Added ownCloud backend for external storage
...
To make it possible to use the short ownCloud URL (without specifying
webdav.php or remote.php), a new backend is available for ownCloud.
The user must specify the host + context path in the "Url" field (which
is mapped to the "host" parameter) and the subdir to mount in the "Root"
field.
This is to prevent confusion because some users forget to append
webdav.php or remote.php to the WebDAV URL.
Fixes #4923
2013-10-09 17:30:22 +02:00
Björn Schießle
223adc3167
Merge pull request #5230 from owncloud/trashbin_fixes
...
Trashbin fixes
2013-10-09 08:27:54 -07:00
Bjoern Schiessle
7ab4fef7a9
update file summary after group delete/restore
2013-10-09 16:17:43 +02:00
Bjoern Schiessle
38e5da05af
only encrypt file to users with encryption keys
2013-10-09 15:56:21 +02:00
Bjoern Schiessle
46bce8e540
fix checkbox
2013-10-09 13:15:53 +02:00
Bjoern Schiessle
51cfdb32b1
fix indention
2013-10-09 12:43:56 +02:00
Bjoern Schiessle
31a91ef892
fix group delete/restore
2013-10-09 12:35:15 +02:00
Thomas Müller
9637ca3ae8
Merge pull request #5070 from owncloud/smb-streamwrapper-fixes
...
Various fixes for the streamwrapper based SMB backend
2013-10-09 03:05:51 -07:00
Bjoern Schiessle
9e3d28871e
fix delete/restore individual files
2013-10-09 12:01:25 +02:00
Bjoern Schiessle
4404963918
fix trashbin layout
2013-10-09 11:11:55 +02:00
Thomas Müller
8a06f2e128
php 5.3 compatibility for Test_Files_Sharing_Api
2013-10-08 23:05:19 +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
Vincent Petry
cddb85c588
Added filesApp flag as input field for files app detection
...
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
2013-10-08 17:19:58 +02:00
Morris Jobke
6284ab31de
fix escaping
2013-10-08 16:00:26 +02:00
Bjoern Schiessle
68e1dd1f23
make sure that we only remove file/folder shares
2013-10-08 16:00:18 +02:00
Thomas Müller
7c6ed6ab33
catch exceptions while uploading and pass on the error message
2013-10-08 15:03:24 +02:00
Jenkins for ownCloud
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
VicDeo
372a73d43a
Merge pull request #5184 from owncloud/fix-trash-bin-button
...
Fix trash bin button
2013-10-07 10:58:47 -07:00
Jenkins for ownCloud
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
Morris Jobke
980fc9cc7e
Fix trash bin button
2013-10-07 18:15:23 +02:00
Morris Jobke
4af220d09e
Fix password screen for public shares
...
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
* Credits to Julian Müller @Julian1998
2013-10-07 17:38:27 +02:00
Vincent Petry
a3d0e29aa5
Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
...
Added isPublic flag in files_sharing template
2013-10-07 08:23:55 -07:00
VicDeo
d8b7e42fc1
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
...
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
Vincent Petry
6a36d7fa86
Added isPublic flag in files_sharing template
...
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.
This is required to disable the editor app in public mode to fix #5059
2013-10-07 16:59:57 +02:00
Morris Jobke
193e815133
Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix
...
Fix breadcrumb to reinit dnd after ajax nav #5064
2013-10-07 05:01:02 -07:00
Jörn Friedrich Dreyer
4ccbace68d
remove double uri encoding
2013-10-07 11:15:58 +02:00
Jörn Friedrich Dreyer
0683372200
canceling individual uploads is currently impossible because there is no placeholder
2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
3be8e3f8d3
remove obsolete comment
2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
8899543b7f
use !== comparison
2013-10-07 11:14:10 +02:00
Vincent Petry
6a4563f203
Fix breadcrumb to reinit dnd after ajax nav #5064
...
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.
This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02:00
Björn Schießle
981608cf6b
Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
...
remove deleted files from oc_share
2013-10-07 02:07:11 -07:00
Bjoern Schiessle
288f01bf62
catch exception if db query execution fails
2013-10-07 11:06:24 +02:00
Bjoern Schiessle
4f67b7a6c3
Merge branch 'master' into remove_deleted_shares_from_db
2013-10-07 11:00:56 +02:00
Bjoern Schiessle
0346167bb2
clean up oc_share table from files which are no longer exists
2013-10-07 10:59:09 +02:00
Frank Karlitschek
46fdb449a4
Merge pull request #4662 from owncloud/fix-4129
...
Fix 4129
2013-10-06 23:42:44 -07:00
Jenkins for ownCloud
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
Lennart Rosam
5470700c9a
Update file to meet coding standarts
2013-10-07 01:08:39 +02:00
Lennart Rosam
72ad309920
Actually test the connection
2013-10-07 01:08:38 +02:00
Lennart Rosam
b9a948b597
Fixes #4129
2013-10-07 01:08:38 +02:00
Morris Jobke
e1e16ec3b0
Merge pull request #5088 from owncloud/fix_trashbin_button
...
trash bin button needs to be an input field
2013-10-06 14:51:08 -07:00
raghunayyar
cf84154ee0
Cleans up Core apps for relative(em) to absolute(px) styles.
2013-10-06 23:38:24 +05:30
raghunayyar
39906cefbf
Converts em to px values for styles in Files.
2013-10-06 23:28:22 +05:30
Jan-Christoph Borchardt
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
Morris Jobke
cc1e69c190
Merge pull request #5136 from owncloud/design-fixes
...
Design fixes
2013-10-04 14:56:09 -07:00
Morris Jobke
a927c145be
Merge pull request #5102 from owncloud/input-simplify
...
Input simplify
2013-10-04 10:40:32 -07:00
Jan-Christoph Borchardt
fcb9b49d1f
increase font size of file actions for better readability
2013-10-04 20:25:18 +03:00
Vincent Petry
0736bfb43a
Do not call changeDirectory() when no dir set on breadcrumb
...
Some apps like the files_trashbin app do not set a directory on its
"home" breadcrumb link.
This fix makes sure that the click event doesn't do anything in that
case and lets the browser open the link.
This fixes the "home" icon in the trashbin app which now correctly
reopens the files app.
2013-10-04 17:49:42 +02:00
Bjoern Schiessle
401740166b
add comments
2013-10-04 16:50:53 +02:00
Jan-Christoph Borchardt
da0db7bcb2
fix multiselect bar opacity, webroot
2013-10-04 17:32:06 +03:00
Björn Schießle
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
Jan-Christoph Borchardt
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
Björn Schießle
7337b34110
Merge pull request #5085 from owncloud/versioning_preview
...
add previews to versions dialog
2013-10-04 06:13:54 -07:00
Bjoern Schiessle
54dd91b859
remove hover effect from preview image
2013-10-04 15:13:05 +02:00
Bjoern Schiessle
2e7f481e6b
update tests
2013-10-04 14:32:15 +02:00
Vincent Petry
ba0f2f10a7
Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug
...
Replace plus sign with space in files app URL #4932
2013-10-04 05:30:30 -07:00
Morris Jobke
2cfb5fb2d2
vertical align versions text
2013-10-04 14:13:48 +02:00
Bjoern Schiessle
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
Bjoern Schiessle
dd2bf69152
use true/false instead of yes/no for publicUpload and subfiles parameter
2013-10-04 12:16:47 +02:00
Bjoern Schiessle
a1fe5148b5
use always path as parameter to specify a file/folder
2013-10-04 12:10:11 +02:00
Arthur Schiwon
0c837cefb6
LDAP: allow different UUID attributes for groups and users
2013-10-04 11:47:40 +02:00
Morris Jobke
c38638fdf4
Merge pull request #4815 from owncloud/ldap_improve_testing
...
LDAP modularization and tests
2013-10-04 02:41:06 -07:00
Björn Schießle
5b7f76e702
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
...
Encryption improved error messages
2013-10-04 02:28:18 -07:00
Björn Schießle
1992450b32
Merge pull request #4902 from owncloud/repeat_recovery_password
...
let user repeat the recovery key password to prevent typos
2013-10-04 02:23:01 -07:00
Vincent Petry
9d2595a7c5
Shortened notification message that was too long
...
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
2013-10-04 11:11:24 +02:00
Bjoern Schiessle
b7c3af11bf
fix hidden fieled name
2013-10-04 10:46:55 +02:00
Bjoern Schiessle
47f59d2e42
we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
2013-10-04 10:37:58 +02:00
Jan-Christoph Borchardt
c335169f6d
increase height of controls bar and elements to more clickable 44px
2013-10-04 08:41:16 +03:00
Jan-Christoph Borchardt
13218ec689
remove duplicate upload CSS from files.css
2013-10-03 17:08:29 +03:00
Jan-Christoph Borchardt
f3e0cbdeed
fix position of New and Deleted Files buttons
2013-10-03 16:49:49 +03:00
Jan-Christoph Borchardt
308d4383a3
simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius
2013-10-03 16:35:42 +03:00
Morris Jobke
5501dd623e
add/remove specific CSS class - not all classes
2013-10-03 12:22:25 +02:00
Thomas Müller
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
Robin Appelman
51c34777c4
extend test case
2013-10-02 22:28:19 +02:00
Jan-Christoph Borchardt
f8093699f7
Merge pull request #5093 from owncloud/file-actions
...
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
raghunayyar
0d5653c6b1
Takes nametext inside the anchor tag to fix the issue completely.
2013-10-02 22:11:03 +05:30
raghunayyar
4a5f3442b5
Closes Label inside the a tag for not hiding the fileactions.
2013-10-02 21:40:34 +05:30
raghunayyar
81b4904c78
File Selected on Click instead of download.
2013-10-02 21:13:07 +05:30
Jan-Christoph Borchardt
5feaa55779
simplify From Link icon in New menu
2013-10-02 18:27:39 +03:00
Jan-Christoph Borchardt
9853b33420
reduce rounded corners of New dropdown
2013-10-02 18:04:08 +03:00
Bjoern Schiessle
b0a71bde15
maxX and maxY should be a integer
2013-10-02 16:34:05 +02:00
Bjoern Schiessle
9be6114a52
trash bin button needs to be an input field
2013-10-02 16:13:08 +02:00
Bjoern Schiessle
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
Bjoern Schiessle
aa660a3475
remove deleted shares from the database table oc_share
2013-10-02 13:26:38 +02:00
kondou
feb7028a78
Remove require in rawlist.php
...
Thanks @tanghus for pointing out the unneccessity of it.
2013-10-02 12:45:30 +02:00
kondou
013e9c27d2
Fix require in apps/files/ajax/rawlist.php
2013-10-02 12:21:52 +02:00
Bjoern Schiessle
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
Robin Appelman
de43515cfa
fix recursive delete for smb
2013-10-01 22:33:58 +02:00
Robin Appelman
29deef38b2
fix using touch to create a file for smb
2013-10-01 22:31:22 +02:00
Robin Appelman
ea566868a8
return the correct result when doing an smb rename
2013-10-01 22:29:33 +02:00
Robin Appelman
ea6115bfaa
fix smb streamwrapper on non existing files
2013-10-01 22:18:03 +02:00
Thomas Müller
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
Jenkins for ownCloud
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
Bjoern Schiessle
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
Thomas Müller
ecfde5faa1
Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the handling of depth infinity
...
The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released.
This will and has to follow!
2013-09-30 13:12:51 +02:00
Thomas Müller
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
Bjoern Schiessle
513dc20d4b
also return success if no shares are found.
2013-09-30 13:05:34 +02:00
Bjoern Schiessle
6d830087db
add testUpdateShareUpload()
2013-09-30 12:57:55 +02:00
Bjoern Schiessle
03db954e1a
add getShareFromFolder() test
2013-09-30 12:38:36 +02:00
Bjoern Schiessle
9a2e82c3c5
Make sure that testDeleteShare() has some shares to delete
2013-09-30 12:23:44 +02:00
Thomas Müller
952433eae6
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
2013-09-30 09:21:37 +02:00
Thomas Müller
258e8d58da
flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted
2013-09-29 22:20:42 +02:00
Thomas Müller
63ea6844e8
- adding unit test testGetShareFromUnknownId()
...
- fixing getShareFromId() for Oracle
- fixing error message
2013-09-29 22:16:48 +02:00
Thomas Müller
5462e199d3
Merge branch 'master' into appframework-master
2013-09-29 20:07:56 +02:00
Jenkins for ownCloud
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
Morris Jobke
0f5fed5409
fix license header line breaks
2013-09-27 17:02:57 +02:00
Thomas Müller
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
Thomas Müller
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
Bjoern Schiessle
f935a38559
add some comments
2013-09-27 14:04:28 +02:00
Bjoern Schiessle
5b4f515e7b
add test getShareFromId
2013-09-27 14:01:04 +02:00
Arthur Schiwon
3e1bdd8a04
remove outdated (thus failing) and anyway insufficient group tests - for now
2013-09-27 13:34:16 +02:00
Arthur Schiwon
05ee6606f1
give test file a proper name
2013-09-27 13:34:16 +02:00
Arthur Schiwon
2cebd8b92e
added user_ldap tests via public api calls
2013-09-27 13:34:16 +02:00
Arthur Schiwon
a1aff3e8a1
LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors
2013-09-27 13:34:16 +02:00
Arthur Schiwon
81cf4a22ef
LDAP: coding style
2013-09-27 13:34:15 +02:00
Arthur Schiwon
84f522f406
LDAP: simple tests for the user backend
2013-09-27 13:34:15 +02:00
Arthur Schiwon
bb162b1f94
LDAP: get rid of some PHP Warnings
2013-09-27 13:34:15 +02:00
Arthur Schiwon
d4f92494a2
LDAP: make Access be a dependency to the user and group backend instead of inheriting it.
2013-09-27 13:34:15 +02:00
Arthur Schiwon
b9cc2ad660
Whitespaces
2013-09-27 13:34:15 +02:00
Arthur Schiwon
f04aa1af5d
LDAP: don't check var type when you can specify the type in the parameter list
2013-09-27 13:34:15 +02:00
Arthur Schiwon
b9cd22cf78
LDAP: use wrapper, not direct function call
2013-09-27 13:34:15 +02:00
Arthur Schiwon
5090ca3eb4
LDAP: add phpdoc
2013-09-27 13:34:15 +02:00
Arthur Schiwon
6e850e0bee
LDAP: establish wrapper interface to allow proper mocking
2013-09-27 13:34:15 +02:00
Arthur Schiwon
52454e39b7
LDAP: move is_resource check to ldap wrapper to make it mockable
2013-09-27 13:34:15 +02:00
Arthur Schiwon
d34fbf3a86
LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing
2013-09-27 13:34:15 +02:00
Arthur Schiwon
1a020e0696
Resolve merge conflict
2013-09-27 13:34:15 +02:00
Jenkins for ownCloud
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
Bjoern Schiessle
7e54e8831e
set rememberlogin to false for the encryption app
2013-09-26 19:34:50 +02:00
Bjoern Schiessle
62b8c36a40
check if encryption app is enabled before trying to calculate file size
2013-09-26 16:27:14 +02:00
Bjoern Schiessle
b9d6539d76
Merge branch 'master' into ocs_share_api
2013-09-26 13:02:39 +02:00
Bjoern Schiessle
663009f895
fix check if app is enabled
2013-09-26 11:08:02 +02:00
Bjoern Schiessle
4d2dfa98c0
check if key exists before reading it
2013-09-26 11:06:58 +02:00
Bjoern Schiessle
0b98427536
fix check if app is enabled
2013-09-25 19:23:07 +02:00
Bjoern Schiessle
71bbb2ea8b
check if key exists before reading it
2013-09-25 17:44:05 +02:00
Thomas Müller
09b64535a9
fixing copyright and add class documentation
2013-09-25 17:05:14 +02:00
Bjoern Schiessle
4077ed6ddb
add some additional assertions to the tests
2013-09-25 15:05:23 +02:00
Thomas Müller
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Thomas Müller
333d3eda99
add error message to the assert
2013-09-25 09:43:16 +02:00
Jenkins for ownCloud
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
Thomas Müller
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
kondou
d7409547aa
Fix not displaying "Upload something!" message
...
Fix #4940
2013-09-23 16:39:42 +02:00
Bjoern Schiessle
259f03bee2
remove debug output
2013-09-23 14:10:09 +02:00
Georg Ehrke
8a1618bce5
implement previews for public upload
2013-09-23 12:27:05 +02:00
Bjoern Schiessle
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
Bjoern Schiessle
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
Georg Ehrke
edd38e5948
fix previews in shared folders
2013-09-23 10:26:46 +02:00
Jenkins for ownCloud
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
Thomas Müller
2a0c51a8bf
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
...
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
Vincent Petry
1962bed261
Replace plus sign with space in files app URL #4932
...
Some apps create URLs to the files app and encode the spaces of a
directory using plus signs.
This fix ensures that plus signs are properly converted back to spaces
when parsing the URL on the JS side.
2013-09-20 22:08:57 +02:00
Jenkins for ownCloud
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
Jörn Friedrich Dreyer
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
Jörn Friedrich Dreyer
9e39118b52
namespaces use upcasefirst parts
...
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
Bjoern Schiessle
7626540679
make sure that files are shared correctly before each test and unshared again after the test
2013-09-20 12:38:23 +02:00
Bjoern Schiessle
bd09910f67
disable encrpytion app before performing tests
2013-09-20 11:24:18 +02:00
Bjoern Schiessle
96c27ead92
check if encryption app is enabled
2013-09-20 11:21:34 +02:00
Bart Visscher
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
Bjoern Schiessle
57092e817f
disable encryption app for share API tests
2013-09-19 20:14:34 +02:00
Jörn Friedrich Dreyer
6aeb0a99da
same for search by mime
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
3b4020e811
add all results, sharing cache also returns entries for shared files in external storages
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
466fd8acda
fix getAll(), refactor search by mime & search
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
392c6b6832
return fixed path, skip shared files outside of 'files'
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
27511d9187
divide ids into chunks of 1k
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
Bart Visscher
a9ea99e93d
Add copyright, remove starting blank line
2013-09-19 19:12:16 +02:00
Jörn Friedrich Dreyer
7e0631b3b8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
Bjoern Schiessle
39920955f2
set share id to 'unknown' if we can't retrive one
2013-09-19 16:52:44 +02:00
Jörn Friedrich Dreyer
bd5cb1d801
Merge pull request #4900 from owncloud/fixing-4488-master
...
File permissions are part of the ajax response of file upload
2013-09-19 07:46:37 -07:00
Bjoern Schiessle
c9f1538c1f
extend API to get the shares from all files in a given folder
2013-09-19 16:41:29 +02:00
Jörn Friedrich Dreyer
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer
98ff847830
fix race condition in lazy preview loading
2013-09-19 14:46:33 +02:00
Bjoern Schiessle
8cf8c0b161
remove some unused variables
2013-09-19 14:42:34 +02:00
Bjoern Schiessle
b947aab802
some unit test for the new ocs share api
2013-09-19 14:39:51 +02:00
Thomas Müller
4344c62f7e
Merge branch 'master' into fixing-4488-master
2013-09-19 11:43:38 +02:00
Jörn Friedrich Dreyer
1bba800e47
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
2013-09-19 11:33:34 +02:00
Jörn Friedrich Dreyer
ae97fad632
fix double translation of error message
2013-09-19 11:32:56 +02:00
Thomas Müller
eea02cee2f
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-19 11:15:20 +02:00
Thomas Müller
c30c153ea5
fixing typos and l10n
2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer
89ed0007c0
jsdoc types should go into {}
2013-09-19 11:11:22 +02:00
Bjoern Schiessle
199121134f
return error if wrong shareType is given
2013-09-19 10:33:04 +02:00
Bjoern Schiessle
bc3b147396
remove spaces
2013-09-19 10:13:21 +02:00
Jörn Friedrich Dreyer
0d81a53e12
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
2013-09-19 10:00:42 +02:00
Thomas Müller
43a96621ea
adding comma to get cleaner diffs in the future
2013-09-18 23:42:36 +02:00
Thomas Müller
3c0e93e220
no file actions during upload
2013-09-18 23:06:48 +02:00
Jenkins for ownCloud
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
Jörn Friedrich Dreyer
7bd5e89f8c
simplify conflict template handling, fix reopen after ESC
2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer
12ff268e60
move upload dialog css to separate file
2013-09-18 17:20:14 +02:00
Bjoern Schiessle
4edd8b8303
remove debug output
2013-09-18 16:08:29 +02:00
Bjoern Schiessle
5fb0e257a4
let user repeat the recovery key password to prevent typos
2013-09-18 16:03:53 +02:00
Jörn Friedrich Dreyer
715846626e
hide excessive logging with a trace flag
2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer
17337b22af
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-18 14:19:58 +02:00
Jörn Friedrich Dreyer
ec1949f5ed
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-18 14:15:28 +02:00
Jörn Friedrich Dreyer
c531b4ef5b
Merge pull request #4872 from owncloud/refactor_upload_progress
...
refactor upload progress
2013-09-18 04:55:10 -07:00
Thomas Müller
20a43d1982
remove file action elements before recreating them
2013-09-18 13:09:47 +02:00
Thomas Müller
6ed2df11fc
store the permissions retrieved via ajax within the dom element
2013-09-18 13:09:04 +02:00
Thomas Müller
370ed814f7
add permissions of the file to the json response
2013-09-18 11:22:29 +02:00
Björn Schießle
e0f18ec72b
Merge pull request #4708 from owncloud/encryption_fixes
...
make sure that initial encryption also starts for a fresh installation
2013-09-18 01:33:52 -07:00
Bjoern Schiessle
171b7ebffe
remove debug output
2013-09-18 10:11:20 +02:00
Jörn Friedrich Dreyer
86c4c83b86
use exists
2013-09-17 19:11:18 +02:00
Jörn Friedrich Dreyer
b59ce403d8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
Jörn Friedrich Dreyer
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
Bjoern Schiessle
72eaf2894a
performance improvement, check configuration only if no private key exists
2013-09-17 16:53:52 +02:00
Bjoern Schiessle
e52639e4e6
use share ID as REST resource
2013-09-17 15:27:46 +02:00
Thomas Müller
9b420e8660
use \OC::$server->getPreviewManager() instead of \OCP\Preview
2013-09-17 13:33:47 +02:00
Bjoern Schiessle
86dbb13823
more rest-style API
2013-09-17 11:53:38 +02:00
Bjoern Schiessle
ef3307f099
return error if public upload is disabled
2013-09-16 17:42:56 +02:00
Jenkins for ownCloud
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
Bjoern Schiessle
7aed24fa6c
allow to set a different permission during initial share operation
2013-09-16 17:28:17 +02:00
Bjoern Schiessle
14437ffd15
ocs api for file sharing
2013-09-16 17:04:49 +02:00
Jörn Friedrich Dreyer
d41e722629
refactor upload progress
2013-09-16 14:14:46 +02:00
Bjoern Schiessle
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
Bjoern Schiessle
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
Thomas Müller
46f59b165e
Merge pull request #4838 from owncloud/refactor_upload_js
...
refactor upload js & html to always use only js to fill form data
2013-09-16 01:06:24 -07:00
Thomas Müller
db7e1dd877
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
...
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
Thomas Müller
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
kondou
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-14 14:35:23 +02:00
Jenkins for ownCloud
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
Vincent Petry
ec2f20f720
Fixed files_trashbin to also use hash URL part for IE8
2013-09-13 21:00:15 +02:00
Vincent Petry
30a2f2f352
Use hash part of URL for IE8 in files app
...
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.
This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.
From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.
In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.
When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
2013-09-13 20:48:35 +02:00
Vincent Petry
4d38441e72
Fixed loading mask/spinner to stay fixed on scroll
2013-09-13 19:59:15 +02:00
Vincent Petry
611075bf20
Fixed JS error in trashbin app
2013-09-13 19:59:15 +02:00
Vincent Petry
3cf0820d35
Changed breadcrumb event handling to not use delegate
...
Using delegate might break apps that embed themselves in the files
container. When an app embeds itself and the user clicks a breadcrumb,
it will simply reload the whole browser page.
2013-09-13 19:59:15 +02:00
Vincent Petry
364e7991a4
Fixed ajax support to also update the current dir permissions
2013-09-13 19:59:15 +02:00
Vincent Petry
4549cf519e
Added missing "files" JS to files_trashbin module
...
The recent refactoring for the breadcrumb resizing relies on the "Files"
object which is in the "files" Javascript file.
This fix includes it here as well.
2013-09-13 19:59:15 +02:00
Thomas Müller
4ab5e58e02
update file summary on ajax file list load
2013-09-13 19:59:15 +02:00
Thomas Müller
4e751cbb47
fixing breadcrumbs on ajax loading of files
2013-09-13 19:59:15 +02:00
Thomas Müller
ef955bae56
calling replaceSVG() to display breadcrumb images correctly on IE8
2013-09-13 19:59:15 +02:00
Thomas Müller
e6f21927d6
fixing no-repeat for IE8
2013-09-13 19:59:15 +02:00
Vincent Petry
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
Bart Visscher
666bbbe060
Use appinfo/register_command.php to add commands to the console command
2013-09-13 18:10:04 +02:00
Jörn Friedrich Dreyer
7854cf04ee
refactor upload js & html to always use only js to fill form data
2013-09-13 17:07:52 +02:00
Thomas Müller
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
Jan-Christoph Borchardt
c7ca86799b
Merge pull request #4816 from owncloud/fixing-723-master
...
Fixing 723 master
2013-09-12 07:48:00 -07:00
Thomas Tanghus
b7205d97d7
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
...
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
Thomas Müller
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
2013-09-12 00:40:35 +02:00
Thomas Müller
5af111b0de
added determineIcon to \OCA\files\lib\Helper
2013-09-12 00:39:52 +02:00
Thomas Müller
3066b44928
remove unused $relativePath
2013-09-12 00:39:03 +02:00
kondou
4d62f747fa
Clean up rawlist.php and fix non-array request
2013-09-12 00:21:01 +02:00
Thomas Müller
b49f43c3ae
move icon generation logic out of the template
2013-09-12 00:13:19 +02:00
Jenkins for ownCloud
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
kondou
83d3df4111
Split some lines, use ===, avoid unnecessary operation
2013-09-11 12:12:40 +02:00
Bart Visscher
4ab8dc9c08
Merge pull request #4788 from owncloud/fixin-irods-session-master
...
Fixing session handling in iRODS
2013-09-11 00:01:55 -07:00
Thomas Müller
3b835ea1b6
never hack late night
2013-09-11 01:11:57 +02:00
Thomas Müller
ec255b52be
fixing boolean handling
2013-09-11 00:49:45 +02:00
Jörn Friedrich Dreyer
2c9b3d32ef
unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack
2013-09-10 17:34:28 +02:00
Jörn Friedrich Dreyer
cec932f292
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-10 16:54:48 +02:00
Jenkins for ownCloud
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
Thomas Müller
d63ca25a94
proper test for use_logon_credentials
2013-09-10 12:35:14 +02:00
Thomas Müller
36e7a7c29b
use \OC::$session instead of $_SESSION
2013-09-10 12:34:41 +02:00
Thomas Müller
21e5daa218
removing all ?> jutt in case
2013-09-10 11:25:40 +02:00
Thomas Müller
c32c116957
removing ?> followed by whitespaces
2013-09-10 11:16:43 +02:00
Thomas Müller
956a2335ad
Merge pull request #4647 from owncloud/fix_4619
...
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-09-10 01:22:25 -07:00
Thomas Tanghus
2cdde7a56a
Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
...
Fixed missing checkboxes in IE8
2013-09-09 18:25:37 -07:00
Jenkins for ownCloud
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
Vincent Petry
5f67ccba00
Fixed missing checkboxes in IE8
...
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.
Replace it with a more compatible selector.
2013-09-08 22:21:07 +02:00
Jörn Friedrich Dreyer
03c90e968f
whitespace and indentation fixes
2013-09-08 17:29:43 +02:00
Jörn Friedrich Dreyer
577e3f22b2
remove unused hooks
2013-09-08 10:43:52 +02:00
Jörn Friedrich Dreyer
8828fafd36
cleanup comments
2013-09-08 10:41:20 +02:00
Jenkins for ownCloud
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
Jörn Friedrich Dreyer
ce03501646
fine ie8 compatability
2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer
673e0c01a7
fix page leaving checks
2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer
796e137e82
fix upload to folder
2013-09-06 18:51:27 +02:00
Jörn Friedrich Dreyer
e2c0fe8296
fix upload of multiple files
2013-09-06 18:16:40 +02:00
Jörn Friedrich Dreyer
238d92b11c
refactor replace and autorename resolution in upload.php
2013-09-06 17:53:58 +02:00
Bjoern Schiessle
b2dde14dbc
coding style fixes
2013-09-06 16:07:18 +02:00
Bjoern Schiessle
93f4dec798
fix part file handling and real size calculation, this should also solve #4581
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-09-06 16:06:34 +02:00
Bjoern Schiessle
f6830e7462
check shares for the real file and not for the .part file
2013-09-06 16:05:11 +02:00
Bjoern Schiessle
404e36323a
first check if a extension exists before comparing it
2013-09-06 16:05:03 +02:00
Bjoern Schiessle
597a3cf1ad
handle part files correctly
2013-09-06 16:04:56 +02:00
Bjoern Schiessle
3861c9bce1
some more OCS calls for sharing
2013-09-06 16:00:01 +02:00
Jörn Friedrich Dreyer
4d04dd9c4c
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-06 13:42:05 +02:00
Bjoern Schiessle
1558cb860c
remove test code
2013-09-06 13:16:48 +02:00
Bjoern Schiessle
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
Bjoern Schiessle
69b1625f0e
re-added error.php
2013-09-06 12:27:25 +02:00
Pete McFarlane
83afba5070
prefix #filestable to tbody tr
2013-09-06 10:01:11 +01:00
Bjoern Schiessle
b6ee727399
intermediate result ocs api
2013-09-06 10:49:21 +02:00
kondou
226c205631
Use usort() instead of uasort() to not maintain keys
2013-09-06 06:45:16 +02:00
kondou
85e41d9500
Sort files by name, not by mimetype
2013-09-05 23:17:53 +02:00
kondou
f84fe479a5
Only use mimetype_list and clean up a bit
2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer
8a7e26b268
cleanup dead code
2013-09-05 17:46:19 +02:00
kondou
992b59f70b
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-05 16:54:12 +02:00
Bjoern Schiessle
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
Jenkins for ownCloud
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
Arthur Schiwon
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
Jörn Friedrich Dreyer
03ddf8da80
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-05 10:31:43 +02:00
Jörn Friedrich Dreyer
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +02:00
Thomas Müller
3b25babe35
Merge pull request #4683 from owncloud/publicuploadjserror
...
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
Bjoern Schiessle
21a0a96e43
intermediate results, share api
2013-09-04 17:25:15 +02:00
Jörn Friedrich Dreyer
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
Bjoern Schiessle
985758305f
initial commit, start implementing the ocs share api
2013-09-04 14:32:05 +02:00
Jörn Friedrich Dreyer
4af5a8c483
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
Arthur Schiwon
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
Bjoern Schiessle
4dbc787055
check if stream wrapper is already registered to avoid warning
2013-09-03 15:56:25 +02:00
Jörn Friedrich Dreyer
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
Jenkins for ownCloud
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
Bjoern Schiessle
3d49631b8d
make sure that initial encryption also starts for a fresh installation
2013-09-03 13:24:30 +02:00
Jörn Friedrich Dreyer
449fe8c75e
Revert "remove editor div in filelist", add "is deprecated" comment
...
This reverts commit 64d09452f5
.
2013-09-03 13:20:20 +02:00
Bart Visscher
cafc8cb223
Change Files Scan command to use OC\User\Manager
2013-09-02 18:18:12 +02:00
ringmaster
39f4538e0f
This function doesn't cache anymore. Adjusted PHPDoc to suit.
2013-09-02 09:59:01 -04:00
ringmaster
df7bfa4bf0
Don't cache the pkey, skip generation if the keyfile exists
2013-09-02 09:59:00 -04:00
Owen Winkler
9a263a500a
Employ config option for OpenSSL config file, if provided.
...
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
Owen Winkler
fb34f49913
Start a branch for easier OpenSSL configuration.
2013-09-02 09:58:19 -04:00
Bjoern Schiessle
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
Bjoern Schiessle
88c4ac9b98
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-02 14:39:45 +02:00
Bjoern Schiessle
6572ca811f
error.php no longer needed
2013-09-02 11:36:20 +02:00
Bjoern Schiessle
5e508f1ccb
improved documentation of the methods
2013-09-02 11:34:28 +02:00
Bjoern Schiessle
bab63c22ee
encryption error messages, distinguish between a re-enabled encryption app and a password change from outside
2013-09-02 11:26:11 +02:00
Bernhard Posselt
f038cb9aea
Merge pull request #4671 from owncloud/emptycontent
...
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
Jenkins for ownCloud
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
Bart Visscher
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
Vincent Petry
307b673b79
Fixed public upload error that prevents upload
...
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.
This fix sets the variable scope to the window to make it accessible
outside.
2013-09-01 16:14:46 +02:00
Alessandro Cosentino
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -04:00
Alessandro Cosentino
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04:00
Georg Ehrke
668c4c2652
fix issue with filetable background
2013-08-30 22:05:44 +02:00
Georg Ehrke
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
Georg Ehrke
40cee5639e
use gerMimeTypeDetector detectPath instead of getMimeType
2013-08-30 18:07:49 +02:00
Jenkins for ownCloud
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
Bjoern Schiessle
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
petemcfarlane
ab1f78eac3
prefix 'tbody tr' to separate app/core css errors
...
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
2013-08-30 10:48:04 +01:00
Bjoern Schiessle
d7dca966a2
improved error messaging, initial commit
2013-08-30 10:17:50 +02:00
ringmaster
f4ec5182bd
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-08-29 12:06:07 -04:00
Georg Ehrke
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
Thomas Müller
81cab5ada8
Merge pull request #3926 from owncloud/improve_filesummary
...
Improve filelist summary
2013-08-28 15:11:09 -07:00
Bjoern Schiessle
aed71bb420
also move empty folders to the trash bin as discussed here #4590
2013-08-28 15:46:44 +02:00
Bart Visscher
ada15a2b8e
Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
...
Clean 3rdparty mess master
2013-08-28 06:12:58 -07:00
kondou
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
Morris Jobke
5a03707184
Merge pull request #4601 from owncloud/fixing-4341-master
...
backport of #4357 to master
2013-08-28 04:42:50 -07:00
Jenkins for ownCloud
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
Thomas Müller
3eed060ec9
backport of #4357 to master
2013-08-27 23:53:04 +02:00
Morris Jobke
34a32d862c
Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
...
Fix "select all" checkbox displacement when checked, fix #4571
2013-08-27 14:21:34 -07:00
Arthur Schiwon
321c514782
LDAP: case insensitive replace for more robustness
2013-08-27 22:23:48 +02:00
Jenkins for ownCloud
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
Bjoern Schiessle
316d9bfed6
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
2013-08-27 14:39:43 +02:00
Morris Jobke
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
Thomas Müller
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
Thomas Müller
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
Georg Ehrke
b16a018da9
use random string as id for checkbox
2013-08-26 16:33:51 +02:00
Georg Ehrke
d538a566ac
fix background size in filelist.js
2013-08-26 14:36:18 +02:00
Georg Ehrke
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
Georg Ehrke
46cbd7cd3b
fix preview issue when uploading a file with parentheses
2013-08-26 12:16:51 +02:00
Morris Jobke
a5873a96fa
Merge pull request #4542 from owncloud/fixing-4504-master
...
remove duplicate code
2013-08-26 02:19:32 -07:00
Pellaeon Lin
cd41de839f
Fix "select all" checkbox displacement when checked
2013-08-26 10:57:14 +08:00
Jenkins for ownCloud
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
Jenkins for ownCloud
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
Georg Ehrke
13e34649bf
move path generation for previews to dedicated function
2013-08-23 23:19:21 +02:00
Georg Ehrke
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
Jenkins for ownCloud
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
Jörn Friedrich Dreyer
7c9d999243
reduced complexity, added listing conflicts to dialog
2013-08-22 14:29:00 +02:00
Thomas Müller
582b33bdf1
Merge pull request #4537 from owncloud/no-realpath
...
Do not use realpath() on includes.
2013-08-22 01:50:31 -07:00
Thomas Müller
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +02:00
Arthur Schiwon
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +02:00
Georg Ehrke
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
Jörn Friedrich Dreyer
bf04daff82
architecture too complex
2013-08-21 14:58:28 +02:00
Jenkins for ownCloud
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
Andreas Fischer
83afb46205
Use __DIR__ instead of dirname(__FILE__).
...
This is possible because we require PHP 5.3 or higher.
2013-08-21 11:01:24 +02:00
Andreas Fischer
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +02:00
Andreas Fischer
9753e44ac2
Do not use realpath() on includes.
...
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.
'include' works just fine with symlinks, "./" and "../".
2013-08-21 10:52:22 +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
Thomas Müller
884c6b5a82
Merge pull request #4512 from owncloud/readdir-strict-equals
...
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
Jenkins for ownCloud
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
Georg Ehrke
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
Thomas Müller
95e1b62940
Merge pull request #4510 from owncloud/f_e_webdav_urlencoding
...
Fix files_external webdav up and download when path contains ' '
2013-08-19 05:13:20 -07:00
Georg Ehrke
d9e8ebabdc
outsource sharing and deleted files previews to apps
2013-08-19 13:24:07 +02:00
icewind1991
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Robin Appelman
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Jörn Friedrich Dreyer
89c928c3be
replace ' ' with '%20' in urls for curl
2013-08-19 11:09:55 +02:00
Thomas Müller
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
Thomas Müller
6c518797ef
fixing require path
2013-08-18 19:14:14 +02: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
Christopher
c620c5840a
Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
...
move upload progress bar near upload button, more contextual
2013-08-18 09:30:47 -07:00
Kondou
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Bart Visscher
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
Bart Visscher
dda5eb2530
Merge pull request #4486 from owncloud/ldap_adjust_cache
...
LDAP: use memcache if available
2013-08-18 02:50:41 -07:00
Robin Appelman
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
Jan-Christoph Borchardt
dce7cdaaec
remove unneeded extra ID selectors
2013-08-18 11:27:51 +02:00
Bjoern Schiessle
1be11bb03d
don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again
2013-08-18 11:21:01 +02:00
Jan-Christoph Borchardt
bf4efd5290
move upload progress bar near upload button, more contextual
2013-08-18 11:18:16 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Jan-Christoph Borchardt
ce9103d522
Merge pull request #4426 from owncloud/ldap_settings_design
...
Ldap settings design
2013-08-18 01:52:51 -07: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
Andreas Fischer
4bb0e1567b
Use boolean casting for bitwise and result.
2013-08-17 23:41:37 +02:00
Andreas Fischer
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
Thomas Müller
7575186fa6
moving Dropbox and smb4php 3rdparty code over to the apps
2013-08-17 18:20:20 +02:00
Thomas Müller
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
Arthur Schiwon
f41c4312ff
LDAP: use memcache if available
2013-08-17 17:22:54 +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
Björn Schießle
d3e2f31ada
Merge pull request #4352 from owncloud/encryption_clean_up
...
crypt.php clean up
2013-08-17 04:10:15 -07:00
Bart Visscher
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
Arthur Schiwon
c538ac3081
LDAP: only connect to LDAP once on login
2013-08-17 12:16:51 +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
Jan-Christoph Borchardt
7e4dcd268f
vertically center rename input box
2013-08-17 10:46:03 +02:00
Georg Ehrke
164502477d
use jQuery.get instead of jQuery.ajax
2013-08-16 17:25:38 +02:00
Jörn Friedrich Dreyer
64d09452f5
remove editor div in filelist
2013-08-16 17:19:48 +02:00
Morris Jobke
837cefd8a3
Merge pull request #4442 from owncloud/no-smb-client-on-windows-master
...
no files external for SMB on windows
2013-08-16 02:48:42 -07:00
Jörn Friedrich Dreyer
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
Jenkins for ownCloud
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07:00
Thomas Müller
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +02:00
Thomas Müller
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
Thomas Müller
bd1895bdf8
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
...
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
Jan-Christoph Borchardt
e7c0693570
checkstyle double quotes in HTML
2013-08-15 19:40:39 +02:00
Arthur Schiwon
42fc2295e4
LDAP: Update Host in configuration chooser on Save
2013-08-15 16:10:49 +02:00
Arthur Schiwon
479f893f6d
LDAP: Show Host name in configuration drop down
2013-08-15 15:55:06 +02:00
Thomas Müller
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
Bjoern Schiessle
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +02:00
Jan-Christoph Borchardt
2fd5178a00
adjust New file dialog for new styles
2013-08-15 12:50:26 +02:00
Arthur Schiwon
cbfee81068
LDAP: slightly smaller input fields
2013-08-15 12:45:37 +02:00
Thomas Müller
05549884c6
no files external for SMB on windows
2013-08-15 12:00:02 +02:00
Jenkins for ownCloud
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
Morris Jobke
de89c31f5a
Merge pull request #4302 from synchrone/master
...
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
Jan-Christoph Borchardt
b2f666c98f
fix file summary position
2013-08-14 21:26:06 +02:00
Andreas Fischer
75e9015b54
Merge pull request #4393 from owncloud/fix_4326
...
provide correct path for require_once
* owncloud/fix_4326:
use __DIR__ instead of realpath
provide correct path for require_once
2013-08-14 21:20:53 +02:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Bjoern Schiessle
a3d009e3b5
also create root dir if it doesn't exist yet
2013-08-14 20:51:36 +02:00
Jan-Christoph Borchardt
137d644963
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
2013-08-14 20:41:49 +02:00
Jan-Christoph Borchardt
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
Jörn Friedrich Dreyer
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
Georg Ehrke
a255cc6007
fix adding preview-icon to clss attribute
2013-08-14 18:52:53 +02:00
Thomas Müller
b3b2b2d64c
Merge pull request #4363 from owncloud/fix-4355
...
Send mime-type for new files
2013-08-14 09:46:10 -07: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
Jörn Friedrich Dreyer
9da49264ea
change filelist ui updates
2013-08-14 17:49:45 +02:00
Bjoern Schiessle
7d0e9cc685
use __DIR__ instead of realpath
2013-08-14 17:15:01 +02:00
Arthur Schiwon
7b17fd2f17
LDAP: move small info text strings into tooltips
2013-08-14 16:51:38 +02:00
Arthur Schiwon
a4fc9bbe8c
LDAP: right align labels on settings page
2013-08-14 16:38:25 +02:00
Jan-Christoph Borchardt
320bf0e8c1
fix breaking error due to ... a wrong icon link. Seriously?
2013-08-14 16:19:02 +02:00
Georg Ehrke
4f525c864d
lazy load preview icons
2013-08-14 13:27:01 +02:00
Georg Ehrke
e704c8e4dc
use web.svg instead of web.png
2013-08-14 11:51:54 +02:00
Georg Ehrke
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +02:00
Jörn Friedrich Dreyer
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
kondou
4002491947
Reword a phrase
2013-08-14 06:29:19 +02:00
Jenkins for ownCloud
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
Bjoern Schiessle
eb0fdc8380
provide correct path for require_once
2013-08-12 17:38:57 +02:00
Bjoern Schiessle
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
Bjoern Schiessle
7b1067c2a0
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
2013-08-12 16:19:08 +02:00
Bjoern Schiessle
0bab8935c9
preserve mtime if file gets encrypted/decrypted
2013-08-12 14:30:43 +02:00
Bjoern Schiessle
b982868c14
fix array declaration
2013-08-12 13:59:49 +02:00
Jenkins for ownCloud
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
kondou
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
Bjoern Schiessle
44d201a526
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
2013-08-09 15:57:07 +02:00
Bjoern Schiessle
5ba8d38b7f
remove old comments, TODos, etc.
2013-08-09 15:55:17 +02:00
Jenkins for ownCloud
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
Andreas Fischer
beb27168de
Use multiple lines for the JSON data array.
2013-08-08 22:14:21 +02:00
Andreas Fischer
0ab8850478
Adjust JSON code to stable5.
2013-08-08 22:14:21 +02:00
Andreas Fischer
1ed049a682
Do not repeat JSON success code.
2013-08-08 22:14:21 +02:00
Andreas Fischer
0718c92dc8
Do not repeat definition of $target.
2013-08-08 22:13:53 +02:00
Jan-Christoph Borchardt
8652137ad6
Merge pull request #3912 from owncloud/css_cleanup_kondou
...
General CSS cleanup
2013-08-08 07:31:01 -07:00
Thomas Müller
c458e785a1
fixing typos and PHPDoc
2013-08-08 15:08:58 +02:00
Jörn Friedrich Dreyer
ff67f115d4
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-08 13:50:04 +02:00
Bjoern Schiessle
512f98cac9
remove todo item
2013-08-08 13:38:15 +02:00
Bjoern Schiessle
023121aed0
adapt tests to the changes in crypt.php
2013-08-08 13:35:01 +02: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
Thomas Müller
f7915d745a
Merge pull request #4340 from owncloud/true-false-as-filename
...
Allow true and false as filenames.
2013-08-08 00:03:50 -07:00
Bjoern Schiessle
b39d2d1938
more error messages which might be useful for the user to debug his server config
2013-08-08 08:39:11 +02:00
Bjoern Schiessle
7ce03ba37c
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
2013-08-08 08:39:01 +02:00
Bjoern Schiessle
7aeb0068be
also write error message to the log
2013-08-08 08:38:52 +02:00
Bjoern Schiessle
cfbdad9cdb
catch broken server config and disable encryption app.
2013-08-08 08:38:37 +02:00
Bjoern Schiessle
97e910e087
make methods private which are not used from outside
2013-08-08 08:37:39 +02:00
Robin Appelman
d91104e120
actually register html template
2013-08-07 23:48:44 +02:00
Andreas Fischer
67df0a60fb
Check expected type after JSON decode instead of checking what is not expected.
...
This will also allow "true" and "false" as filenames instead of only "null".
2013-08-07 17:01:14 +02:00
Robin Appelman
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
Jenkins for ownCloud
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
Georg Ehrke
41ba155a14
fix js error
2013-08-07 11:58:49 +02:00
Georg Ehrke
91bd4dd67b
implement previews of single shared files
2013-08-07 11:48:08 +02:00
Georg Ehrke
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
Jenkins for ownCloud
0fce89308e
[tx-robot] updated from transifex
2013-08-05 07:54:38 -04:00
Thomas Müller
bf1a9dfae3
Merge pull request #4285 from owncloud/scan-files-script-master
...
adding new cli script to rescan files
2013-08-05 01:09:15 -07:00
Jenkins for ownCloud
9923fe655b
[tx-robot] updated from transifex
2013-08-04 02:01:28 -04:00
Jenkins for ownCloud
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04:00
Thomas Müller
010c4e0b83
remove cli check
2013-08-02 21:28:04 +02:00
Thomas Müller
5e1a775016
adjust usage text
2013-08-02 21:23:26 +02:00
Alexander Bogdanov
72ad843203
Fixing owncloud/core#4301
...
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
2013-08-02 23:18:29 +04:00
Bart Visscher
a7a05b321a
Use console.php entry point for file scanning from console
2013-08-02 15:36:54 +02:00
Jörn Friedrich Dreyer
895d9ba1b9
Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
...
Use !== and === in files_trashbin app
2013-08-02 03:14:24 -07:00
Jenkins for ownCloud
16726ab793
[tx-robot] updated from transifex
2013-08-02 02:00:45 -04:00
kondou
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
Björn Schießle
930f0e4c18
Merge pull request #4270 from owncloud/fix_4253
...
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 07:43:50 -07:00
Jörn Friedrich Dreyer
77dad7070d
Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
...
added @var tags
2013-08-01 07:40:01 -07:00
Jörn Friedrich Dreyer
43c6d82825
Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging
...
write all catched exception messages to the log
2013-08-01 07:38:45 -07:00
Bjoern Schiessle
69173c2a6b
fix test and make warning translatable
2013-08-01 14:19:33 +02:00
Bjoern Schiessle
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
Christian Berendt
5a4c39207e
write all catched exception messages to the log
2013-08-01 10:08:41 +02:00
Christian Berendt
3e53e25cd1
added @var tags
2013-08-01 10:05:01 +02: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
d7dd2ee465
don't know why it works locally but not on the build server... let's keep it out for the moment
2013-07-31 16:44:43 +02:00
Bjoern Schiessle
23e9721644
use OC\Files\View to read encrypted file, so that it also works with external storages
2013-07-31 16:35:14 +02:00
Bjoern Schiessle
fe2937e3cd
this hopefully fixes testRecoveryForUser(), works locally
...
for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
2013-07-31 16:15:49 +02:00
Bjoern Schiessle
58233033c1
this test works locally, let's see what out build server says...
2013-07-31 12:03:50 +02:00
Jenkins for ownCloud
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
Thomas Müller
d3e610f589
Merge pull request #4225 from owncloud/better-404
...
More verbose 404, closes #3225
2013-07-30 13:20:28 -07:00
Victor Dubiniuk
15e9e95817
Use default cursor for list items
2013-07-30 20:58:21 +03:00
Bjoern Schiessle
6c96a5273b
fixing some unit tests
2013-07-30 18:21:23 +02:00
Bjoern Schiessle
2549322763
we need to use the path relative to data/
2013-07-30 18:17:33 +02:00
Bjoern Schiessle
853b106bb2
don't create empty versions
2013-07-30 16:01:27 +02:00
Bjoern Schiessle
a212c98125
handle error if we can't handle the given path
2013-07-30 15:27:59 +02:00
Bjoern Schiessle
a6ced6b53f
remove unused method, the right one is in util.php
2013-07-30 14:28:24 +02:00
Bjoern Schiessle
aca7fbe2c8
adapt unit tests to the modified stream wrapper
2013-07-30 14:18:01 +02:00
Georg Ehrke
93cdfc3e8a
Merge branch 'master' into oc_preview
2013-07-30 13:52:53 +02:00
Bjoern Schiessle
6f20e081e4
added missing isEmpty ajax file
2013-07-30 12:48:41 +02:00
Georg Ehrke
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
Bjoern Schiessle
3640c99462
encrypt/decrypt file versions
2013-07-30 12:19:04 +02:00
Bjoern Schiessle
22b8967031
check if app is enabled
2013-07-30 12:19:01 +02:00
Jan-Christoph Borchardt
1a1c100719
fix loading.gif size for both upload and deletion, force visiblity
2013-07-30 10:44:01 +02:00
Bjoern Schiessle
ba18452eda
only write keyfiles if it was a new file, otherwise nothing changed
2013-07-30 10:43:16 +02:00
Bjoern Schiessle
223d3c91d6
use path relative to data/
2013-07-30 10:14:17 +02:00
Bjoern Schiessle
a7a7ef2b3a
improved error handling
2013-07-30 09:48:30 +02:00
Jenkins for ownCloud
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
Thomas Müller
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
Victor Dubiniuk
33fe24dc3d
Replace delete icon with spinner
2013-07-29 19:27:11 +03:00
Victor Dubiniuk
a10a17f818
Rewording
2013-07-29 18:25:17 +03:00
Björn Schießle
7f9795cc3d
Merge pull request #4203 from owncloud/trashbin_improvements
...
Trashbin improvements
2013-07-29 08:15:53 -07:00
Bjoern Schiessle
4a9f5f64da
remove whitespaces
2013-07-29 17:15:20 +02:00
Bjoern Schiessle
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
Victor Dubiniuk
dec7b2fa40
Move styles from core to app
2013-07-29 17:36:59 +03:00
Georg Ehrke
2ea8ee6139
add class='preview-icon' in trashbin app as well
2013-07-29 16:27:40 +02:00
Victor Dubiniuk
97f2c393c1
Allow apps to have own 404 content, closes #3225
2013-07-29 16:54:19 +03:00
Georg Ehrke
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
Björn Schießle
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
Björn Schießle
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02: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
0a9bb8ba73
reduce time for auto expire to 30 days by default
2013-07-26 15:15:47 +02:00
Björn Schießle
efd8ad6696
found some more places where we can disable buttons while performing a action
2013-07-26 14:54:27 +02:00
Björn Schießle
9d24b9c7e8
Hide Delete Permanently button when Restore happens
2013-07-26 13:17:09 +02:00
Björn Schießle
a5d9b985c3
make 'restored' extension translatable
2013-07-26 12:01:45 +02:00
Björn Schießle
3354249691
fix typo
2013-07-26 11:51:18 +02:00
Björn Schießle
0182a503a6
expire trash bin if trash bin exceeds max size after a new file was added to ownCloud
2013-07-26 11:45:38 +02:00
Björn Schießle
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
Björn Schießle
96e175ffbf
don't move empty folders to the trash bin
2013-07-25 16:27:40 +02:00
Björn Schießle
bf668eb14f
nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored'
2013-07-25 16:20:06 +02:00
Robin Appelman
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02: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