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
|
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 |
|
Jenkins for ownCloud
|
2d12e52769
|
[tx-robot] updated from transifex
|
2013-09-24 12:59:48 -04:00 |
|
kondou
|
d7409547aa
|
Fix not displaying "Upload something!" message
Fix #4940
|
2013-09-23 16:39:42 +02:00 |
|
Georg Ehrke
|
8a1618bce5
|
implement previews for public upload
|
2013-09-23 12:27:05 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|