Georg Ehrke
|
ec3e97f28f
|
Merge branch 'master' into oc_preview
|
2013-04-22 16:19:16 +02:00 |
Jenkins for ownCloud
|
03c7a52bc5
|
[tx-robot] updated from transifex
|
2013-04-20 02:02:09 +02:00 |
Bart Visscher
|
0701d0019b
|
Merge pull request #3020 from owncloud/cleaner-webdav-reason
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
|
2013-04-19 07:56:41 -07:00 |
Bart Visscher
|
25e7dc1ec5
|
Merge pull request #3024 from owncloud/file-delete-action
Fix #1164 and fix showing spinner on delete
|
2013-04-19 06:08:09 -07:00 |
Bart Visscher
|
802a5a331b
|
Fix displaying spinner on delete
|
2013-04-19 13:46:11 +02:00 |
Bart Visscher
|
a21885953f
|
No need to strip slashes, json_decode handles that for us
|
2013-04-19 13:45:40 +02:00 |
Bart Visscher
|
7ac49dd52a
|
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
|
2013-04-19 12:44:54 +02:00 |
Thomas Tanghus
|
4ccc9d896a
|
Merge pull request #3010 from owncloud/fix-cookie_path
Don't use empty session.cookie_path, otherwise we get multiple cookies
|
2013-04-19 01:17:35 -07:00 |
Jenkins for ownCloud
|
1ad0c11136
|
[tx-robot] updated from transifex
|
2013-04-19 01:57:39 +02:00 |
Bart Visscher
|
e4876c9117
|
Don't use empty session.cookie_path, otherwise we get multiple cookies
|
2013-04-18 21:11:58 +02:00 |
Jenkins for ownCloud
|
cbd8b792d9
|
[tx-robot] updated from transifex
|
2013-04-18 02:09:28 +02:00 |
Bernhard Posselt
|
739d8eb152
|
Merge pull request #2986 from eMerzh/upgrade_warn
Warn when we do an upgrade
|
2013-04-17 12:43:15 -07:00 |
Brice Maron
|
43d0f1fabf
|
Warn when we do an upgrade
|
2013-04-17 21:29:14 +02:00 |
Raghu Nayyar
|
a3e5da834b
|
Merge pull request #2925 from owncloud/navigation-icon-fix
fix navigation hover effect, documentation
|
2013-04-17 10:20:36 -07:00 |
Jan-Christoph Borchardt
|
3d47c62a20
|
apply navigation hover effect directly to img and span, cleaner code
|
2013-04-17 17:23:12 +02:00 |
Bernhard Posselt
|
3b2a0523f8
|
Merge pull request #2978 from owncloud/displayname_can_be_null
Remove not null constraint. Fix #2976
|
2013-04-17 07:47:17 -07:00 |
Morris Jobke
|
867a527148
|
Merge pull request #2975 from owncloud/log-date
use date and time instead of timestamp in log
|
2013-04-17 06:49:46 -07:00 |
Bernhard Posselt
|
4679e789e1
|
also adjust template properly for log date fix
|
2013-04-17 15:31:05 +02:00 |
Thomas Tanghus
|
44668b36a7
|
Remove not null constraint. Fix #2976
|
2013-04-17 14:08:45 +02:00 |
Bernhard Posselt
|
f7e29eabf2
|
fix admin log display and use a more readable format
|
2013-04-17 14:05:51 +02:00 |
Bernhard Posselt
|
8471340db9
|
use date and time instead of timestamp
|
2013-04-17 12:24:18 +02:00 |
Thomas Tanghus
|
ec280e6f9f
|
Merge pull request #2746 from owncloud/use-count-userexists
Use count SQL to check for user existance
|
2013-04-17 03:06:50 -07:00 |
Björn Schießle
|
ddde1b65db
|
adapt free space calculation to the way it is done for the trash bin
|
2013-04-17 10:43:12 +02:00 |
Björn Schießle
|
a3999036f7
|
improved free space calculation if no quota is set, discussed in #2936
|
2013-04-17 10:42:59 +02:00 |
Bart Visscher
|
f3c06ae4e4
|
Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
Handle empty datafolder better.
|
2013-04-17 00:44:14 -07:00 |
Jenkins for ownCloud
|
37868818ff
|
[tx-robot] updated from transifex
|
2013-04-17 02:29:17 +02:00 |
icewind1991
|
c50dfd7251
|
Merge pull request #2951 from owncloud/no_personal_variables
No personal prefixes for variables.
|
2013-04-16 15:43:20 -07:00 |
Bernhard Posselt
|
7049436058
|
Merge pull request #2953 from jerrac/emailsavetimeout
Modified how the #lostpassword or #email fields save email addresses on ...
|
2013-04-16 13:56:14 -07:00 |
David Reagan
|
0dd6f16e0b
|
Removed extra id from jquery selectors. Remove console.log call. Removed commented code.
|
2013-04-16 13:22:04 -07:00 |
David Reagan
|
6d812ada05
|
Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.
|
2013-04-16 13:03:41 -07:00 |
Michael Gapczynski
|
2040f0af78
|
Merge pull request #2943 from owncloud/always_load_cache_hooks_first
always connect file cache updater hooks first
|
2013-04-16 12:21:09 -07:00 |
kondou
|
6ee2b4c740
|
No personal prefixes for variables.
|
2013-04-16 19:18:15 +02:00 |
Bart Visscher
|
8d1db84ed1
|
Merge pull request #2887 from owncloud/l10n-caching
L10N: cache the result of findLanguage
|
2013-04-16 09:11:33 -07:00 |
Jörn Friedrich Dreyer
|
606b672a3d
|
always connect file cache updater hooks first
|
2013-04-16 13:07:55 +02:00 |
Björn Schießle
|
01d203c773
|
add explenation of the expire function to the apps description
|
2013-04-16 12:31:33 +02:00 |
Björn Schießle
|
032c54273c
|
write a info message to the log if a file gets removed from the trash bin automatically
|
2013-04-16 12:31:22 +02:00 |
kondou
|
3ab97312b8
|
Hint to default data directory
not to before submitted data directory.
Thanks to bartv2 for the heads up.
|
2013-04-16 09:54:34 +02:00 |
Jenkins for ownCloud
|
d0b3e8aceb
|
[tx-robot] updated from transifex
|
2013-04-16 02:17:30 +02:00 |
Bernhard Posselt
|
c829a9c156
|
Merge pull request #2934 from owncloud/shorten_css_colorcodes
Shorten CSS colorcodes
|
2013-04-15 14:46:51 -07:00 |
Thomas Tanghus
|
3f7643ef46
|
Merge pull request #2769 from owncloud/octemplate
Add octemplate jQuery plugin
|
2013-04-15 13:42:35 -07:00 |
Thomas Tanghus
|
155582ab70
|
Updated docs.
|
2013-04-15 22:10:29 +02:00 |
kondou
|
0f86ed3ad5
|
Shorten CSS colorcodes
Only need to be three digits.
|
2013-04-15 21:07:45 +02:00 |
Jan-Christoph Borchardt
|
d484e14089
|
Merge pull request #2933 from owncloud/fix-active-style
also show black background on links that are active, fixes the news app ...
|
2013-04-15 12:04:15 -07:00 |
Bernhard Posselt
|
19526c9cf6
|
also show black background on links that are active, fixes the news app that doesnt show the bg for folders correctly
|
2013-04-15 20:29:45 +02:00 |
Arthur Schiwon
|
2fa34d6772
|
Make FileCache upgrade more robust, fixes #2650
|
2013-04-15 11:56:30 +02:00 |
Jenkins for ownCloud
|
e13e4c412f
|
[tx-robot] updated from transifex
|
2013-04-15 02:12:43 +02:00 |
Jan-Christoph Borchardt
|
846f77ed92
|
additional comments
|
2013-04-14 19:30:16 +02:00 |
Jan-Christoph Borchardt
|
694c080dd2
|
fix navigation hover effect, documentation
|
2013-04-14 19:25:46 +02:00 |
Jenkins for ownCloud
|
7d68cd4040
|
[tx-robot] updated from transifex
|
2013-04-14 02:20:35 +02:00 |
Jan-Christoph Borchardt
|
7baf8304c3
|
Merge pull request #2918 from owncloud/update_CONTRIBUTING.md
Update CONTRIBUTING.md
|
2013-04-13 14:52:45 -07:00 |