Thomas Müller
|
7279a07ca2
|
Merge branch 'master' into mimetype-defaults
Conflicts:
apps/files/ajax/newfile.php
|
2013-08-16 00:13:10 +02:00 |
Jan-Christoph Borchardt
|
b632b8f4e4
|
force show loading icon also for IE
|
2013-08-16 00:02:11 +02:00 |
Jan-Christoph Borchardt
|
3563eecfff
|
merge master into more-whitespace
|
2013-08-15 23:25:20 +02:00 |
Thomas Müller
|
bd1895bdf8
|
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-15 14:08:01 -07:00 |
Jan-Christoph Borchardt
|
e7c0693570
|
checkstyle double quotes in HTML
|
2013-08-15 19:40:39 +02:00 |
Jan-Christoph Borchardt
|
61370a7655
|
add folder icons for shared, public and external
|
2013-08-15 18:58:55 +02:00 |
Thomas Müller
|
b3241402b9
|
Merge pull request #4443 from owncloud/remove-jplayer-from-core-css
remove jPlayer css rules from core css file
|
2013-08-15 08:38:56 -07:00 |
Georg Ehrke
|
4574c5cf5c
|
check if ->resource is a resource
|
2013-08-15 16:13:01 +02:00 |
Arthur Schiwon
|
42fc2295e4
|
LDAP: Update Host in configuration chooser on Save
|
2013-08-15 16:10:49 +02:00 |
Morris Jobke
|
5fb7aab7a0
|
remove jPlayer css rules from core css file
|
2013-08-15 16:08:49 +02:00 |
Morris Jobke
|
b6ac711787
|
Merge pull request #4448 from owncloud/fixing-4444-master
Fixing 4444 master
|
2013-08-15 07:06:18 -07:00 |
kondou
|
9c5416fe4a
|
Clean up \OC\Util
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
|
2013-08-15 15:57:32 +02:00 |
Arthur Schiwon
|
479f893f6d
|
LDAP: Show Host name in configuration drop down
|
2013-08-15 15:55:06 +02:00 |
Thomas Müller
|
ada13a4d40
|
fixing all broken translation files
|
2013-08-15 15:41:45 +02:00 |
Thomas Müller
|
c71408eaa9
|
fixing call to join
|
2013-08-15 15:38:33 +02:00 |
Georg Ehrke
|
7a11911aea
|
add comment to make @jancborchardt happy
|
2013-08-15 13:25:45 +02:00 |
Georg Ehrke
|
825d8610d0
|
fix svg and cache transparency issue
|
2013-08-15 13:22:05 +02:00 |
Georg Ehrke
|
7fe9320ffe
|
improve unknown backend
|
2013-08-15 13:22:04 +02:00 |
Bjoern Schiessle
|
7adfc27caf
|
remove whitespaces and some leftover code from testing
|
2013-08-15 13:13:16 +02:00 |
Markus Goetz
|
b9f3bb2426
|
Merge pull request #4441 from guruz/checkServer_cache_result
Cache OC_Util::checkServer() result in session
|
2013-08-15 03:52:16 -07:00 |
Jan-Christoph Borchardt
|
2fd5178a00
|
adjust New file dialog for new styles
|
2013-08-15 12:50:26 +02:00 |
Arthur Schiwon
|
cbfee81068
|
LDAP: slightly smaller input fields
|
2013-08-15 12:45:37 +02:00 |
Owen Winkler
|
cd7e57e8ec
|
Use JSON to send/receive group data.
Squashed commits from PR #4364 for master.
|
2013-08-15 06:19:40 -04:00 |
Thomas Müller
|
05549884c6
|
no files external for SMB on windows
|
2013-08-15 12:00:02 +02:00 |
Markus Goetz
|
3972198b61
|
Cache OC_Util::checkServer() result in session
The return value almost never changes but this function
is called for every request.
|
2013-08-15 11:58:09 +02:00 |
Jenkins for ownCloud
|
680ac48856
|
[tx-robot] updated from transifex
|
2013-08-15 04:53:54 -04:00 |
Morris Jobke
|
de89c31f5a
|
Merge pull request #4302 from synchrone/master
Fixing owncloud/core#4301
|
2013-08-14 17:11:30 -07:00 |
Thomas Tanghus
|
ca495758bd
|
Fix octemplate string escaping.
|
2013-08-14 23:06:43 +02:00 |
Jan-Christoph Borchardt
|
b2f666c98f
|
fix file summary position
|
2013-08-14 21:26:06 +02:00 |
Andreas Fischer
|
75e9015b54
|
Merge pull request #4393 from owncloud/fix_4326
provide correct path for require_once
* owncloud/fix_4326:
use __DIR__ instead of realpath
provide correct path for require_once
|
2013-08-14 21:20:53 +02:00 |
Georg Ehrke
|
623f9ec817
|
don't generate previews of empty txt files
|
2013-08-14 21:20:31 +02:00 |
Thomas Müller
|
06670cef8a
|
Merge pull request #4304 from tripflex/lostpw-themed
use theme name and title for password reset
|
2013-08-14 12:04:40 -07:00 |
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
Bjoern Schiessle
|
a3d009e3b5
|
also create root dir if it doesn't exist yet
|
2013-08-14 20:51:36 +02:00 |
Georg Ehrke
|
e5761d90ef
|
fix deleting old previews after file changed
|
2013-08-14 20:49:47 +02:00 |
Jan-Christoph Borchardt
|
137d644963
|
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
|
2013-08-14 20:41:49 +02:00 |
Jan-Christoph Borchardt
|
cba0f69622
|
increase row height to 50px, properly position everything, checkboxes, actions etc
|
2013-08-14 20:41:20 +02:00 |
Thomas Müller
|
994537a5b9
|
Merge pull request #4372 from owncloud/allow_empty_configvalue
allow empty configvalue in appconfig
|
2013-08-14 10:34:06 -07:00 |
Jörn Friedrich Dreyer
|
8f3f47e868
|
Merge pull request #4376 from owncloud/use_plurals
Use plural translations
|
2013-08-14 10:23:19 -07:00 |
Georg Ehrke
|
a255cc6007
|
fix adding preview-icon to clss attribute
|
2013-08-14 18:52:53 +02:00 |
Thomas Müller
|
b3b2b2d64c
|
Merge pull request #4363 from owncloud/fix-4355
Send mime-type for new files
|
2013-08-14 09:46:10 -07:00 |
Bjoern Schiessle
|
d314729cea
|
use OC files API to create missing directory which should handle special chars in every environment correctly
|
2013-08-14 17:58:41 +02:00 |
Bjoern Schiessle
|
7d0e9cc685
|
use __DIR__ instead of realpath
|
2013-08-14 17:15:01 +02:00 |
Arthur Schiwon
|
7b17fd2f17
|
LDAP: move small info text strings into tooltips
|
2013-08-14 16:51:38 +02:00 |
Arthur Schiwon
|
a4fc9bbe8c
|
LDAP: right align labels on settings page
|
2013-08-14 16:38:25 +02:00 |
Jan-Christoph Borchardt
|
320bf0e8c1
|
fix breaking error due to ... a wrong icon link. Seriously?
|
2013-08-14 16:19:02 +02:00 |
Jan-Christoph Borchardt
|
79a5e2a4cc
|
adjustments of video and web icon
|
2013-08-14 13:51:55 +02:00 |
Georg Ehrke
|
4f525c864d
|
lazy load preview icons
|
2013-08-14 13:27:01 +02:00 |
Jan-Christoph Borchardt
|
4845ef5ac6
|
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
|
2013-08-14 13:01:52 +02:00 |
Jan-Christoph Borchardt
|
14003b6d96
|
replace different icons for code with proper ones
|
2013-08-14 13:00:13 +02:00 |