Thomas Müller
|
d3e610f589
|
Merge pull request #4225 from owncloud/better-404
More verbose 404, closes #3225
|
2013-07-30 13:20:28 -07:00 |
|
Victor Dubiniuk
|
15e9e95817
|
Use default cursor for list items
|
2013-07-30 20:58:21 +03:00 |
|
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
|
Victor Dubiniuk
|
a10a17f818
|
Rewording
|
2013-07-29 18:25:17 +03:00 |
|
Victor Dubiniuk
|
dec7b2fa40
|
Move styles from core to app
|
2013-07-29 17:36:59 +03:00 |
|
Victor Dubiniuk
|
97f2c393c1
|
Allow apps to have own 404 content, closes #3225
|
2013-07-29 16:54:19 +03:00 |
|
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 -04:00 |
|
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 -04:00 |
|
Björn Schießle
|
75fd6d4fde
|
initialize OC_Defaults in template constructorX
|
2013-07-24 11:51:21 +02:00 |
|
Thomas Müller
|
1a73e607bd
|
Merge branch 'master' into more-themable-strings
Conflicts:
lib/template.php
|
2013-07-24 09:35:33 +02:00 |
|
Thomas Müller
|
934f2e94a3
|
Merge branch 'master' into disable-anon-upload-master
|
2013-07-22 11:36:52 +02:00 |
|
Jenkins for ownCloud
|
01f3f8e0cc
|
[tx-robot] updated from transifex
|
2013-07-22 02:03:23 -04:00 |
|
Jenkins for ownCloud
|
ae82f7fd17
|
[tx-robot] updated from transifex
|
2013-07-19 02:03:14 -04:00 |
|
Andreas Fischer
|
2c38c2a70e
|
Merge pull request #3947 from runky/patch-1
* runky/patch-1:
Update authenticate.php
|
2013-07-19 02:19:14 +02:00 |
|
Jenkins for ownCloud
|
279a71acb3
|
[tx-robot] updated from transifex
|
2013-07-18 02:02:51 -04:00 |
|
Jenkins for ownCloud
|
a8acbfdf7b
|
[tx-robot] updated from transifex
|
2013-07-16 02:06:21 -04:00 |
|
Thomas Müller
|
79d23463f8
|
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
|
2013-07-14 21:58:08 +02:00 |
|
Thomas Müller
|
c3e16a7388
|
fixing Undefined index: publicUploadEnabled
|
2013-07-12 17:51:01 +02:00 |
|
Jenkins for ownCloud
|
3fbf7ab189
|
[tx-robot] updated from transifex
|
2013-07-12 02:12:25 +02:00 |
|
Jan-Christoph Borchardt
|
aacca494c5
|
introduce shortname themable string and split from title, use for image alt text
|
2013-07-11 16:38:07 +02:00 |
|
Jenkins for ownCloud
|
f74659f3f6
|
[tx-robot] updated from transifex
|
2013-07-11 02:26:22 +02:00 |
|
Jenkins for ownCloud
|
439cad07b5
|
[tx-robot] updated from transifex
|
2013-07-09 02:12:22 +02:00 |
|
Thomas Müller
|
0365d244e0
|
Merge pull request #3946 from owncloud/fixing-3942-master
handle anonymous upload to reshared folder
|
2013-07-08 02:27:21 -07:00 |
|
Jenkins for ownCloud
|
3cb4a72960
|
[tx-robot] updated from transifex
|
2013-07-08 02:09:41 +02:00 |
|
Jenkins for ownCloud
|
096d7674fc
|
[tx-robot] updated from transifex
|
2013-07-07 02:06:06 +02:00 |
|
Jenkins for ownCloud
|
c8ad3df1fa
|
[tx-robot] updated from transifex
|
2013-07-06 02:08:38 +02:00 |
|
Thomas Müller
|
c956a08d22
|
fixing check if public share is a folder or not
|
2013-07-06 00:12:29 +02:00 |
|
Thomas Müller
|
dad91c156f
|
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
|
2013-07-06 00:02:11 +02:00 |
|
Thomas Müller
|
d14c5a3fa7
|
Merge pull request #3958 from owncloud/fixing-3933-master
adding tipsy to the upload button showing the max upload and restoring c...
|
2013-07-05 08:45:12 -07:00 |
|
Thomas Müller
|
e159cbf527
|
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
|
2013-07-05 17:39:41 +02:00 |
|
Thomas Müller
|
0c2ebb984e
|
adding tipsy to the upload button showing the max upload and restoring client side upload size validation
|
2013-07-05 15:07:05 +02:00 |
|
Thomas Müller
|
13991be5ce
|
no anonymous upload on files only folders
|
2013-07-05 10:53:59 +02:00 |
|
runky
|
6c868a9b5c
|
Update authenticate.php
Fix 'Undefined index: wrongpw' error
|
2013-07-05 10:37:24 +02:00 |
|
Morris Jobke
|
47058b1904
|
Merge pull request #3932 from owncloud/fix_label_position
fix position of 'user shared the folder foldername with you' label
|
2013-07-04 11:03:42 -07:00 |
|
Kondou
|
63c83ff50b
|
Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw
Add a "Wrong password." message, if the password for the public share was wrong.
|
2013-07-04 03:12:51 -07:00 |
|
Georg Ehrke
|
8d59893e90
|
fix position of 'user shared the folder foldername with you' label
|
2013-07-04 10:32:26 +02:00 |
|
Björn Schießle
|
6cfa016c39
|
add public api
|
2013-07-04 10:11:55 +02:00 |
|
Björn Schießle
|
3c691c9ec9
|
move to non-static OC_Defaults
Conflicts:
lib/mail.php
|
2013-07-04 10:11:16 +02:00 |
|
Björn Schießle
|
d46e62886a
|
Add init funtion to OC_Defaults to be able to wrap translatable strings
|
2013-07-04 10:09:28 +02:00 |
|
Jenkins for ownCloud
|
51cfacd789
|
[tx-robot] updated from transifex
|
2013-07-04 09:33:58 +02:00 |
|
kondou
|
65bcedfbbe
|
Use better wording.
|
2013-07-03 20:13:10 +02:00 |
|
kondou
|
2c4a9e0776
|
Add a "Wrong password." message, if the password
for the public share was wrong.
Fix #2725
|
2013-07-02 03:16:42 +02:00 |
|
Björn Schießle
|
d97d00fe0f
|
add logo claim to defaults.php
|
2013-07-01 10:48:13 +02:00 |
|
Björn Schießle
|
aead759f47
|
logo claim added
|
2013-07-01 10:48:02 +02:00 |
|
Björn Schießle
|
23cc69b816
|
construct the foother in defaults.php so that we use always the same footer
Conflicts:
settings/templates/admin.php
|
2013-07-01 10:46:00 +02:00 |
|
Jenkins for ownCloud
|
4d74e8955f
|
[tx-robot] updated from transifex
|
2013-06-30 02:13:07 +02:00 |
|
Thomas Mueller
|
f726de3cab
|
for now we disable public upload in case encryption is enabled
|
2013-06-28 16:49:25 +02:00 |
|
Roman Geber
|
da0caadf4e
|
Added file-upload to GIT repo
Optimized CSS identifiers
|
2013-06-26 22:51:38 +02:00 |
|
Roman Geber
|
ddb0ff346d
|
Public upload feature
|
2013-06-25 12:24:14 +02:00 |
|
Jenkins for ownCloud
|
6c534c8165
|
[tx-robot] updated from transifex
|
2013-06-14 02:52:34 +02:00 |
|