Thomas Müller
|
c56542c58d
|
Merge pull request #1771 from owncloud/mountconfig
JSON mount config: no pretty print
|
2013-02-18 22:15:56 -08:00 |
|
Thomas Mueller
|
0e9b9f4f5f
|
no pretty print
|
2013-02-19 00:48:38 +01:00 |
|
Jenkins for ownCloud
|
76c4dc6296
|
[tx-robot] updated from transifex
|
2013-02-19 00:06:51 +01:00 |
|
Thomas Müller
|
d9035d4fdc
|
Merge pull request #1728 from owncloud/mountconfig
Use json for new mount configuration files
|
2013-02-18 14:56:25 -08:00 |
|
Thomas Mueller
|
f343d9d247
|
files_versions no longer contains a personal settings page -> remove the call
|
2013-02-18 23:04:22 +01:00 |
|
Thomas Müller
|
0ab87204ec
|
Merge pull request #1759 from owncloud/redirect_fix_1737
fix redirect, use the new routing
|
2013-02-18 07:13:19 -08:00 |
|
Robin Appelman
|
3bf9aa408e
|
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
|
2013-02-18 15:13:25 +01:00 |
|
Robin Appelman
|
2bbb57e429
|
merge master into mountconfig
|
2013-02-18 15:12:15 +01:00 |
|
Björn Schießle
|
4a3374ecf8
|
fix redirect, use the new routing
|
2013-02-18 14:38:29 +01:00 |
|
Lukas Reschke
|
79284b8e57
|
Sanitize HTML
|
2013-02-18 08:11:59 +01:00 |
|
Jenkins for ownCloud
|
3b9796bfcc
|
[tx-robot] updated from transifex
|
2013-02-18 00:06:45 +01:00 |
|
Thomas Müller
|
8e76a98d2f
|
Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
|
2013-02-17 11:53:51 -08:00 |
|
Bernhard Posselt
|
90939c8f12
|
Merge pull request #1708 from owncloud/style-cleanup-user_ldap
Style cleanup user_ldap
|
2013-02-17 07:02:45 -08:00 |
|
Thomas Mueller
|
325746ae45
|
Merge branch 'master' into fix-googledrive
|
2013-02-17 09:41:37 +01:00 |
|
Thomas Müller
|
0f8058cb12
|
Merge pull request #1699 from owncloud/multiselect-bar-fix
fix multiselect bar offset on shared page, close #1339 finally
|
2013-02-17 00:39:16 -08:00 |
|
Thomas Müller
|
71472c21ed
|
Merge pull request #1730 from owncloud/ldap_fix_warnings
LDAP: check array with isset first to avoid warnings about undefined ind...
|
2013-02-17 00:25:40 -08:00 |
|
Jenkins for ownCloud
|
c8e7b14ab3
|
[tx-robot] updated from transifex
|
2013-02-17 00:26:17 +01:00 |
|
Frank Karlitschek
|
17d21a84b6
|
Merge pull request #1729 from owncloud/fix_1727
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
|
2013-02-16 05:48:18 -08:00 |
|
Lukas Reschke
|
4708d4549d
|
Add missing requesttoken
This is a trivial fix for a regression caused by #1648
|
2013-02-16 13:28:49 +01:00 |
|
Jörn Friedrich Dreyer
|
cad65915a7
|
look where you are typing ...
|
2013-02-16 12:55:36 +01:00 |
|
Jörn Friedrich Dreyer
|
e1700c28fa
|
pretty print json
|
2013-02-16 12:10:54 +01:00 |
|
Arthur Schiwon
|
a28df74ee5
|
LDAP: check array with isset first to avoid warnings about undefined index
|
2013-02-16 02:33:19 +01:00 |
|
Arthur Schiwon
|
bef48bad8b
|
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727
|
2013-02-16 02:06:45 +01:00 |
|
Robin Appelman
|
6da2c6c83e
|
Create new mountconfig files in json
|
2013-02-16 01:50:40 +01:00 |
|
Robin Appelman
|
46626915ef
|
Use a parser to read custom mount configuration instead of including the php files
|
2013-02-16 01:30:44 +01:00 |
|
Jenkins for ownCloud
|
83f0c8ce61
|
[tx-robot] updated from transifex
|
2013-02-16 00:05:50 +01:00 |
|
Bart Visscher
|
6c197227d0
|
Join split translated strings
|
2013-02-15 15:58:52 +01:00 |
|
Bart Visscher
|
5616690506
|
Style cleanup files_external
|
2013-02-15 15:58:52 +01:00 |
|
Bart Visscher
|
925de78cec
|
Join split translated strings
|
2013-02-15 15:51:55 +01:00 |
|
Bart Visscher
|
92a36ca8b8
|
Join short comment lines
|
2013-02-15 15:45:34 +01:00 |
|
Jan-Christoph Borchardt
|
ac32ae79af
|
Merge pull request #1683 from owncloud/ie-fixes
IE fixes
|
2013-02-15 03:32:31 -08:00 |
|
Björn Schießle
|
08b68aac6c
|
check if glob() returns any results, fix for stable45 was already approved by pull request #1695
|
2013-02-15 12:29:52 +01:00 |
|
Jenkins for ownCloud
|
b169073169
|
[tx-robot] updated from transifex
|
2013-02-15 00:06:50 +01:00 |
|
Bart Visscher
|
1ef2ecd6e8
|
Style cleanup user_ldap
|
2013-02-14 22:16:48 +01:00 |
|
Bart Visscher
|
9058d398a7
|
Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
|
2013-02-14 12:54:36 -08:00 |
|
Jan-Christoph Borchardt
|
d1dcb282cb
|
fix multiselect bar offset on shared page, close #1339 finally
|
2013-02-14 17:40:08 +01:00 |
|
Thomas Mueller
|
6a250c877f
|
fixing javascript errors IE8 in personal settings
|
2013-02-14 16:10:52 +01:00 |
|
Bart Visscher
|
f4c9d4c067
|
Merge pull request #1682 from owncloud/fix-ie8-master
Fix ie8 master
|
2013-02-14 06:10:00 -08:00 |
|
Björn Schießle
|
ae172ce7de
|
improved description of the trash bin app
|
2013-02-14 13:01:02 +01:00 |
|
Björn Schießle
|
bd22e948ca
|
call 'Trash bin' 'Deleted files'
|
2013-02-14 12:32:14 +01:00 |
|
Thomas Mueller
|
a03d70209f
|
fixing undefined originalEvent
|
2013-02-14 12:19:50 +01:00 |
|
Jan-Christoph Borchardt
|
b8a6bca2d3
|
always show checkbox when selected, also in IE8, fix #1621
|
2013-02-14 10:40:23 +01:00 |
|
Bart Visscher
|
cd35d257bb
|
Fix NoSpaceAfterComma and SpaceBeforeComma
|
2013-02-14 08:36:26 +01:00 |
|
Bart Visscher
|
d3ef967993
|
Fix indentation style
|
2013-02-14 08:36:26 +01:00 |
|
Bart Visscher
|
5c4a804ddb
|
Fix SpaceBeforeOpenBrace errors
|
2013-02-14 08:36:26 +01:00 |
|
Jenkins for ownCloud
|
bfe6334cd9
|
[tx-robot] updated from transifex
|
2013-02-14 00:06:51 +01:00 |
|
Thomas Müller
|
e1e77fe3be
|
Merge pull request #1598 from owncloud/fixing-1424-master
Fixing 1424 master
|
2013-02-13 12:59:30 -08:00 |
|
Arthur Schiwon
|
1e45453da2
|
LDAP: format dn before using it, not other way round. fixes #1605
|
2013-02-13 14:49:18 +01:00 |
|
Thomas Mueller
|
bc43dd704f
|
Merge branch 'master' into fixing-1424-master
Conflicts:
settings/js/users.js
|
2013-02-13 01:18:01 +01:00 |
|
Jenkins for ownCloud
|
68fa0b7dcc
|
[tx-robot] updated from transifex
|
2013-02-13 00:05:40 +01:00 |
|