Lukas Reschke
|
d3aecdab09
|
Merge pull request #1939 from owncloud/session_heartbeat
use 15 min instead of 15 sec timeout
|
2013-02-26 11:28:15 -08:00 |
Bernhard Posselt
|
81bb4363a2
|
use 15 min instead of 15 sec timeout
|
2013-02-26 20:25:07 +01:00 |
Frank Karlitschek
|
7eec31567f
|
Merge pull request #1938 from owncloud/session_heartbeat
implemented a heartbeat request which is calls the server every 15 minut...
|
2013-02-26 11:02:09 -08:00 |
Bernhard Posselt
|
4e55348054
|
implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout
|
2013-02-26 19:34:46 +01:00 |
Jan-Christoph Borchardt
|
6f09f57008
|
remove more unused logo files, now in promo
|
2013-02-26 14:28:17 +01:00 |
Jan-Christoph Borchardt
|
7a47786afd
|
align logo type pixel perfectly
|
2013-02-26 14:27:29 +01:00 |
Frank Karlitschek
|
69eb69be0e
|
Merge pull request #1902 from owncloud/angularcsp
add CSP turned on for angularjs
|
2013-02-26 00:58:12 -08:00 |
Frank Karlitschek
|
072daf8850
|
Merge pull request #1885 from houqp/issue_1776
when user changes displayName, also update it on expand button
|
2013-02-26 00:19:42 -08:00 |
Jenkins for ownCloud
|
63d9feb8c0
|
[tx-robot] updated from transifex
|
2013-02-26 00:06:26 +01:00 |
Qingping Hou
|
195b52cb63
|
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
core/templates/layout.user.php
|
2013-02-25 17:16:03 -05:00 |
Bernhard Posselt
|
b537cecdf3
|
add CSP turned on for angularjs
|
2013-02-25 22:54:05 +01:00 |
Lukas Reschke
|
6735701c1e
|
Merge pull request #1837 from owncloud/fix-user-template
Remove unneeded code for user layout template
|
2013-02-25 13:41:32 -08:00 |
Thomas Müller
|
6dd1d479da
|
Merge pull request #1706 from owncloud/master-sqlserver
Microsoft SQL-Server support for ownCloud!
|
2013-02-25 12:50:32 -08:00 |
Qingping Hou
|
c111a3aa24
|
add span tag to displayname on expand button
|
2013-02-25 15:40:57 -05:00 |
Thomas Müller
|
7c30c1a2e8
|
Merge pull request #1833 from owncloud/fix_1465
Fix 1465
|
2013-02-25 04:34:13 -08:00 |
Jenkins for ownCloud
|
21f3291eee
|
[tx-robot] updated from transifex
|
2013-02-25 00:06:17 +01:00 |
Jenkins for ownCloud
|
6aa0ecc9b8
|
[tx-robot] updated from transifex
|
2013-02-23 00:05:33 +01:00 |
Thomas Mueller
|
9898ba4daf
|
Merge branch 'master' into master-sqlserver
Conflicts:
core/templates/installation.php
|
2013-02-22 22:59:09 +01:00 |
Jörn Friedrich Dreyer
|
e8da90d0f4
|
Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
|
2013-02-22 07:02:51 -08:00 |
Bart Visscher
|
bf0b9bac8b
|
Remove unneeded code for user layout template
|
2013-02-22 00:22:43 +01:00 |
Bart Visscher
|
59582e0f3f
|
Fix review issues
|
2013-02-22 00:21:06 +01:00 |
Jenkins for ownCloud
|
734a463297
|
[tx-robot] updated from transifex
|
2013-02-22 00:08:47 +01:00 |
Bart Visscher
|
19c5213b53
|
Join split translated strings
|
2013-02-21 23:47:56 +01:00 |
Bart Visscher
|
1a747b3e48
|
Style cleanup core dir
|
2013-02-21 23:47:21 +01:00 |
Jan-Christoph Borchardt
|
e7d1bbfae3
|
fix giant advanced caret in installation
|
2013-02-21 18:20:14 +01:00 |
Jörn Friedrich Dreyer
|
0dd7fd0599
|
IE8 does not support window.onclick
|
2013-02-21 17:38:25 +01:00 |
Arthur Schiwon
|
eceb7341bb
|
make number-input fields look like they should
|
2013-02-21 16:25:47 +01:00 |
Jenkins for ownCloud
|
dcd93a53e4
|
[tx-robot] updated from transifex
|
2013-02-21 00:15:58 +01:00 |
Brice Maron
|
4f4e81d3d2
|
Add message when trouble sending email ref #1799
|
2013-02-20 21:14:55 +01:00 |
Frank Karlitschek
|
18dab4a88e
|
Merge pull request #1738 from owncloud/fix_multiselect_in_settings
Extra position check for multiselect dropdown. Fix app/issues/575
|
2013-02-20 08:34:26 -08:00 |
Thomas Mueller
|
5062ae250b
|
Merge branch 'master' into master-sqlserver
Conflicts:
lib/files/cache/cache.php
|
2013-02-20 10:55:20 +01:00 |
Jörn Friedrich Dreyer
|
0efa4182dc
|
Update office icons
|
2013-02-20 10:42:54 +01:00 |
Frank Karlitschek
|
a085e4c435
|
Merge pull request #1720 from owncloud/usermenu-css
fix erroneous CSS, remove obsolete selectors
|
2013-02-19 10:44:58 -08:00 |
Jenkins for ownCloud
|
76c4dc6296
|
[tx-robot] updated from transifex
|
2013-02-19 00:06:51 +01:00 |
Thomas Mueller
|
2675290325
|
Merge branch 'master' into master-sqlserver
|
2013-02-18 11:39:04 +01:00 |
Jenkins for ownCloud
|
3b9796bfcc
|
[tx-robot] updated from transifex
|
2013-02-18 00:06:45 +01:00 |
Jenkins for ownCloud
|
c8e7b14ab3
|
[tx-robot] updated from transifex
|
2013-02-17 00:26:17 +01:00 |
Thomas Tanghus
|
5a8e0f2048
|
Extra position check for multiselect dropdown. Fix app/issues/575
|
2013-02-16 19:56:56 +01:00 |
Jenkins for ownCloud
|
83f0c8ce61
|
[tx-robot] updated from transifex
|
2013-02-16 00:05:50 +01:00 |
Jan-Christoph Borchardt
|
953c87db9c
|
fix erroneous CSS, remove obsolete selectors
|
2013-02-15 18:37:52 +01:00 |
Robin Appelman
|
b8e2454f68
|
Fix strict standard warning in user template
|
2013-02-15 16:10:06 +01:00 |
Jan-Christoph Borchardt
|
ac32ae79af
|
Merge pull request #1683 from owncloud/ie-fixes
IE fixes
|
2013-02-15 03:32:31 -08:00 |
Jenkins for ownCloud
|
b169073169
|
[tx-robot] updated from transifex
|
2013-02-15 00:06:50 +01:00 |
Thomas Mueller
|
4b80466880
|
Merge branch 'master' into master-sqlserver
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
|
2013-02-14 22:54:48 +01:00 |
Bart Visscher
|
9058d398a7
|
Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
|
2013-02-14 12:54:36 -08:00 |
Thomas Müller
|
4320f23c87
|
Merge pull request #1702 from owncloud/remove-images
remove unused images to lessen packaged size
|
2013-02-14 12:46:40 -08:00 |
Thomas Müller
|
29bf3552a2
|
Merge pull request #1703 from owncloud/firstrunwizard-icons
Firstrunwizard icons
|
2013-02-14 12:41:23 -08:00 |
Lukas Reschke
|
5624f1b838
|
Merge pull request #1701 from owncloud/XSS-fixes
Sanitize HTML
|
2013-02-14 10:50:46 -08:00 |
Jan-Christoph Borchardt
|
5b20c30889
|
pixel align dark calendar and contacts icons
|
2013-02-14 18:52:32 +01:00 |
Jan-Christoph Borchardt
|
6adaf67f35
|
add dark calendar and contacts icon for firstrunwizard and others
|
2013-02-14 18:45:24 +01:00 |