Georg Ehrke
|
a2bb0faec6
|
Merge branch 'master' into oc_preview
|
2013-06-10 10:15:53 +02:00 |
|
Jenkins for ownCloud
|
b237d03791
|
[tx-robot] updated from transifex
|
2013-06-10 02:06:36 +02:00 |
|
Jenkins for ownCloud
|
78286d0262
|
[tx-robot] updated from transifex
|
2013-06-09 02:06:21 +02:00 |
|
Jenkins for ownCloud
|
3c79d89492
|
[tx-robot] updated from transifex
|
2013-06-08 02:13:41 +02:00 |
|
Michael Gapczynski
|
9ef989f917
|
Merge pull request #2919 from owncloud/hook-improvements
Hook improvements
|
2013-06-07 06:35:50 -07:00 |
|
Morris Jobke
|
1cace9b0a3
|
Merge pull request #3628 from owncloud/update_3rdparty_submodule
update 3rdparty submodule
|
2013-06-07 02:43:22 -07:00 |
|
Georg Ehrke
|
6a99d6ed45
|
update 3rdparty submodule
|
2013-06-07 10:44:16 +02:00 |
|
Georg Ehrke
|
8114537310
|
Merge branch 'master' into oc_preview
|
2013-06-07 09:46:13 +02:00 |
|
Jenkins for ownCloud
|
67c085417c
|
[tx-robot] updated from transifex
|
2013-06-07 02:17:50 +02:00 |
|
Thomas Müller
|
705ab358d8
|
Merge pull request #3622 from owncloud/read-extfx-confg-from-home
Read configuratons for external filesystem test from a private place.
|
2013-06-06 16:19:48 -07:00 |
|
Thomas Mueller
|
058c15a9f4
|
Read configuratons for external filesystem test from a private place.
This will help not to accidentially push private data and enable testing on our ci server.
|
2013-06-07 00:04:46 +02:00 |
|
Georg Ehrke
|
85ecec8b01
|
Merge branch 'master' into oc_preview
|
2013-06-06 11:13:55 +02:00 |
|
Jenkins for ownCloud
|
81b6cab94f
|
[tx-robot] updated from transifex
|
2013-06-06 02:21:31 +02:00 |
|
Georg Ehrke
|
f80aba4893
|
use tmpdir var instead of hardcoded /tmp
|
2013-06-05 12:58:39 +02:00 |
|
Georg Ehrke
|
21cc4f6960
|
make libreoffice preview backend work :D
|
2013-06-05 12:45:20 +02:00 |
|
Georg Ehrke
|
5c1d4fc186
|
yet another update for config.sample.php
|
2013-06-05 11:18:57 +02:00 |
|
Georg Ehrke
|
78e8712366
|
update config.sample.php
|
2013-06-05 11:17:29 +02:00 |
|
Georg Ehrke
|
8c5fceba29
|
fix syntax error
|
2013-06-05 11:13:13 +02:00 |
|
Georg Ehrke
|
bab8b20cbd
|
use ->cmd instead of hardcoded libreoffice
|
2013-06-05 11:06:36 +02:00 |
|
Georg Ehrke
|
f437673f1a
|
update require_once block in preview.php
|
2013-06-05 10:55:57 +02:00 |
|
Georg Ehrke
|
749c33f39d
|
escape tmppath shell arg
|
2013-06-05 10:53:16 +02:00 |
|
Georg Ehrke
|
bcc4fca257
|
save current work state of libreoffice preview backend
|
2013-06-05 10:50:20 +02:00 |
|
Jenkins for ownCloud
|
666a5c1cc7
|
[tx-robot] updated from transifex
|
2013-06-05 02:01:42 +02:00 |
|
Michael Gapczynski
|
cb9fe475c4
|
Merge branch 'master' into hook-improvements
Conflicts:
lib/files/view.php
|
2013-06-04 18:19:08 -04:00 |
|
Thomas Müller
|
c59ee99d93
|
Merge pull request #3594 from opensaucesystems/patch-1
Added input[type="url"] to styles.css
|
2013-06-04 14:01:09 -07:00 |
|
Thomas Mueller
|
db1ca90319
|
exclude 3rdparty folder within files_external and files_encryption from code coverage
|
2013-06-04 22:41:52 +02:00 |
|
opensaucesystems
|
d987bea635
|
Added input[type="url"] to styles.css
|
2013-06-04 16:04:29 +02:00 |
|
Arthur Schiwon
|
4976f2e0d3
|
LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600
|
2013-06-04 10:32:54 +02:00 |
|
Jenkins for ownCloud
|
bc50d92841
|
[tx-robot] updated from transifex
|
2013-06-04 02:31:06 +02:00 |
|
Thomas Mueller
|
d921004a6e
|
ignore l10n folder within remaining apps
|
2013-06-04 00:04:17 +02:00 |
|
Arthur Schiwon
|
61dadb05a6
|
Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location
|
2013-06-03 22:37:14 +02:00 |
|
Arthur Schiwon
|
c8a2beccb0
|
Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374
|
2013-06-03 22:36:36 +02:00 |
|
Jörn Friedrich Dreyer
|
96b1e54d4a
|
Merge pull request #3444 from owncloud/share-fix
Fix undefined index for share mount point retrieval
|
2013-06-03 11:35:06 -07:00 |
|
Jörn Friedrich Dreyer
|
1f8e92019e
|
Merge pull request #3581 from owncloud/publicphp_maintenance
public.php - check if maintenance mode is enabled
|
2013-06-03 11:26:56 -07:00 |
|
icewind1991
|
8c991d97aa
|
Merge pull request #3561 from owncloud/user
Refactor of user management
|
2013-06-03 08:13:40 -07:00 |
|
Thomas Tanghus
|
2572c9a6b7
|
Merge pull request #3578 from owncloud/ocdialog
Replacement for jquery.dialog to fit better with ownCloud design.
|
2013-06-03 06:37:27 -07:00 |
|
Thomas Müller
|
df5f02bed0
|
Exclude apps/files/l10n from coverage reports
|
2013-06-03 14:50:36 +02:00 |
|
Robin Appelman
|
0ce2b2708c
|
also clear cached users when removing a single backend
|
2013-06-03 14:19:17 +02:00 |
|
Robin Appelman
|
2a82964830
|
use caching for userExists
|
2013-06-03 13:46:05 +02:00 |
|
Robin Appelman
|
83fbdc903f
|
cast result to bool
|
2013-06-03 13:39:34 +02:00 |
|
Robin Appelman
|
eb2a1e0f8a
|
move phpdoc comments
|
2013-06-03 13:33:56 +02:00 |
|
Robin Appelman
|
1a4021a0fe
|
User: return backend result
|
2013-06-03 13:19:01 +02:00 |
|
Robin Appelman
|
fbe3213fec
|
User: consisten variable naming
|
2013-06-03 13:17:03 +02:00 |
|
Robin Appelman
|
00b4bfcbf5
|
User: remove determineDisplayName
|
2013-06-03 13:15:42 +02:00 |
|
Georg Ehrke
|
ce14788ac0
|
public.php - check if maintenance mode is enabled
|
2013-06-03 12:57:47 +02:00 |
|
Jörn Friedrich Dreyer
|
b76725c1fa
|
Merge pull request #3560 from owncloud/init-order-session
initialize the session earlier
|
2013-06-03 03:21:05 -07:00 |
|
Georg Ehrke
|
34decf3576
|
save current work state
|
2013-06-03 11:24:37 +02:00 |
|
Thomas Tanghus
|
46d4886709
|
Set default button in oc-dialogs
|
2013-06-03 03:31:33 +02:00 |
|
Thomas Tanghus
|
5f1cbc6a1a
|
Catch double destroy on escape.
|
2013-06-03 03:19:35 +02:00 |
|
Jenkins for ownCloud
|
422c6f7252
|
[tx-robot] updated from transifex
|
2013-06-03 02:34:10 +02:00 |
|