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 |
|
Bart Visscher
|
f21ecef0b4
|
Merge pull request #2019 from owncloud/fixing-languages-again-master
some more new languages recently introduced to ownCloud
|
2013-03-01 14:55:27 -08:00 |
|
Lukas Reschke
|
8e5bbace71
|
Merge pull request #1976 from owncloud/from-insane-autoescape-to-p
Replace insane auto sanitization with p()
|
2013-03-01 14:31:06 -08:00 |
|
Thomas Mueller
|
6708dd80cd
|
some more new languages recently introduced to ownCloud
|
2013-03-01 23:28:54 +01:00 |
|
Lukas Reschke
|
73c84e4a0f
|
Merge master
|
2013-03-01 23:11:26 +01:00 |
|
Lukas Reschke
|
5e7970f761
|
Merge master
|
2013-03-01 23:11:03 +01:00 |
|
Thomas Mueller
|
4b9863fa7d
|
Merge branch 'master' into from-insane-autoescape-to-p
Conflicts:
apps/files/templates/index.php
|
2013-03-01 23:09:20 +01:00 |
|
Lukas Reschke
|
31754a653b
|
Merge pull request #2016 from owncloud/fixing-1844-master
validate the generated email address and fall back to localhost.localdom...
|
2013-03-01 14:00:30 -08:00 |
|
Thomas Mueller
|
6c304fa5c0
|
validate the generated email address and fall back to localhost.localdomain in case it is not valid
fixes #1844
|
2013-03-01 22:24:19 +01:00 |
|
Bernhard Posselt
|
5036e316a6
|
Merge pull request #2015 from owncloud/fixing-2001-master
in case the user has no permissions to upload/create files...
|
2013-03-01 12:52:36 -08:00 |
|
Thomas Mueller
|
e3e4c28316
|
fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed
|
2013-03-01 21:43:34 +01:00 |
|
Bernhard Posselt
|
7f7f447ab0
|
Merge pull request #2014 from owncloud/fixing-1909-master
for this self test we don't care if the ssl certificate is self signed a...
|
2013-03-01 12:42:52 -08:00 |
|
Thomas Mueller
|
39b9ed50d7
|
for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
|
2013-03-01 20:34:16 +01:00 |
|
Bernhard Posselt
|
2e2cf28d30
|
Merge pull request #2005 from owncloud/trash_add_signals
add post_moveToTrash and post_restore signals to the trash bin
|
2013-03-01 09:41:07 -08:00 |
|
Bernhard Posselt
|
87c8fff2d2
|
Merge pull request #2007 from owncloud/fix_1834_master
make sure that the version app always works on the users real home folder [master]
|
2013-03-01 09:40:37 -08:00 |
|
Frank Karlitschek
|
f7cb53b103
|
Merge pull request #2008 from owncloud/1999-requesttoken
Check if requesttoken exists in session
|
2013-03-01 06:12:09 -08:00 |
|
Lukas Reschke
|
93f15215c6
|
Check if requesttoken exists in session
Ref #1999
|
2013-03-01 14:59:51 +01:00 |
|
Lukas Reschke
|
630becb95f
|
Style fixes
|
2013-03-01 14:59:24 +01:00 |
|
Björn Schießle
|
a01540a300
|
fix getVersions() call for the history view
|
2013-03-01 13:55:10 +01:00 |
|
Björn Schießle
|
e81b6395d4
|
make sure that the version app always work on the users real home folder and not on the mount point
|
2013-03-01 13:54:26 +01:00 |
|
Björn Schießle
|
df2a9a3c60
|
add additional parameter to signal
|
2013-03-01 12:44:43 +01:00 |
|
Björn Schießle
|
7c360c2491
|
add post_moveToTrash and post_restore signals to the trash bin
|
2013-03-01 12:20:29 +01:00 |
|
Frank Karlitschek
|
09dc15d2b1
|
5.0 RC 1
|
2013-03-01 07:53:14 +01:00 |
|
Jenkins for ownCloud
|
d20fd7e9a6
|
[tx-robot] updated from transifex
|
2013-03-01 00:07:02 +01:00 |
|
Lukas Reschke
|
416607e559
|
Merge pull request #1979 from maelzx/patch-2
Fix window.location mistakes in previous code
|
2013-02-28 12:53:15 -08:00 |
|
Lukas Reschke
|
040076ffc2
|
Merge pull request #1992 from owncloud/fix-heartbeat
The router base url is without / on the end
|
2013-02-28 12:50:56 -08:00 |
|
Bart Visscher
|
84aa2c66d6
|
Merge pull request #1937 from owncloud/check-resharing
Check resharing setting
|
2013-02-28 11:39:11 -08:00 |
|
Lukas Reschke
|
301d065686
|
Sed was wrong
|
2013-02-28 20:21:14 +01:00 |
|
Lukas Reschke
|
dee16deacd
|
Merge master
|
2013-02-28 20:03:06 +01:00 |
|
icewind1991
|
a86761e1e7
|
Merge pull request #1988 from owncloud/permissionscache_clean
Clean permissions cache when deleting file
|
2013-02-28 10:24:20 -08:00 |
|
Bart Visscher
|
294403fa99
|
The router base url is without / on the end
|
2013-02-28 18:02:26 +01:00 |
|
Björn Schießle
|
1cc7e6d31a
|
Merge pull request #1989 from owncloud/selectSanitize
Sanitize HTML in html_select_options
|
2013-02-28 08:51:07 -08:00 |
|
Lukas Reschke
|
cef6131ea8
|
Sanitize HTML in html_select_options
|
2013-02-28 17:19:04 +01:00 |
|
Robin Appelman
|
ee1eb98d4a
|
Cache: cleanup permissions cache when removing a file from the cache
|
2013-02-28 17:04:50 +01:00 |
|
Robin Appelman
|
f7a43391a7
|
Cache: add option to delete file from permissions cache for all users
|
2013-02-28 17:04:34 +01:00 |
|
Bernhard Posselt
|
93e713d378
|
Merge pull request #1987 from owncloud/fixinstalldeps
add checks for xml and dom when installing
|
2013-02-28 06:36:19 -08:00 |
|
Bernhard Posselt
|
59835a9087
|
add checks for xml and dom when installing
|
2013-02-28 15:13:18 +01:00 |
|
Jan-Christoph Borchardt
|
6d4b344f5d
|
Merge pull request #1397 from owncloud/trash_fileactions
Enable fileactions while viewing trash
|
2013-02-28 05:43:51 -08:00 |
|
Robin Appelman
|
12fd47af39
|
Trash: fix opening folders
|
2013-02-28 13:32:08 +01:00 |
|
Bernhard Posselt
|
4223e99629
|
Merge pull request #1985 from owncloud/sharing-more
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
|
2013-02-28 03:44:51 -08: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 |
|
maelzx
|
a319fa8d47
|
Fix window.location mistakes in previous code
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);
However this is just tested in google chrome.
|
2013-02-28 11:26:42 +08: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
|
5f8bd07927
|
[Files] Use p() instead of echo
|
2013-02-27 23:40:30 +01:00 |
|
Lukas Reschke
|
b93ebe1860
|
Merge master
|
2013-02-27 23:36:52 +01:00 |
|
Lukas Reschke
|
7311c2bb5d
|
Remove uneeded OAuth files
|
2013-02-27 23:26:00 +01:00 |
|
Lukas Reschke
|
39e28c0170
|
Typo...
|
2013-02-27 23:19:38 +01:00 |
|