Commit graph

1388 commits

Author SHA1 Message Date
Bernhard Posselt
841daf4845 Merge pull request #2062 from owncloud/shareType
Sanitize shareWith
2013-03-03 16:27:51 -08:00
Lukas Reschke
577945bd33 Sanitize shareWith 2013-03-04 00:54:21 +01:00
Jenkins for ownCloud
b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Michael Gapczynski
0488968443 Merge pull request #2034 from owncloud/fix_bug47
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
Jörn Friedrich Dreyer
9cb5bf0a28 add ie css switch to layout templates 2013-03-03 13:57:20 +01:00
Jenkins for ownCloud
844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Georg Ehrke
620ddd3baa new Array() -> [] 2013-03-02 19:24:37 +01:00
Georg Ehrke
22424e8abc update OC.Notification.show 2013-03-02 17:36:04 +01:00
Brice Maron
050de008b1 Avoid to display empty DisplayNames for menu and title 2013-03-02 16:09:36 +01:00
Thomas Müller
2af3bc3e77 Merge pull request #2022 from owncloud/fix-notice
Fix notice
2013-03-01 23:39:27 -08:00
Lukas Reschke
630483c75d Fix notice 2013-03-02 00:53:53 +01:00
Jenkins for ownCloud
c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke
5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Georg Ehrke
ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Bart Visscher
294403fa99 The router base url is without / on the end 2013-02-28 18:02:26 +01:00
Jan-Christoph Borchardt
fbb989f548 up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135 2013-02-28 12:07:56 +01:00
Jan-Christoph Borchardt
a2147c4f89 Merge pull request #1973 from owncloud/share-improvements
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 15:07:07 -08:00
Jenkins for ownCloud
a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke
b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Lukas Reschke
39e28c0170 Typo... 2013-02-27 23:19:38 +01:00
Lukas Reschke
6f14bec70a Add a missing ) 2013-02-27 23:15:18 +01:00
Lukas Reschke
229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Lukas Reschke
40e51d13d2 Remove uneeded file 2013-02-27 22:35:37 +01:00
Bernhard Posselt
9508a58c79 Merge pull request #1944 from owncloud/query-caching-upgrade
Disable prepared query caching while doing an upgrade
2013-02-27 12:48:42 -08:00
Jan-Christoph Borchardt
e01ab04d2b reduce minimum length for username suggestions in share dialog, fix #1666 2013-02-27 17:57:53 +01:00
Jenkins for ownCloud
fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Bernhard Posselt
a09076c3ac Merge pull request #1955 from owncloud/login-button-alignment
quick fix for log in button not being aligned with input fields
2013-02-27 04:05:47 -08:00
Bernhard Posselt
0828bb7e0e Merge pull request #1957 from owncloud/fix-895
Fix 895
2013-02-27 03:10:29 -08:00
Thomas Müller
58b06c5c9a Merge pull request #1905 from owncloud/fix-share-icons
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
Jan-Christoph Borchardt
a5d84b74d0 properly align triangle and unshare icons to text, also fixes line hopping 2013-02-27 11:30:33 +01:00
Jan-Christoph Borchardt
7ee5b2df13 fix ugly giant triangles 2013-02-27 11:30:06 +01:00
Jan-Christoph Borchardt
49cd9f20a6 fix shared by text going out of box, fix #895 2013-02-27 11:22:13 +01:00
Jan-Christoph Borchardt
f36d92bbc1 Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes
Various Layout Fixes for Sharing Dropdown.
2013-02-27 02:19:35 -08:00
Jan-Christoph Borchardt
86ffa28f72 quick fix for log in button not being aligned with input fields 2013-02-27 11:04:08 +01:00
Jenkins for ownCloud
348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Robin Appelman
47b899e0c8 Disable prepared query caching while doing an upgrade 2013-02-26 22:41:48 +01:00
Bart Visscher
aa8bf3bbaa Merge pull request #1941 from owncloud/session_heartbeat
generate url only once for heartbeat
2013-02-26 11:49:59 -08:00
Bernhard Posselt
a65b16f3e7 generate url only once 2013-02-26 20:45:25 +01:00
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
Michael Gapczynski
5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Michael Gapczynski
aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
Jenkins for ownCloud
63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00