kondou
|
306a8681c5
|
Move ajax/changepassword to changepassword/controller to use autoloading
|
12 years ago |
|
kondou
|
2ae3ab98d8
|
Merge branch 'master' into split_personal-user_passwordchange
|
12 years ago |
|
kondou
|
f6faec0e0b
|
Use a controller instead of two files for changepassword.php
|
12 years ago |
|
VicDeo
|
62eeac3390
|
Merge pull request #4798 from owncloud/fixing-variable-typos-master
no further comment - which dev did not test this BEFORE submitting the p...
|
12 years ago |
|
Jenkins for ownCloud
|
68015b2761
|
[tx-robot] updated from transifex
|
12 years ago |
|
Bart Visscher
|
4ab8dc9c08
|
Merge pull request #4788 from owncloud/fixin-irods-session-master
Fixing session handling in iRODS
|
12 years ago |
|
Thomas Müller
|
af2164bbcb
|
no further comment - which dev did not test this BEFORE submitting the pull request?
which reviewer did not test the pull request?
|
12 years ago |
|
Thomas Müller
|
3b835ea1b6
|
never hack late night
|
12 years ago |
|
Thomas Müller
|
ec255b52be
|
fixing boolean handling
|
12 years ago |
|
Andreas Fischer
|
a2ade4294c
|
Merge pull request #4472 from owncloud/remove-disconnect
Remove disconnect function from OC_DB
* owncloud/remove-disconnect:
Remove disconnect function from OC_DB
|
12 years ago |
|
Jenkins for ownCloud
|
72689f643b
|
[tx-robot] updated from transifex
|
12 years ago |
|
Thomas Müller
|
03ab26df75
|
Merge pull request #4787 from owncloud/fixing-php-end-tags-irods-master
Fixing php end tags irods master
|
12 years ago |
|
Thomas Müller
|
d63ca25a94
|
proper test for use_logon_credentials
|
12 years ago |
|
Thomas Müller
|
36e7a7c29b
|
use \OC::$session instead of $_SESSION
|
12 years ago |
|
Thomas Müller
|
21e5daa218
|
removing all ?> jutt in case
|
12 years ago |
|
Thomas Müller
|
c32c116957
|
removing ?> followed by whitespaces
|
12 years ago |
|
Thomas Müller
|
956a2335ad
|
Merge pull request #4647 from owncloud/fix_4619
Workaround for IE 9 & 10 for clicking filelist after adding new item
|
12 years ago |
|
Thomas Tanghus
|
2cdde7a56a
|
Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
Fixed missing checkboxes in IE8
|
12 years ago |
|
Thomas Müller
|
63a5409c6e
|
Merge pull request #4757 from owncloud/deleteAll-alias
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
|
12 years ago |
|
Thomas Müller
|
5e1821f21d
|
Merge pull request #4772 from owncloud/preview_improvements
oc\preview use avconv instead of ffmpeg
|
12 years ago |
|
Jenkins for ownCloud
|
92f6c3bb10
|
[tx-robot] updated from transifex
|
12 years ago |
|
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.
|
12 years ago |
|
Christopher
|
f28c6bc213
|
Merge pull request #4761 from owncloud/fix_language_selection-kondou
Fix language selection
|
12 years ago |
|
kondou
|
4963a5b30f
|
Fix language selection; Fix #4756
|
12 years ago |
|
Robin Appelman
|
46a57a9f05
|
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
|
12 years ago |
|
Jenkins for ownCloud
|
e895cf9188
|
[tx-robot] updated from transifex
|
12 years ago |
|
kondou
|
4aa84047fe
|
Remove $recoveryPassword from changepersonalpassword & fix indent
|
12 years ago |
|
Bjoern Schiessle
|
b8241aa79d
|
remove some more debug output
|
12 years ago |
|
Bjoern Schiessle
|
edb78c917c
|
remove some error_logs
|
12 years ago |
|
Bjoern Schiessle
|
d33fabd02d
|
remove error logs
|
12 years ago |
|
Bjoern Schiessle
|
b2dde14dbc
|
coding style fixes
|
12 years ago |
|
Bjoern Schiessle
|
627b6164c4
|
if the files doesn't exist yet we start with the parent to search for shares
|
12 years ago |
|
Bjoern Schiessle
|
93f4dec798
|
fix part file handling and real size calculation, this should also solve #4581
Conflicts:
apps/files_encryption/lib/stream.php
|
12 years ago |
|
Bjoern Schiessle
|
f6830e7462
|
check shares for the real file and not for the .part file
|
12 years ago |
|
Bjoern Schiessle
|
404e36323a
|
first check if a extension exists before comparing it
|
12 years ago |
|
Bjoern Schiessle
|
597a3cf1ad
|
handle part files correctly
|
12 years ago |
|
Pete McFarlane
|
83afba5070
|
prefix #filestable to tbody tr
|
12 years ago |
|
kondou
|
a21376480d
|
Split personal and user-mgmt password change logic
|
12 years ago |
|
Thomas Müller
|
e9849270e3
|
Revert "fixes #4574"
This reverts commit 81a45cfcf1.
|
12 years ago |
|
Bart Visscher
|
4629d6ad67
|
Merge pull request #4704 from owncloud/rename-lostpassword-controller
Use the namespaced variation of the classname.
|
12 years ago |
|
Jenkins for ownCloud
|
0527fb05ad
|
[tx-robot] updated from transifex
|
12 years ago |
|
Georg Ehrke
|
2954db165b
|
use avconv instead of ffmpeg
|
12 years ago |
|
Bernhard Posselt
|
fbedd643f7
|
Merge pull request #4477 from owncloud/hooks-view
also emit hooks for views that are a subfolder of the user folder
|
12 years ago |
|
Thomas Müller
|
3b25babe35
|
Merge pull request #4683 from owncloud/publicuploadjserror
Fixed public upload error that prevents upload
|
12 years ago |
|
Thomas Müller
|
e43e8b0db8
|
Merge branch 'master' into rename-lostpassword-controller
Conflicts:
core/lostpassword/controller.php
|
12 years ago |
|
Morris Jobke
|
09187f3b3b
|
Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
|
12 years ago |
|
Morris Jobke
|
6435e18e95
|
Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
Add previews to OC.dialogs.filepicker()
|
12 years ago |
|
Christopher
|
c2eaf7589d
|
Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
use on to add event listener instead of deprecated jquery bind
|
12 years ago |
|
kondou
|
d62c5063f4
|
Add previews to OC.dialogs.filepicker(); Fix #4697
|
12 years ago |
|
Jörn Friedrich Dreyer
|
85758f3d7d
|
Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
|
12 years ago |
