Markus Goetz
ba430a7dfa
Merge pull request #4485 from guruz/class_autoloader_optimization
...
Class Auto Loader: Cache paths in APC
2013-08-18 03:32:13 -07:00
Markus Goetz
aba64a0b81
Class Auto Loader: Cache paths in APC
...
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
2013-08-18 12:29:43 +02:00
Bart Visscher
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
Bart Visscher
dda5eb2530
Merge pull request #4486 from owncloud/ldap_adjust_cache
...
LDAP: use memcache if available
2013-08-18 02:50:41 -07:00
Owen Winkler
c427e256e1
Merge pull request #4493 from owncloud/fixing-initL10n-master
...
fixing undefined js error
2013-08-18 02:18:04 -07:00
Owen Winkler
1793ec1d5d
Fixed inconsistent spacing.
2013-08-18 05:17:28 -04:00
Jan-Christoph Borchardt
ce9103d522
Merge pull request #4426 from owncloud/ldap_settings_design
...
Ldap settings design
2013-08-18 01:52:51 -07:00
Andreas Fischer
4bb0e1567b
Use boolean casting for bitwise and result.
2013-08-17 23:41:37 +02:00
Andreas Fischer
4f462e9b6f
Add trailing comma for all touched array lines.
2013-08-17 23:39:26 +02:00
Andreas Fischer
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
Thomas Müller
15c9a0f405
fixing undefined js error
2013-08-17 19:24:06 +02:00
Thomas Müller
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
Arthur Schiwon
f41c4312ff
LDAP: use memcache if available
2013-08-17 17:22:54 +02:00
Morris Jobke
6ae6dc00e5
Merge pull request #4427 from owncloud/fix_4425
...
use OC files API to create missing directory
2013-08-17 08:09:07 -07:00
Kondou
a1128aadd0
Merge pull request #4482 from owncloud/remove_cancel_button_filepicker
...
Remove cancel button from filepicker
2013-08-17 06:58:34 -07:00
Bjoern Schiessle
f28f528431
switched to dirname()
2013-08-17 13:49:42 +02:00
Bjoern Schiessle
db8fdd5032
added missing parameter documentation
2013-08-17 13:46:33 +02:00
Morris Jobke
3e88430840
Merge pull request #4475 from owncloud/brighter-font-color
...
change font on login/install page from black to white
2013-08-17 04:37:49 -07:00
Björn Schießle
1af2ec1724
Merge pull request #4481 from owncloud/fix_versioning_size_check
...
first check if file exists before checking the files size
2013-08-17 04:37:09 -07:00
Bjoern Schiessle
f71794f0d5
added createMissingDirectories() method
2013-08-17 13:28:35 +02:00
Björn Schießle
d3e2f31ada
Merge pull request #4352 from owncloud/encryption_clean_up
...
crypt.php clean up
2013-08-17 04:10:15 -07:00
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
kondou
2ee8425295
Remove cancel button from filepicker
...
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
2013-08-17 12:07:58 +02:00
Morris Jobke
50147bfbd1
Merge pull request #4193 from owncloud/versions_fix_css
...
Versions fix css
2013-08-17 03:01:24 -07:00
Bjoern Schiessle
16efd81a0e
first check if file exists before checking the files size
2013-08-17 11:57:50 +02:00
Morris Jobke
60efd93d5d
fixes for IE8
2013-08-17 11:56:52 +02: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
Morris Jobke
18769e1348
change font on login/install page from black to white
2013-08-17 10:26:30 +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
Thomas Müller
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +02:00
Jan-Christoph Borchardt
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
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
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
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