Jörn Friedrich Dreyer
078bf0df25
use {count} instead of 'One' for more versatile translation
10 years ago
Thomas Müller
4344c62f7e
Merge branch 'master' into fixing-4488-master
10 years ago
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
10 years ago
Jörn Friedrich Dreyer
ae97fad632
fix double translation of error message
10 years ago
Jörn Friedrich Dreyer
a6933efce3
use n to translate title
10 years ago
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
10 years ago
Thomas Müller
c30c153ea5
fixing typos and l10n
10 years ago
Jörn Friedrich Dreyer
89ed0007c0
jsdoc types should go into {}
10 years ago
Jörn Friedrich Dreyer
cda58ae3df
css selectors never have a : before []
10 years ago
Jörn Friedrich Dreyer
0d81a53e12
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
10 years ago
Jörn Friedrich Dreyer
f7800cd63e
fix 'event is not defined' error
10 years ago
Christopher
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?
10 years ago
Thomas Müller
de8d0783ed
fixing syntax error - it it that hard to test own code?
10 years ago
Thomas Müller
43a96621ea
adding comma to get cleaner diffs in the future
10 years ago
Thomas Müller
3c0e93e220
no file actions during upload
10 years ago
Jörn Friedrich Dreyer
72d53008cc
indentation
10 years ago
Jenkins for ownCloud
6b1843d91b
[tx-robot] updated from transifex
10 years ago
Jörn Friedrich Dreyer
7bd5e89f8c
simplify conflict template handling, fix reopen after ESC
10 years ago
Jörn Friedrich Dreyer
12ff268e60
move upload dialog css to separate file
10 years ago
Jörn Friedrich Dreyer
64cc13a8d3
allow passing classes to buttons
10 years ago
Bart Visscher
817b8d151b
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
Split personal and user-mgmt password change logic
10 years ago
kondou
18a2c48ceb
Translate errormsgs in settings/changepassword/controller
10 years ago
Jörn Friedrich Dreyer
715846626e
hide excessive logging with a trace flag
10 years ago
Jörn Friedrich Dreyer
17337b22af
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
10 years ago
Jörn Friedrich Dreyer
ec1949f5ed
Merge branch 'master' into fix_3728_with_file_exists_dialog
10 years ago
Jörn Friedrich Dreyer
1eb42626f5
Merge pull request #4769 from owncloud/gitignore_apps_fix
add slash so inverts are triggered
10 years ago
Jörn Friedrich Dreyer
c531b4ef5b
Merge pull request #4872 from owncloud/refactor_upload_progress
refactor upload progress
10 years ago
Thomas Müller
20a43d1982
remove file action elements before recreating them
10 years ago
Thomas Müller
6ed2df11fc
store the permissions retrieved via ajax within the dom element
10 years ago
Bjoern Schiessle
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
10 years ago
Morris Jobke
b54e9be0ac
Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page
disable avatar loading on public guest page
10 years ago
Thomas Müller
370ed814f7
add permissions of the file to the json response
10 years ago
Björn Schießle
e0f18ec72b
Merge pull request #4708 from owncloud/encryption_fixes
make sure that initial encryption also starts for a fresh installation
10 years ago
Jörn Friedrich Dreyer
342a420eba
disable avatar loading on public guest page
10 years ago
Jörn Friedrich Dreyer
e43e961dcb
we cannot load avatar on guest page
10 years ago
Jörn Friedrich Dreyer
3f7f6434d1
Merge branch 'master' into fix_3728_with_file_exists_dialog
10 years ago
Jörn Friedrich Dreyer
86c4c83b86
use exists
10 years ago
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
10 years ago
Jörn Friedrich Dreyer
c2e413e852
add fixme
10 years ago
Jörn Friedrich Dreyer
8bdafaf4e0
make 'open in folder' action default for files
10 years ago
Jörn Friedrich Dreyer
00772a8470
use correct doublequotes in template, remove container
10 years ago
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
11 years ago
Bjoern Schiessle
72eaf2894a
performance improvement, check configuration only if no private key exists
10 years ago
Bernhard Posselt
2e79aab0ce
Merge pull request #4871 from owncloud/add_exists_method_to_jquery
add exists method to jquery
10 years ago
Thomas Müller
c8f9efeb94
etag changes are now propagated up the file tree
10 years ago
Andreas Fischer
a92d4c2c09
Perform expiration date checking before returning share data for token.
10 years ago
Andreas Fischer
07714d9a72
Tests whether expired/valid link share is still accessible.
10 years ago
Bart Visscher
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
Fix Sharing "Expiration Date" on Oracle
10 years ago
Thomas Müller
3b42ac8eb6
Merge branch 'master' into fixing-4866-master
10 years ago
Jenkins for ownCloud
5cf12888ad
[tx-robot] updated from transifex
10 years ago