c30c153ea5
fixing typos and l10n
2013-09-19 11:13:11 +02:00
89ed0007c0
jsdoc types should go into {}
2013-09-19 11:11:22 +02:00
cda58ae3df
css selectors never have a : before []
2013-09-19 10:14:07 +02:00
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
f7800cd63e
fix 'event is not defined' error
2013-09-19 09:47:51 +02:00
ae4775a683
Merge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-master
...
fixing syntax error - it it that hard to test own code?
2013-09-18 22:17:04 -07:00
de8d0783ed
fixing syntax error - it it that hard to test own code?
2013-09-18 23:46:58 +02:00
43a96621ea
adding comma to get cleaner diffs in the future
2013-09-18 23:42:36 +02:00
3c0e93e220
no file actions during upload
2013-09-18 23:06:48 +02:00
72d53008cc
indentation
2013-09-18 17:58:15 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
7bd5e89f8c
simplify conflict template handling, fix reopen after ESC
2013-09-18 17:22:29 +02:00
12ff268e60
move upload dialog css to separate file
2013-09-18 17:20:14 +02:00
64cc13a8d3
allow passing classes to buttons
2013-09-18 17:13:07 +02:00
817b8d151b
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
...
Split personal and user-mgmt password change logic
2013-09-18 07:53:11 -07:00
18a2c48ceb
Translate errormsgs in settings/changepassword/controller
2013-09-18 16:47:27 +02:00
715846626e
hide excessive logging with a trace flag
2013-09-18 14:39:39 +02:00
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
ec1949f5ed
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-18 14:15:28 +02:00
1eb42626f5
Merge pull request #4769 from owncloud/gitignore_apps_fix
...
add slash so inverts are triggered
2013-09-18 04:58:05 -07:00
c531b4ef5b
Merge pull request #4872 from owncloud/refactor_upload_progress
...
refactor upload progress
2013-09-18 04:55:10 -07:00
20a43d1982
remove file action elements before recreating them
2013-09-18 13:09:47 +02:00
6ed2df11fc
store the permissions retrieved via ajax within the dom element
2013-09-18 13:09:04 +02:00
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
b54e9be0ac
Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page
...
disable avatar loading on public guest page
2013-09-18 02:33:44 -07:00
370ed814f7
add permissions of the file to the json response
2013-09-18 11:22:29 +02:00
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
342a420eba
disable avatar loading on public guest page
2013-09-17 19:25:03 +02:00
e43e961dcb
we cannot load avatar on guest page
2013-09-17 19:20:16 +02:00
3f7f6434d1
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-17 19:11:47 +02:00
86c4c83b86
use exists
2013-09-17 19:11:18 +02:00
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
c2e413e852
add fixme
2013-09-17 18:45:38 +02:00
8bdafaf4e0
make 'open in folder' action default for files
2013-09-17 18:40:52 +02:00
00772a8470
use correct doublequotes in template, remove container
2013-09-17 18:40:52 +02:00
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
72eaf2894a
performance improvement, check configuration only if no private key exists
2013-09-17 16:53:52 +02:00
2e79aab0ce
Merge pull request #4871 from owncloud/add_exists_method_to_jquery
...
add exists method to jquery
2013-09-17 06:07:50 -07:00
c8f9efeb94
etag changes are now propagated up the file tree
2013-09-16 23:32:17 +02:00
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
07714d9a72
Tests whether expired/valid link share is still accessible.
2013-09-16 21:24:16 +02:00
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
...
Fix Sharing "Expiration Date" on Oracle
2013-09-16 12:16:44 -07:00
3b42ac8eb6
Merge branch 'master' into fixing-4866-master
2013-09-16 18:06:17 +02:00
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
d41e722629
refactor upload progress
2013-09-16 14:14:46 +02:00
afe4f6a794
add exists method to jquery
2013-09-16 13:47:37 +02:00
9297b8f678
fix gitignore for all apps* folders
2013-09-16 12:11:15 +02:00
3c026b7cf6
recreate an etag within the scanner if the cache contains an empty etag
2013-09-16 12:09:15 +02:00
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
c20f01bbf0
Merge pull request #4862 from owncloud/db_to_public
...
Add OCP\DB::getErrorMessage() to public namespace.
2013-09-16 00:51:12 -07:00
Thomas Müller
Jörn Friedrich Dreyer
Christopher
Bart Visscher
Bjoern Schiessle
Morris Jobke
Björn Schießle
Bernhard Posselt
Andreas Fischer