afa1a6d2b3
Don't try to use routes when called from cli
2013-02-07 17:53:38 +01:00
6cff5418a7
Merge pull request #1524 from owncloud/fix_ldaps_tls_setting
...
LDAP: don't try to put TLS on top of already secure connection (will fail).
2013-02-07 07:06:35 -08:00
15e383fd01
Typo
2013-02-07 16:05:45 +01:00
0efcf33e2f
Merge pull request #1451 from eMerzh/fix_1065
...
Add Redirect to getUrlContent fix #1065
2013-02-07 06:27:58 -08:00
6299704dfd
Merge pull request #1518 from schiesbn/trash_layout_fix
...
add class hascontrols to trash bin file table
2013-02-07 04:40:51 -08:00
8e70763cec
Merge pull request #1522 from schiesbn/trash_bin_fix
...
OCA_Versions is now known as OCA\Files_Versions
2013-02-07 04:38:22 -08:00
ce293b8efc
remove debug output
2013-02-07 13:16:15 +01:00
7e874af2c8
rename OCA_Trash to OCA\Files_Trashbin
2013-02-07 13:14:45 +01:00
c81d7b0b90
OCA_Versions is now known as OCA\Files_Versions
2013-02-07 12:45:27 +01:00
17384994d6
add class hascontrols to trash bin file table
2013-02-07 10:13:09 +01:00
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
223f538bb8
Merge pull request #1500 from chriskoch/patch-1
...
Update lib/public/util.php
2013-02-06 13:00:10 -08:00
2dfe67423d
Merge pull request #1509 from owncloud/correct-public-contacts-tests
...
Correct lib/public/contacts.php tests
2013-02-06 12:29:51 -08:00
e969a78cf9
Merge pull request #1443 from owncloud/use-module-file-info-master
...
we get best results regarding mime type detection if we use fileinfo - l...
2013-02-06 11:53:13 -08:00
93b1597395
Merge pull request #1506 from owncloud/files_encryption
...
Files encryption
2013-02-06 11:47:55 -08:00
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
ad644b4e08
Merge pull request #1363 from owncloud/FixPasswordChange
...
Fix password change
2013-02-06 11:14:59 -08:00
2c22619a18
Reverted fix temporarily; another fix by LukasReschke is awaiting merge
2013-02-06 19:06:55 +00:00
faf6cb0868
Merge branch 'master' into files_encryption
2013-02-06 18:26:44 +00:00
954a627483
Added comment
2013-02-06 18:24:35 +00:00
a26f17c130
Merge pull request #1502 from owncloud/gitignore-cloud9
...
gitignore Cloud9IDE system folder
2013-02-06 10:16:49 -08:00
8e006118fb
Merge pull request #1501 from owncloud/fix-shorttag
...
fix shorttag issue mentioned in #1357
2013-02-06 10:01:40 -08:00
2b07afc8ab
Removed debugging code
2013-02-06 17:59:47 +00:00
ae8cfe6569
Added comments
2013-02-06 17:43:03 +00:00
81de09711b
Fixed bug causing password change related hooks to not be called due to ajax
2013-02-06 17:42:29 +00:00
70d937cb29
Fixed syntax bug
2013-02-06 17:42:15 +00:00
abb3635bd8
gitignore Cloud9IDE system folder
2013-02-06 18:27:04 +01:00
4c406c9ab1
fix shorttag issue mentioned in #1357
2013-02-06 18:19:26 +01:00
81792448ae
Merge pull request #1472 from owncloud/files_versions-cleanup
...
files_versions cleanup
2013-02-06 08:53:20 -08:00
7d0b4c2581
Merge pull request #1438 from owncloud/phpunit-tests-win32-master
...
PHPUnit support for Windows added
2013-02-06 08:40:53 -08:00
a4d3cc798f
Correct lib/public/contacts.php tests
2013-02-06 17:37:47 +01:00
2130262515
Merge pull request #1459 from owncloud/infield-detail
...
shift infield labels just a tiny bit to the right so the cursor doesn't ...
2013-02-06 08:23:53 -08:00
a4f909cefd
Update lib/public/util.php
...
The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
2013-02-06 17:22:07 +01:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
d9631aebfc
Merge branch 'master' into files_encryption
2013-02-06 16:05:14 +00:00
a8c0e3612c
Removed call to depreciated isUserVerified()
2013-02-06 16:01:43 +00:00
2d77c7c0fd
Reduce top position for content below controls.
2013-02-06 16:56:26 +01:00
fd171a4f34
copy&paste bug, no fetchAll() needed here
2013-02-06 16:50:16 +01:00
09a4424b1f
Merge pull request #1497 from owncloud/collapse-usermenu
...
collapse user menu when inside one of the settings sections
2013-02-06 07:33:59 -08:00
5f84f4b4fd
Merge pull request #1496 from owncloud/custom_clients
...
make it possible to modify the links to the clients
2013-02-06 07:25:16 -08:00
8cc7bab0e5
delete debug code
2013-02-06 16:25:10 +01:00
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
a3289d3991
Merge branch 'master' into files_encryption
2013-02-06 15:08:53 +00:00
6870add18f
Development snapshot
2013-02-06 15:08:36 +00:00
8ea6398e48
collapse user menu when inside one of the settings sections
2013-02-06 16:03:01 +01:00
efdaea4557
Merge pull request #1357 from owncloud/alternative-loging-master
...
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
58a3a6a573
Merge pull request #1487 from owncloud/fix-1420-master
...
Replace OC_FileCache usage in files_versions
2013-02-06 06:45:01 -08:00
16a5ace434
Fixed bug causing encrypted files to be doubly encrypted at login
...
Added comments and docblocks
2013-02-06 14:30:40 +00:00
0a16d25724
make it possible to modify the links to the clients
2013-02-06 15:20:43 +01:00
964ff88f71
move inline style to CSS file, fix details
2013-02-06 15:15:20 +01:00
Robin Appelman
blizzz
Thomas Müller
Björn Schießle
Björn Schießle
Frank Karlitschek
Lukas Reschke
Sam Tuke
Jan-Christoph Borchardt
Bart Visscher
Christian Koch
Thomas Tanghus
Georg Ehrke