wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16686 commits 157 branches 562 tags 714 MiB
Commit graph

16686 commits

This branch
This branch
All branches
Author SHA1 Message Date
kondou
0e0b4d5575 Hide remove image, if there's no custom avatar 
Fix #7308
 2014-02-20 21:53:59 +01:00
Bjoern Schiessle
1ae6e9ec21 add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 2014-02-20 19:06:42 +01:00
Lukas Reschke
917a505af4 Merge pull request #7291 from owncloud/adminess-raghu 
Move isadmin to template and rename it to oc_isadmin
 2014-02-20 19:01:28 +01:00
Lukas Reschke
f11658698d Fix path to the mount file 2014-02-20 18:53:37 +01:00
Robin Appelman
daf28225b7 fix viewport size on windows phone 2014-02-20 18:42:59 +01:00
Jan-Christoph Borchardt
d5739e83d1 remove additional transition rule, reduce width of collapsed search bar 2014-02-20 18:40:08 +01:00
Morris Jobke
dde9193b2b Merge pull request #7332 from owncloud/IE10-viewport 
fix IE10 viewport sizeing
 2014-02-20 18:35:44 +01:00
Lukas Reschke
6cb64a4fce Fix code to search for mount.json in custom data folders 2014-02-20 18:34:27 +01:00
Morris Jobke
65843e2459 Improve jQuery element selector 
see https://github.com/owncloud/core/pull/7012/files#r9337198
http://24ways.org/2011/your-jquery-now-with-less-suck/
 2014-02-20 18:24:43 +01:00
Thomas Müller
d0c8b310b9 uppercase text and fix dialog popup 2014-02-20 18:24:42 +01:00
Thomas Müller
179fbada32 show share owner within shared folders as well 2014-02-20 18:24:42 +01:00
Thomas Müller
2b84f5e0b9 remove duplicate selectors and declaration 2014-02-20 18:24:42 +01:00
Thomas Müller
271684dcfe update share owner 2014-02-20 18:24:42 +01:00
Thomas Müller
d6e89a9a28 store the share owner in a data-attribute instead of a separate span 2014-02-20 18:24:42 +01:00
Thomas Müller
7c68025010 adding share owner information to the file list 2014-02-20 18:24:42 +01:00
Robin Appelman
d9bb21146f fix IE10 viewport sizeing 2014-02-20 18:14:40 +01:00
Jan-Christoph Borchardt
d466458469 restrict zooming in to not mangle layout accidentally 2014-02-20 17:37:48 +01:00
Robin Appelman
f710205ee7 Make unit tests expect the svg icons 2014-02-20 16:56:09 +01:00
Robin Appelman
0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
Thomas Müller
ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root 
Allow passing a root folder to get the used space from in the quota wrapper
 2014-02-20 16:47:59 +01:00
Jan-Christoph Borchardt
bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance 
Improve users list scrolling performance
 2014-02-20 16:45:36 +01:00
Thomas Müller
b35cd54e87 Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer 
Conflicts:
	lib/private/files.php
 2014-02-20 16:36:37 +01:00
Jan-Christoph Borchardt
5cc4a47f4c Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix 
remove fix for IE9 nav bar width
 2014-02-20 16:25:08 +01:00
icewind1991
d1b1ad0813 Merge pull request #7290 from owncloud/issue/5463 
Correctly redirect to settings page when not selecting cert file for upload
 2014-02-20 16:24:31 +01:00
blizzz
984ea7b3ff Merge pull request #7205 from owncloud/fix_7153 
LDAP: prevent other configuration from being deleted when deleting the f...
 2014-02-20 16:22:43 +01:00
Morris Jobke
658758c3f7 fix intendation 2014-02-20 15:36:52 +01:00
Morris Jobke
b946c0f08b Merge pull request #7319 from owncloud/remote-unneeded-if 
Remove no longer needed if statement
 2014-02-20 15:30:51 +01:00
Vincent Petry
44441b56d6 Fixed trashbin title 2014-02-20 15:16:45 +01:00
Lukas Reschke
c869e0116b Merge pull request #6999 from kofemann/mount-config 
mount: make location of mount.json configurable
 2014-02-20 15:15:00 +01:00
Björn Schießle
4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator 
Add missing slash in URLGenerator::getAbsoluteURL().
 2014-02-20 14:57:03 +01:00
Vincent Petry
476444ab1a Fixed title format 2014-02-20 14:56:28 +01:00
Lukas Reschke
e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons 
Fix filetype icons
 2014-02-20 14:53:41 +01:00
Robin Appelman
d329049e53 Remove no longer needed if statement 2014-02-20 14:51:23 +01:00
Vincent Petry
6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +01:00
Jan-Christoph Borchardt
b8048866c7 Merge pull request #7315 from owncloud/Jakobud-core-css-logos 
Jakobud core css logos
 2014-02-20 14:36:34 +01:00
Thomas Müller
3219433e20 Merge pull request #7036 from LeBlaaanc/patch-1 
Removed '/'. Fixes #7035.
 2014-02-20 14:29:41 +01:00
Jörn Friedrich Dreyer
3f6d14be85 Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core 
Conflicts:
	core/css/styles.css
 2014-02-20 14:29:23 +01:00
Lukas Reschke
0241ddc759 Merge pull request #6519 from nhirokinet/master 
Security Update: session fixation
 2014-02-20 14:28:26 +01:00
Thomas Müller
fbea02bebb kill $coreStyles and $coreScripts 2014-02-20 14:18:01 +01:00
Thomas Müller
01929096fe revert wrong change to .htaccess 2014-02-20 14:11:31 +01:00
Thomas Müller
a0e790227e remove unused functions - have been introduced with the old minimizer approach 2014-02-20 14:11:31 +01:00
Arthur Schiwon
d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +01:00
Lukas Reschke
2955d9b483 Indentation 2014-02-20 13:54:05 +01:00
Thomas Müller
31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-20 13:52:53 +01:00
icewind1991
742f54b6d5 Merge pull request #7301 from owncloud/fix-fuckup 
fix master - #7274 brokes it
 2014-02-20 13:40:12 +01:00
Jan-Christoph Borchardt
20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt
92d57cb5a7 move avatar into clickable area of user menu 2014-02-20 13:36:52 +01:00
Thomas Müller
8cf73ca42f integrate assetic for asset pipeline-ing 2014-02-20 13:28:27 +01:00
Thomas Müller
7242d00aa6 enable static delivery of css files 2014-02-20 13:27:46 +01:00
Thomas Müller
328428e40a reference 3rdparty branch add-assetic 2014-02-20 13:26:23 +01:00