Frank Karlitschek
|
33c62bf110
|
Merge pull request #2090 from owncloud/fixing-2089-master
fixes #2089
|
2013-03-04 13:17:35 -08:00 |
|
Jan-Christoph Borchardt
|
07dee24cb2
|
explicitly add empty placeholder to inputs which use infield labels, fix #2049
|
2013-03-04 22:11:57 +01:00 |
|
Bernhard Posselt
|
10b108ed8a
|
Merge pull request #2030 from j-ed/master
suppress log messages like `include path for class ... starts with "apps/"`
|
2013-03-04 12:59:39 -08:00 |
|
Bernhard Posselt
|
62dde34887
|
Merge pull request #2088 from owncloud/fixing-1844-again-master
adding test case for getDefaultEmailAddress() + fixing #1844 again
|
2013-03-04 12:52:35 -08:00 |
|
Thomas Mueller
|
a118906f26
|
fixes #2089
|
2013-03-04 21:45:21 +01:00 |
|
Thomas Mueller
|
6019cdd5bd
|
adding test case for getDefaultEmailAddress() + fixing #1844 again
|
2013-03-04 21:10:18 +01:00 |
|
Thomas Müller
|
5c061561c5
|
Merge pull request #2078 from owncloud/save_category_relations
VCategories: Don't forget to save category relations if category exists.
|
2013-03-04 12:04:16 -08:00 |
|
Lukas Reschke
|
cf6db7a7cd
|
Merge pull request #2085 from owncloud/csp_shitty-browsers
Only send the standard headers
|
2013-03-04 12:03:00 -08:00 |
|
Lukas Reschke
|
a97006144e
|
Only send the standard headers
Fixes https://github.com/owncloud/apps/issues/675
|
2013-03-04 20:35:58 +01:00 |
|
Bernhard Posselt
|
ee00ddeb60
|
Merge pull request #2084 from owncloud/fix-group-displaynames
Fix #2074 by initializing as an array
|
2013-03-04 11:12:34 -08:00 |
|
Michael Gapczynski
|
8b09402b77
|
Fix #2074 by initializing as an array
|
2013-03-04 12:08:41 -05:00 |
|
Bernhard Posselt
|
8c64484c5e
|
Merge pull request #2082 from owncloud/fix-permissions-class
Change remove() $user parameter to optional
|
2013-03-04 09:03:09 -08:00 |
|
Bernhard Posselt
|
b3df526ef2
|
Merge pull request #2079 from owncloud/fix_expire_function
fix expire function
|
2013-03-04 09:01:58 -08:00 |
|
Bernhard Posselt
|
8c8423e766
|
Merge pull request #2076 from owncloud/filestable-specificity
fix files table CSS specificity issue causing multiselect bar overlap
|
2013-03-04 09:00:05 -08:00 |
|
Michael Gapczynski
|
ec2a9169b9
|
Change remove() $user parameter to optional
|
2013-03-04 11:44:09 -05:00 |
|
Björn Schießle
|
70014d37dc
|
fix expire function
|
2013-03-04 17:20:14 +01:00 |
|
Thomas Tanghus
|
c08a04bc83
|
VCategories: Don't forget to save category relations if category exists.
|
2013-03-04 17:05:08 +01:00 |
|
raghunayyar
|
d9c11a93c6
|
Corrects Files Layout in Trashbin
|
2013-03-04 21:34:50 +05:30 |
|
Thomas Tanghus
|
e9f46a7452
|
Remove inline js from OC.Dialogs.FilePicker.
|
2013-03-04 16:36:49 +01:00 |
|
Jan-Christoph Borchardt
|
afe7ea8ca2
|
fix files table CSS specificity issue causing multiselect bar overlap, fix #2075
|
2013-03-04 16:10:11 +01:00 |
|
j-ed
|
f96eef926e
|
Update app.php
replaced fixed path to app folder to support multiple apps pathes.
|
2013-03-02 12:33:38 +01:00 |
|
j-ed
|
20a45d547a
|
Update app.php
suppress log messages like `include path for class \"OCA\\Files_Versions\\Storage\" starts with \"apps\/\"`.
|
2013-03-02 12:26:13 +01:00 |
|
j-ed
|
4c03c3a31d
|
Update app.php
suppress log messages like `include path for class \"OCA\\Files_Trashbin\\Hooks\" starts with \"apps\/\"`.
|
2013-03-02 12:24:12 +01:00 |
|
j-ed
|
5352f1e65b
|
Update app.php
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
|
2013-03-02 12:18:28 +01:00 |
|
j-ed
|
d3e0a41dad
|
Update app.php
suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"`
|
2013-03-02 12:14:52 +01:00 |
|
j-ed
|
2aaf38b5d3
|
Update app.php
suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
|
2013-03-02 12:12:33 +01:00 |
|
Lukas Reschke
|
630483c75d
|
Fix notice
|
2013-03-02 00:53:53 +01:00 |
|
Jenkins for ownCloud
|
c9d9c381ec
|
[tx-robot] updated from transifex
|
2013-03-02 00:05:42 +01:00 |
|
Lukas Reschke
|
50460d9032
|
Remove uneeded \ since we're using "
|
2013-03-02 00:04:44 +01:00 |
|
Bart Visscher
|
f21ecef0b4
|
Merge pull request #2019 from owncloud/fixing-languages-again-master
some more new languages recently introduced to ownCloud
|
2013-03-01 14:55:27 -08:00 |
|
Lukas Reschke
|
fadb11253b
|
Merge branch 'master' into fixing-bugtracker-link-master
Conflicts:
core/templates/exception.php
settings/templates/help.php
|
2013-03-01 23:41:23 +01:00 |
|
Thomas Mueller
|
f9b454dab1
|
change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md
|
2013-03-01 23:32:43 +01:00 |
|
Lukas Reschke
|
8e5bbace71
|
Merge pull request #1976 from owncloud/from-insane-autoescape-to-p
Replace insane auto sanitization with p()
|
2013-03-01 14:31:06 -08:00 |
|
Thomas Mueller
|
6708dd80cd
|
some more new languages recently introduced to ownCloud
|
2013-03-01 23:28:54 +01:00 |
|
Lukas Reschke
|
73c84e4a0f
|
Merge master
|
2013-03-01 23:11:26 +01:00 |
|
Lukas Reschke
|
5e7970f761
|
Merge master
|
2013-03-01 23:11:03 +01:00 |
|
Thomas Mueller
|
4b9863fa7d
|
Merge branch 'master' into from-insane-autoescape-to-p
Conflicts:
apps/files/templates/index.php
|
2013-03-01 23:09:20 +01:00 |
|
Lukas Reschke
|
31754a653b
|
Merge pull request #2016 from owncloud/fixing-1844-master
validate the generated email address and fall back to localhost.localdom...
|
2013-03-01 14:00:30 -08:00 |
|
Thomas Mueller
|
6c304fa5c0
|
validate the generated email address and fall back to localhost.localdomain in case it is not valid
fixes #1844
|
2013-03-01 22:24:19 +01:00 |
|
Bernhard Posselt
|
5036e316a6
|
Merge pull request #2015 from owncloud/fixing-2001-master
in case the user has no permissions to upload/create files...
|
2013-03-01 12:52:36 -08:00 |
|
Thomas Mueller
|
e3e4c28316
|
fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed
|
2013-03-01 21:43:34 +01:00 |
|
Bernhard Posselt
|
7f7f447ab0
|
Merge pull request #2014 from owncloud/fixing-1909-master
for this self test we don't care if the ssl certificate is self signed a...
|
2013-03-01 12:42:52 -08:00 |
|
Thomas Mueller
|
39b9ed50d7
|
for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
|
2013-03-01 20:34:16 +01:00 |
|
Bernhard Posselt
|
2e2cf28d30
|
Merge pull request #2005 from owncloud/trash_add_signals
add post_moveToTrash and post_restore signals to the trash bin
|
2013-03-01 09:41:07 -08:00 |
|
Bernhard Posselt
|
87c8fff2d2
|
Merge pull request #2007 from owncloud/fix_1834_master
make sure that the version app always works on the users real home folder [master]
|
2013-03-01 09:40:37 -08:00 |
|
Georg Ehrke
|
ff9476b3e3
|
fix oc#47
|
2013-03-01 18:30:25 +01:00 |
|
Frank Karlitschek
|
f7cb53b103
|
Merge pull request #2008 from owncloud/1999-requesttoken
Check if requesttoken exists in session
|
2013-03-01 06:12:09 -08:00 |
|
Lukas Reschke
|
93f15215c6
|
Check if requesttoken exists in session
Ref #1999
|
2013-03-01 14:59:51 +01:00 |
|
Lukas Reschke
|
630becb95f
|
Style fixes
|
2013-03-01 14:59:24 +01:00 |
|
Björn Schießle
|
a01540a300
|
fix getVersions() call for the history view
|
2013-03-01 13:55:10 +01:00 |
|