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

10467 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frank Karlitschek
6cf00e455f Merge pull request #2457 from KnownSubset/master 
Extend .gitignore for better compatability with phpStorm/IntelliJ
 2013-03-19 10:07:03 -07:00
Nathan Dauber
cc25b533fd Update the ignores to include project structure file *.iml 2013-03-19 11:57:06 -05:00
Bernhard Posselt
8ca01451fd Merge pull request #2244 from owncloud/fixing-windows-datadir-master 
remove trailing slash from data dir on windows
 2013-03-19 07:38:41 -07:00
Bernhard Posselt
8858960a19 Merge pull request #2451 from owncloud/fix_npe_master 
fix npe when createStorage() returns null
 2013-03-19 07:28:59 -07:00
Jörn Friedrich Dreyer
39665cfa6b fix npe when createStorage() returns null 2013-03-19 15:02:29 +01:00
Thomas Müller
a0ae2ab11a Merge pull request #2445 from owncloud/extend_public_api 
add a searchbymime to the public api. Please all remember that access to...
 2013-03-19 07:02:11 -07:00
Thomas Mueller
9dd3dcc5cd Merge branch 'master' into fixing-windows-datadir-master 2013-03-19 14:43:55 +01:00
Arthur Schiwon
aa3973d365 LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup. 2013-03-19 14:40:36 +01:00
Arthur Schiwon
0f4e02b6fc LDAP: avoid irritating log output 2013-03-19 14:40:30 +01:00
Arthur Schiwon
50d0f48ee4 LDAP: check whether user exists for before trying to determine displayname 2013-03-19 14:40:23 +01:00
Arthur Schiwon
18fccf6612 LDAP: check first whether group exists in this backend before doing other operations 2013-03-19 14:40:15 +01:00
Arthur Schiwon
504f5f229f LDAP: remove unnecessary func call, was a leftover from earlier refactor 2013-03-19 14:40:05 +01:00
Arthur Schiwon
f38932fb80 LDAP: specify appid when selecting from appconfig 2013-03-19 14:39:56 +01:00
Frank Karlitschek
3cb016d478 add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-) 2013-03-19 14:27:02 +01:00
Thomas Mueller
7a2396208f using rtrim 2013-03-19 13:37:48 +01:00
Bernhard Posselt
e8100dc1a8 Merge pull request #2440 from owncloud/js_version_parameter 
Add hashed version parameter to js and css. Ref #1520 and many more ;)
 2013-03-19 04:50:27 -07:00
Thomas Tanghus
57f2884efa Add hashed version parameter to js and css. Ref #1520 and many more ;) 2013-03-19 12:35:31 +01:00
Bernhard Posselt
5902ba5c2b Merge pull request #2433 from owncloud/db_primary_keys 
Additional indexes and missing primary keys
 2013-03-19 02:43:14 -07:00
Bernhard Posselt
b12254e9a4 Merge pull request #2434 from owncloud/userlist_no_dupes 
User list: Avoid dupes and better sorting. Fix #2420
 2013-03-19 02:41:27 -07:00
Thomas Tanghus
c13487332a User list: Avoid dupes and better sorting. Fix #2420 2013-03-19 02:48:08 +01:00
Thomas Tanghus
f052846914 Add indexes and primary keys. 2013-03-19 01:38:40 +01:00
Thomas Tanghus
935d2169c8 Revert "Add indexes and primary keys." 
This reverts commit 3b33712dc9.
 2013-03-19 01:36:51 +01:00
Thomas Tanghus
3b33712dc9 Add indexes and primary keys. 2013-03-19 01:35:12 +01:00
Jenkins for ownCloud
63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Bernhard Posselt
5b1f857907 Merge pull request #2363 from owncloud/uploadsize 
Improve behaviour when max upload size is unknown
 2013-03-18 08:18:27 -07:00
Jan-Christoph Borchardt
c262ad56b3 Merge pull request #2408 from dcneiner/infield-upgrade 
Upgraded infield labels plugin to the latest version. Updated invocation...
 2013-03-18 07:49:26 -07:00
Thomas Tanghus
a50d53c4dd Merge pull request #2417 from owncloud/trash_more_error_logs 
add some error logs to the trash bin app
 2013-03-18 05:17:21 -07:00
Björn Schießle
4a1a23ce1b add some error logs to the trash bin app 2013-03-18 12:08:34 +01:00
Frank Karlitschek
67f5b00980 Merge pull request #2411 from owncloud/fix_magicquotes 
remove deprecated call
 2013-03-18 02:37:01 -07:00
Doug Neiner
b8c1a4da3e Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms 2013-03-17 22:21:34 -05:00
Jenkins for ownCloud
2a48aa322d [tx-robot] updated from transifex 2013-03-18 00:06:55 +01:00
Frank Karlitschek
63336f2acb remove deprecated call 2013-03-17 22:05:45 +01:00
Frank Karlitschek
7f1ff3e9e1 Merge pull request #2204 from owncloud/chache_updater_rename 
Cache: better rename hook for cache updater
 2013-03-17 05:03:18 -07:00
Thomas Müller
86f6938c38 Merge pull request #2387 from owncloud/cron-session-close 
Close sessions when doing background jobs
 2013-03-16 18:22:45 -07:00
Robin Appelman
d3858e9f96 Close sessions when doing background jobs 2013-03-17 00:48:10 +01:00
Jenkins for ownCloud
db69e2b3e8 [tx-robot] updated from transifex 2013-03-17 00:02:13 +01:00
Jenkins for ownCloud
1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Bernhard Posselt
b3499c8dc3 Merge pull request #2380 from henningoschwald/76bb5221c7a1b71f0d617c55e844c51e889a2c70 
Fixes keyboard accessibility of expandable settings
 2013-03-16 12:22:33 -07:00
Bernhard Posselt
a3db54f9b0 Merge pull request #2383 from owncloud/error-handling-upgrade 
Add error handling to the file cache upgrade
 2013-03-16 12:17:31 -07:00
Michael Gapczynski
c69dc3483a Add error handling to the file cache upgrade 2013-03-16 14:28:42 -04:00
Henning Oschwald
76bb5221c7 Restores keyboard accessibility for expandable settings area. 
Tabindex="0" makes the element focussable with the keyboard and
role="link" tells assistive technologies that this clickable span
element is supposed to be presented as a hyperlink.
 2013-03-16 16:32:55 +01:00
Jan-Christoph Borchardt
25175937a9 Merge pull request #2322 from PHLAK/master 
Added 3rdparty folder as a git submodule
 2013-03-16 06:31:16 -07:00
Lukas Reschke
047ceaac0f Merge pull request #2360 from sherbrecher/master 
files_external: fix for overlap if input controls
 2013-03-15 10:48:46 -07:00
sherbrecher
ec45a8433d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/files_external/templates/settings.php
 2013-03-15 17:50:02 +01:00
Robin Appelman
8a97afac6f Don't show storage space warning when the free space can't be determined 2013-03-15 16:46:20 +01:00
Robin Appelman
319e3f162c Don't block uploads if the max upload size is unknown 2013-03-15 16:40:36 +01:00
Robin Appelman
32b8fd8fb7 Improve handeling of unlimited max upload size 2013-03-15 16:31:35 +01:00
Bernhard Posselt
ebb2cb3403 Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files 
Filter display of blacklisted files
 2013-03-15 08:25:13 -07:00
sherbrecher
d2b3a9fb3b Update settings.php 
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
 2013-03-15 15:09:55 +01:00
Frank Karlitschek
761540e78b Merge pull request #2320 from ceri/master 
Fix erroneous email when folders are shared
 2013-03-15 04:22:44 -07:00