Georg Ehrke
|
9e4fe10329
|
add test for txt blacklist
|
12 years ago |
|
Georg Ehrke
|
52f1d5856d
|
add test data for cal and contact preview
|
12 years ago |
|
Georg Ehrke
|
31d2048eb8
|
add blacklist to txt preview backend
|
12 years ago |
|
Thomas Müller
|
03eedb58fc
|
Merge pull request #4327 from owncloud/scanfile-remove
remove deleted files while scanning
|
12 years ago |
|
Bart Visscher
|
811f680457
|
Merge pull request #4623 from owncloud/convert-oc_preferences
Convert OC_Preference to object interface
|
12 years ago |
|
Jenkins for ownCloud
|
28918d61d2
|
[tx-robot] updated from transifex
|
12 years ago |
|
Morris Jobke
|
37bd489d2b
|
Merge pull request #4929 from owncloud/fixing-4416-master
Fixing 4416 master
|
12 years ago |
|
Jörn Friedrich Dreyer
|
a1be01c66f
|
Merge pull request #4938 from owncloud/scan-filter-outside-view
When filtering search results, ensure results are children of the...
|
12 years ago |
|
Robin Appelman
|
a1d4eb1f95
|
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
|
12 years ago |
|
Thomas Müller
|
2a0c51a8bf
|
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
namespaces use upcasefirst parts
|
12 years ago |
|
Thomas Müller
|
3189ee2daf
|
setting a default on filecache column unencrypted_size
|
12 years ago |
|
Jenkins for ownCloud
|
5b95e7aa0f
|
[tx-robot] updated from transifex
|
12 years ago |
|
Jörn Friedrich Dreyer
|
4b3e56bcf9
|
remove unneccessary lib in namespace
|
12 years ago |
|
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!
|
12 years ago |
|
Bart Visscher
|
8e26f291a7
|
Merge pull request #4684 from owncloud/improved-console
Use more object oriented way for console commands
|
12 years ago |
|
Bart Visscher
|
f9549a4465
|
Merge pull request #4908 from owncloud/fix_css_selector
css selectors never have a : before []
|
12 years ago |
|
Bart Visscher
|
a9ea99e93d
|
Add copyright, remove starting blank line
|
12 years ago |
|
Bart Visscher
|
0a2a4cb12e
|
update inherit docs comment
|
12 years ago |
|
Bart Visscher
|
55efe1e56c
|
Fix insert/update/delete helper functions for oracle
|
12 years ago |
|
Bart Visscher
|
f6284bdce7
|
Add missing return true statements to legacy preferences functions
|
12 years ago |
|
Bart Visscher
|
395cc737a1
|
Add missing static
|
12 years ago |
|
Bart Visscher
|
445d34a2a9
|
Convert OC_Preference to object interface
|
12 years ago |
|
Thomas Müller
|
09cfebe936
|
Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
file upload conflicts dialog
|
12 years ago |
|
Jörn Friedrich Dreyer
|
7e0631b3b8
|
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/filelist.js
|
12 years ago |
|
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
|
12 years ago |
|
Jörn Friedrich Dreyer
|
9f9eb1b08f
|
Merge pull request #4263 from owncloud/search_scrollto
initial scrollto implementation
|
12 years ago |
|
Jörn Friedrich Dreyer
|
98ff847830
|
fix race condition in lazy preview loading
|
12 years ago |
|
Jörn Friedrich Dreyer
|
078bf0df25
|
use {count} instead of 'One' for more versatile translation
|
12 years ago |
|
Thomas Müller
|
4344c62f7e
|
Merge branch 'master' into fixing-4488-master
|
12 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
|
12 years ago |
|
Jörn Friedrich Dreyer
|
ae97fad632
|
fix double translation of error message
|
12 years ago |
|
Jörn Friedrich Dreyer
|
a6933efce3
|
use n to translate title
|
12 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
|
12 years ago |
|
Thomas Müller
|
c30c153ea5
|
fixing typos and l10n
|
12 years ago |
|
Jörn Friedrich Dreyer
|
89ed0007c0
|
jsdoc types should go into {}
|
12 years ago |
|
Jörn Friedrich Dreyer
|
cda58ae3df
|
css selectors never have a : before []
|
12 years ago |
|
Jörn Friedrich Dreyer
|
0d81a53e12
|
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
|
12 years ago |
|
Jörn Friedrich Dreyer
|
f7800cd63e
|
fix 'event is not defined' error
|
12 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?
|
12 years ago |
|
Thomas Müller
|
de8d0783ed
|
fixing syntax error - it it that hard to test own code?
|
12 years ago |
|
Thomas Müller
|
43a96621ea
|
adding comma to get cleaner diffs in the future
|
12 years ago |
|
Thomas Müller
|
3c0e93e220
|
no file actions during upload
|
12 years ago |
|
Jörn Friedrich Dreyer
|
72d53008cc
|
indentation
|
12 years ago |
|
Jenkins for ownCloud
|
6b1843d91b
|
[tx-robot] updated from transifex
|
12 years ago |
|
Jörn Friedrich Dreyer
|
7bd5e89f8c
|
simplify conflict template handling, fix reopen after ESC
|
12 years ago |
|
Jörn Friedrich Dreyer
|
12ff268e60
|
move upload dialog css to separate file
|
12 years ago |
|
Jörn Friedrich Dreyer
|
64cc13a8d3
|
allow passing classes to buttons
|
12 years ago |
|
Bart Visscher
|
817b8d151b
|
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
Split personal and user-mgmt password change logic
|
12 years ago |
|
kondou
|
18a2c48ceb
|
Translate errormsgs in settings/changepassword/controller
|
12 years ago |
|
Jörn Friedrich Dreyer
|
715846626e
|
hide excessive logging with a trace flag
|
12 years ago |
