Lukas Reschke
|
047f1988c3
|
Merge branch 'master' into no-inline-js
|
2013-01-25 16:11:07 +01:00 |
Jenkins for ownCloud
|
6832dddf39
|
[tx-robot] updated from transifex
|
2013-01-25 00:05:56 +01:00 |
|
Thomas Mueller
|
ef88ceba8c
|
drop SimpleTest compatibility
|
2013-01-24 16:47:17 +01:00 |
|
Jenkins for ownCloud
|
3ff32eba25
|
[tx-robot] updated from transifex
|
2013-01-24 00:07:38 +01:00 |
|
Lukas Reschke
|
c8bbbb48d3
|
Merge master...
|
2013-01-23 11:30:40 +01:00 |
|
Thomas Mueller
|
5fadd53088
|
missing renames of publicListView to disableSharing
|
2013-01-23 09:18:26 +01:00 |
|
Jenkins for ownCloud
|
c986dbe573
|
[tx-robot] updated from transifex
|
2013-01-23 00:06:18 +01:00 |
Björn Schießle
|
367aadb3b7
|
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
|
2013-01-22 18:34:59 +01:00 |
Sam Tuke
|
aa648fca75
|
Merge branch 'master' into files_encryption
Conflicts:
apps/files_encryption/templates/settings.php
|
2013-01-22 17:31:05 +00:00 |
|
Sam Tuke
|
47592657d7
|
Added localisation for encryption settings
|
2013-01-22 17:15:03 +00:00 |
|
Sam Tuke
|
619780a67d
|
Merge branch 'master' into files_encryption
|
2013-01-22 16:50:20 +00:00 |
|
Lukas Reschke
|
bd5ff29716
|
Merge branch 'master' into no-inline-js
|
2013-01-22 11:50:33 +01:00 |
|
Lukas Reschke
|
8223117569
|
Remove closing tag
|
2013-01-21 22:29:27 +01:00 |
|
Lukas Reschke
|
9bc8df3649
|
Move publicListView to external JS
|
2013-01-21 20:36:19 +01:00 |
|
Lukas Reschke
|
0d02caa684
|
No inline JS in apps
|
2013-01-21 20:34:28 +01:00 |
|
Jenkins for ownCloud
|
aede26d996
|
[tx-robot] updated from transifex
|
2013-01-21 00:05:34 +01:00 |
|
Jenkins for ownCloud
|
ebc0c4b85b
|
[tx-robot] updated from transifex
|
2013-01-20 00:06:40 +01:00 |
|
Lukas Reschke
|
53b95cb8fd
|
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
Remove uneeded file
|
2013-01-19 05:56:27 -08:00 |
Jan-Christoph Borchardt
|
ae244972cb
|
Merge pull request #1228 from owncloud/generating_zip_message
Make the ZIP download information friendlier
|
2013-01-19 04:33:39 -08:00 |
|
Lukas Reschke
|
02bd8dd45a
|
Change the second part of the notification
|
2013-01-19 13:12:27 +01:00 |
|
Jenkins for ownCloud
|
a17ca3a69a
|
[tx-robot] updated from transifex
|
2013-01-19 00:05:38 +01:00 |
|
Lukas Reschke
|
f447e6469f
|
Remove uneeded file
I don't saw any usage of this file through the code, I assume it can
safely be removed.
|
2013-01-18 23:07:11 +01:00 |
|
Thomas Müller
|
31cc9aa80d
|
Merge pull request #986 from owncloud/fixing-784-master
the maximum upload size is now part of the response of the upload and de...
|
2013-01-18 14:06:00 -08:00 |
|
Lukas Reschke
|
ad57db3e87
|
Make the message friendlier
|
2013-01-18 22:35:26 +01:00 |
|
Thomas Mueller
|
5ff29b4348
|
fixing indent
|
2013-01-18 20:09:03 +01:00 |
|
Jenkins for ownCloud
|
824fcf6624
|
[tx-robot] updated from transifex
|
2013-01-18 00:04:36 +01:00 |
|
Jenkins for ownCloud
|
433fa19268
|
[tx-robot] updated from transifex
|
2013-01-17 00:27:40 +01:00 |
Bart Visscher
|
5bfe4adbaa
|
Whitespace cleanup
|
2013-01-16 18:09:16 +01:00 |
|
Bart Visscher
|
a8f963d9cf
|
Spaces to tabs
|
2013-01-16 18:09:16 +01:00 |
Björn Schießle
|
2b9c925a2b
|
Merge pull request #1192 from schiesbn/versioning_history_issue_1189
fix for issue #1186, missing variables added
|
2013-01-16 01:26:43 -08:00 |
|
Björn Schießle
|
73c4d0faff
|
initialize $versionCreated
|
2013-01-16 10:20:09 +01:00 |
|
Jenkins for ownCloud
|
0398bfffca
|
[tx-robot] updated from transifex
|
2013-01-16 00:21:21 +01:00 |
|
Bart Visscher
|
0da06187f6
|
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
Fixing unused and undefined in master
|
2013-01-15 07:45:51 -08:00 |
|
Björn Schießle
|
60d5d5f636
|
fix for issue #1186, missing variables added
|
2013-01-15 14:34:15 +01:00 |
blizzz
|
bb9cc227c2
|
Merge pull request #1087 from owncloud/ldap_multiple_dns
LDAP: ability to configure more than one base DN
|
2013-01-15 04:01:57 -08:00 |
|
Jenkins for ownCloud
|
fdd667a83c
|
[tx-robot] updated from transifex
|
2013-01-15 00:05:10 +01:00 |
|
Thomas Mueller
|
388bb6a5e1
|
Merge branch 'master' into fixing-unused-and-undefined-in-master
|
2013-01-14 23:41:34 +01:00 |
|
Bart Visscher
|
7455056d2d
|
Merge pull request #1169 from owncloud/webdav_L10n
user_webdavauth - l10n - Trivial
|
2013-01-14 12:28:51 -08:00 |
|
Lukas Reschke
|
9eb16e06f7
|
Merge pull request #1135 from owncloud/allow_default_click_behaviour
allow default click behaviour
|
2013-01-14 11:24:02 -08:00 |
|
Thomas Müller
|
51a4240051
|
Merge pull request #1170 from owncloud/correctIndention
Remove ugly indentation - Trivial
|
2013-01-14 04:59:53 -08:00 |
|
Sam Tuke
|
3fbf362ba2
|
Removed debugging comments
|
2013-01-14 12:36:46 +00:00 |
|
Björn Schießle
|
cd802ed45b
|
Merge branch 'master' of github.com:owncloud/core
|
2013-01-14 10:33:17 +01:00 |
|
Björn Schießle
|
e0173303e6
|
merge conflict fixed, settings-personal.php is no longer needed
Conflicts:
apps/files_versions/templates/settings-personal.php
|
2013-01-14 10:24:40 +01:00 |
|
Jenkins for ownCloud
|
c29310aaef
|
[tx-robot] updated from transifex
|
2013-01-14 00:18:21 +01:00 |
|
Lukas Reschke
|
2a7e5faa37
|
Remove ugly indentation
|
2013-01-13 01:02:11 +01:00 |
|
Lukas Reschke
|
9cfc195b7c
|
The => This
Sounds better for me.
|
2013-01-13 00:45:45 +01:00 |
|
Lukas Reschke
|
90d0d08826
|
Improved the help text
|
2013-01-13 00:37:58 +01:00 |
|
Lukas Reschke
|
fb7f9e25c3
|
legend - l10n
|
2013-01-13 00:32:44 +01:00 |
|
Jenkins for ownCloud
|
981fd5e424
|
[tx-robot] updated from transifex
|
2013-01-13 00:08:40 +01:00 |
|
Jenkins for ownCloud
|
ad64ce189d
|
[tx-robot] updated from transifex
|
2013-01-12 00:10:58 +01:00 |