01de7b8b9e
Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
...
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
db9ac13574
Merge pull request #8618 from owncloud/yet-another-ajax-lost-password
...
Basic ajax lost password
2014-06-14 12:01:13 +02:00
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
fd5fad194d
remove double space
2014-06-14 01:03:03 +02:00
35f7565e9b
Merge pull request #8978 from owncloud/movie_preview_improvements
...
movie previews: use file directly when it's stored locally and encryption is not enabled
2014-06-14 01:01:59 +02:00
2b82e3c251
Merge pull request #9025 from owncloud/fix-mail-settings
...
fix mail settings save function - ref #8854
2014-06-13 18:26:14 +02:00
87101e6638
Merge pull request #9018 from owncloud/dbms-socket-support
...
Refactor OC_DB::connect() to properly support sockets.
2014-06-13 18:09:51 +02:00
dc2212cd46
migrate table layout to paragraph layout for HTTPS setting
2014-06-13 16:54:47 +02:00
dda5e6c85b
add proper Exception message for invalid token
2014-06-13 16:18:58 +02:00
1cb7239cb7
use array_merge for merging arrays in PHP
2014-06-13 16:18:39 +02:00
ed8b7fc101
complete renaming uid to userId
2014-06-13 16:18:21 +02:00
ebbf228309
remove whitespace at end of line
2014-06-13 16:03:13 +02:00
a53cfcb9d1
Migrate ´ to '
2014-06-13 16:02:41 +02:00
cedca03ef5
Remove infield label, add password icon, fix layout
2014-06-13 15:56:21 +02:00
d0b71dffca
reformat method call and fix paranthesis mismatch
2014-06-13 15:39:44 +02:00
2b2b1b487c
more style fixes
2014-06-13 15:34:52 +02:00
a6e45a8d0e
use more stuff from core :)
2014-06-13 15:34:52 +02:00
e026b1dc19
Add missing use
2014-06-13 15:34:52 +02:00
59ff71f781
Fix check for user existence
2014-06-13 15:34:52 +02:00
47c6fd0c85
Remove debug output
2014-06-13 15:34:52 +02:00
4b359ad20c
Change routes. Update templates
2014-06-13 15:34:52 +02:00
218d0add36
Changes according to review
2014-06-13 15:34:52 +02:00
a7fbd91e53
Use appframework
2014-06-13 15:34:52 +02:00
23ed038a27
Basics
2014-06-13 15:34:51 +02:00
f5da0052cf
fix mail settings save function - ref #8854
2014-06-13 15:31:35 +02:00
c09f5680c9
Merge pull request #9010 from owncloud/fix_8941_admin_settings_message
...
move mail template settings to templateeditor repo
2014-06-13 13:07:41 +02:00
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
7e8784c075
access admin settings result message correctly
2014-06-13 11:59:14 +02:00
b91db84050
Merge pull request #8714 from owncloud/minor-fixes
...
fix some minor issues
2014-06-13 08:30:57 +02:00
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
aa8f17bc63
Merge pull request #9017 from owncloud/maxheartbeatinterval
...
Added max heartbeat interval to prevent integer overflow
2014-06-13 00:19:07 +02:00
cea2c77fd2
fix some minor issues
2014-06-13 00:16:36 +02:00
73062040e6
Don't specify host when using a socket.
2014-06-12 20:22:45 +02:00
0932760304
Rename variable to indicate that it can be port and socket.
2014-06-12 20:18:38 +02:00
3d8eabedbd
No need to check the port number as this will fail anyway.
2014-06-12 20:17:30 +02:00
4ca1e3cc02
Move getValue() to where required. This actually is not required "global data".
2014-06-12 19:59:40 +02:00
17c2e63449
Move check for : to where it belongs, getting rid of $socket = false;
2014-06-12 19:56:51 +02:00
4b87586487
Extract common variables of $connectionParams.
2014-06-12 19:53:33 +02:00
6da2beeaff
Inline $port expression, getting rid of $port variable.
2014-06-12 19:48:37 +02:00
6a0f5cfc61
Added unit tests for heartbeat interval min/max values
2014-06-12 18:42:09 +02:00
ce168c286a
Added max heartbeat interval to prevent integer overflow
...
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.
This fix adds a maximum ping interval of 24 hours.
Forward port of 00ec5fc193
2014-06-12 18:41:19 +02:00
b595c982d0
Merge pull request #8968 from owncloud/scanner-parent-repair
...
Repair broken parent link in the scanner
2014-06-12 17:40:44 +02:00
ab7cff6dfd
Revert "Merge pull request #8998 from macjohnny/master"
...
This reverts commit 482eded8b3354cace14a
2014-06-12 14:56:46 +02:00
8e463926a0
Merge pull request #9004 from owncloud/cleanup-storages
...
Added check and cleanup for storage/filecache
2014-06-12 14:50:18 +02:00
482eded8b3
Merge pull request #8998 from macjohnny/master
...
drastic speedup for nested ldap groups
2014-06-12 14:49:15 +02:00
354cace14a
Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings
...
fix liskov substitution principle in admin mail template settings
2014-06-12 14:33:13 +02:00
19c73a8464
Added check and cleanup for storage/filecache
...
Some tests don't clean up the file cache and sometimes entries are
reused by mistake in subsequent test suites.
This cleans up the file cache and storage after every test suite and
also shows an annoying warning.
2014-06-12 13:45:39 +02:00
dff4ad3e00
Merge pull request #8999 from owncloud/issue/8996
...
Issue/8996 IE8 issues with the new menu
2014-06-12 13:34:32 +02:00
d17094e0a5
Move IE8 fixes to fixes.css
2014-06-12 13:33:32 +02:00
3e1576011f
Merge pull request #8980 from owncloud/better-accept-header
...
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
Lukas Reschke
Frank Karlitschek
Jenkins for ownCloud
Morris Jobke
Volkan Gezer
Bernhard Posselt
Victor Dubiniuk
Jörn Friedrich Dreyer
Volkan Gezer
Andreas Fischer
Vincent Petry
macjohnny
Bernhard Posselt