Robin Appelman
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
Lukas Reschke
c9e25d3fab
Merge pull request #1320 from owncloud/implements-1316-master
...
lookup for OCA classes in all apps folders
2013-01-26 05:20:15 -08:00
Lukas Reschke
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
Lukas Reschke
6c882d9806
Remove outdated comments
2013-01-26 14:03:17 +01:00
Lukas Reschke
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Thomas Müller
3b547895ec
Merge pull request #1306 from owncloud/smart-app-banner
...
add smart app banner to promote ios app
2013-01-26 04:00:57 -08:00
Thomas Mueller
2cc77759aa
lookup for OCA classes in all apps folders
2013-01-26 12:45:50 +01:00
j-ed
93834b78a1
Update lib/mail.php
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-26 12:09:54 +01:00
j-ed
4d74738fe7
Update config/config.sample.php
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-26 12:04:06 +01:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
Lukas Reschke
a65410f23c
Remove the CSP header for Firefox
...
https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
2013-01-25 21:57:51 +01:00
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Lukas Reschke
7f49d35930
Move checkMaintenance and checkUpgrade
...
This is needed to ensure that the routing and linkTo() function for CSP
are available.
2013-01-25 19:15:02 +01:00
Lukas Reschke
0d6a577481
Warn users not to enable DEBUG in productive environments
...
The debug mode should not be enabled in productive environments and is also a security risk since some apps outputs unsanitized debug data to the template.
2013-01-25 18:14:37 +01:00
Björn Schießle
19024de988
typo fixed
2013-01-25 17:44:40 +01:00
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
Lukas Reschke
d21946fdce
Merge pull request #1258 from owncloud/no-inline-js
...
No inline JS - Work in progress
2013-01-25 08:20:26 -08:00
TheSFReader
2aead5727e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-25 17:15:02 +01:00
TheSFReader
9f5847b739
Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments
2013-01-25 17:02:44 +01:00
Lukas Reschke
d8c4e620af
Use black background images
2013-01-25 16:23:03 +01:00
raghunayyar
a86da16a10
More Style Fixes
...
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Lukas Reschke
688fe0baa8
Merge pull request #1307 from owncloud/js_linkToRemote
...
Add js linkToRemote and linkToRemoteBase
2013-01-25 07:10:35 -08:00
raghunayyar
aed204d420
Defined height for #leftcontent
2013-01-25 20:39:07 +05:30
Georg Ehrke
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
Thomas Tanghus
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
Lukas Reschke
ff4d62132a
This breaks the installation
...
@bartv2 This JS part is breaking the installation (POST parameters are
not transferred), could you please take a look? THX.
JS console says:
uncaught exception: cannot call methods on button prior to
initialization; attempted to call method 'disable'
2013-01-25 15:47:57 +01:00
Lukas Reschke
0d2a58bc5d
Initialize router also if ownCloud isn't installed
2013-01-25 14:57:52 +01:00
Lukas Reschke
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
Björn Schießle
e9a57e28fc
show display name instead of uid
2013-01-25 13:57:08 +01:00
Björn Schießle
839f4bd949
show display name instead of uid in the public shared files view
2013-01-25 13:01:53 +01:00
Björn Schießle
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
Björn Schießle
64e853394c
compare the correct uids
2013-01-25 12:46:32 +01:00
Björn Schießle
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
raghunayyar
f7a0ab7d4f
Style fixes on core/navigation Branch.
...
#rightcontent margin and button overlaps fixed.
2013-01-25 16:01:41 +05:30
Björn Schießle
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
Jenkins for ownCloud
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
Arthur Schiwon
3e99f12120
LDAP: make settings strings in JS translatable
2013-01-24 22:47:25 +01:00
Arthur Schiwon
2749a14171
LDAP: make it possible to enable/disable server configurations
2013-01-24 22:39:05 +01:00
Sam Tuke
094213e231
Fixed many coding guidelines issues
...
Continued work on upgrade path via login hook listener
New spec file with notes
2013-01-24 18:37:34 +00:00
Lukas Reschke
48e6ce7c56
Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master
...
drop SimpleTest compatibility
2013-01-24 08:06:39 -08:00
Thomas Mueller
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
Björn Schießle
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
Björn Schießle
dbb0d04073
restore file in the root folder if the origin folder is not writable
2013-01-24 15:29:22 +01:00
Arthur Schiwon
6bc7256966
LDAP: forgotten file for deleteConfig feature
2013-01-24 14:12:12 +01:00
Arthur Schiwon
5b9e181198
LDAP: implement deleteConfiguration feature
2013-01-24 14:11:53 +01:00
Björn Schießle
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
Arthur Schiwon
3bf38c7a84
LDAP: add missing new LDAP Helper
2013-01-24 13:01:43 +01:00
Arthur Schiwon
fccfdb2a52
LPAP: cleanup settings.php, it's already ajaxified
2013-01-24 13:01:20 +01:00