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

12844 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bart Visscher
29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Arthur Schiwon
c538ac3081 LDAP: only connect to LDAP once on login 2013-08-17 12:16:51 +02:00
Thomas Müller
69350c4e0d Merge pull request #4471 from owncloud/password-icon 
use proper password icon, three dots are 'more'
 2013-08-17 03:16:11 -07:00
Thomas Müller
264ee9df9a Merge pull request #4476 from owncloud/doc-on-master 
fix difference between packaged version and master
 2013-08-17 03:13:17 -07:00
Thomas Müller
e761cba808 Merge pull request #4480 from owncloud/remove-ru_RU-master 
remove ru_RU - fixes #3135
 2013-08-17 03:10:42 -07:00
Morris Jobke
50147bfbd1 Merge pull request #4193 from owncloud/versions_fix_css 
Versions fix css
 2013-08-17 03:01:24 -07:00
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Bjoern Schiessle
137cd2ca89 increase width of versions dialog 2013-08-17 11:01:43 +02:00
Morris Jobke
746d32eb05 fix difference between packaged version and master 2013-08-17 10:33:11 +02:00
Jan-Christoph Borchardt
b8b24bbae7 use proper password icon, three dots are 'more' 2013-08-16 17:59:48 +02:00
Morris Jobke
837cefd8a3 Merge pull request #4442 from owncloud/no-smb-client-on-windows-master 
no files external for SMB on windows
 2013-08-16 02:48:42 -07:00
Jan-Christoph Borchardt
1e8849b04e Merge pull request #4314 from owncloud/css-fixes 
Design fixes
 2013-08-16 01:05:29 -07:00
Morris Jobke
c196985ea3 Merge pull request #4032 from owncloud/more-whitespace 
More whitespace
 2013-08-16 01:02:03 -07:00
Jenkins for ownCloud
6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Thomas Müller
0aa7dc9b89 tixing width and position of wider error messages 2013-08-16 00:56:09 +02:00
Jan-Christoph Borchardt
d2767faf61 Merge pull request #4113 from owncloud/delete-fix 
Delete icon fix
 2013-08-15 15:31:42 -07:00
Jan-Christoph Borchardt
399adf67b0 merge master into css-fixes 2013-08-16 00:29:43 +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
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
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
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
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
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
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
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
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
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
7d0e9cc685 use __DIR__ instead of realpath 2013-08-14 17:15:01 +02:00
kondou
4002491947 Reword a phrase 2013-08-14 06:29:19 +02:00
Jörn Friedrich Dreyer
435e63b5ee Merge pull request #4410 from owncloud/fix_sharing_defaults 
Fix sharing defaults
 2013-08-13 15:27:24 -07:00
Jörn Friedrich Dreyer
11a404b90b comment clarification 2013-08-14 00:25:07 +02:00
Jörn Friedrich Dreyer
ca95a475d5 use edit & reshare permission as default 2013-08-13 22:58:47 +02:00
Jörn Friedrich Dreyer
5660f99592 add PERMISSIONS_ALL summary 2013-08-13 22:58:27 +02:00
Jenkins for ownCloud
9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Bjoern Schiessle
eb0fdc8380 provide correct path for require_once 2013-08-12 17:38:57 +02:00
icewind1991
77596ace81 Merge pull request #4391 from owncloud/scanner-reuse-recursive 
Fix recursive scanner to reusing etags
 2013-08-12 08:28:23 -07:00
Robin Appelman
f22719b1ee Scanner: correctly pass trough reuse options when doing a recursive scan 2013-08-12 15:37:39 +02:00
Robin Appelman
1877a42a0d Scanner: additional tests for reusing etags during scanning 2013-08-12 15:37:15 +02:00
Jenkins for ownCloud
5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Owen Winkler
4128561f22 Merge pull request #4360 from owncloud/format-date-numeric-strings 
Do not pass numeric strings to strtotime() when formatting dates.
 2013-08-09 16:05:01 -07:00
Thomas Müller
0e3dea7111 adding test case for a numeric value 2013-08-09 23:36:23 +02:00
Andreas Fischer
b6b1bc5d09 Add datetime test for numeric string. 2013-08-09 22:32:38 +02:00