wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10589 commits 157 branches 562 tags 714 MiB
Commit graph

10589 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bernhard Posselt
b316ae2610 Merge pull request #2651 from owncloud/print_unescaped-u 
Unescape the update hint
 2013-04-02 14:19:30 -07:00
Arthur Schiwon
e25c1f3130 port 22c8194cc8 2013-04-02 21:03:13 +02:00
Lukas Reschke
8000f9db74 Unescape the update hint 
Fixes #2647
 2013-04-02 16:39:21 +03:00
Jan-Christoph Borchardt
48afa39292 Merge pull request #2275 from owncloud/app-styles 
CSS styles for applications to make a tree like layout easier
 2013-04-02 04:24:06 -07:00
Arthur Schiwon
fe5c00a173 Key must use less then 767 bytes long 2013-04-02 12:06:40 +02:00
Jan-Christoph Borchardt
c94580ba29 revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal 2013-04-02 11:52:57 +02:00
Jenkins for ownCloud
29d33ff7c2 [tx-robot] updated from transifex 2013-04-02 00:04:27 +02:00
Jenkins for ownCloud
9e29d2845a [tx-robot] updated from transifex 2013-04-01 00:04:02 +02:00
Jan-Christoph Borchardt
f8e48955b9 Merge pull request #2576 from owncloud/fixing-2125-master 
fixes #2125 - the warning is now displayed with a disabled button
 2013-03-31 09:53:07 -07:00
Bernhard Posselt
0b39a143e5 Merge pull request #2620 from eMerzh/add_query_logs 
Log DB Queries
 2013-03-30 18:58:23 -07:00
Bernhard Posselt
ab40634f33 Merge pull request #2622 from Kondou-ger/add_missing_backticks 
Add (two) missing backticks.
 2013-03-30 18:53:22 -07:00
Jenkins for ownCloud
cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
root
7f74f08808 Add missing backticks. 
Especially at user without "" PostgreSQL likes to fail.
 2013-03-30 23:52:26 +01:00
Brice Maron
63804f4153 Change logQuery from define() to OC::Config 2013-03-30 22:36:55 +01:00
Brice Maron
2b8cf4959a Log Queries when we add a log query flag 2013-03-30 17:40:46 +01:00
Jenkins for ownCloud
5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Bernhard Posselt
86ac30c596 Merge pull request #2516 from kabum/master 
share autocomplete - improve group appearance - issue #173
 2013-03-29 07:28:09 -07:00
Bernhard Posselt
66d7cc4c74 Merge pull request #2584 from mrtorrent/fix_instanceid_format 
Fix instanceid format to prevent session loop
 2013-03-29 07:26:07 -07:00
Bernhard Posselt
8ed9be5408 Merge pull request #2597 from kabum/lesslog 
Make it possible to show less log entries again
 2013-03-29 07:22:43 -07:00
Bernhard Posselt
7c0999bd27 Merge pull request #2448 from owncloud/userlist_available_groups 
User list: Keep array of available groups. Should fix #873
 2013-03-29 07:19:09 -07:00
Bart Visscher
ec980a8a25 Merge pull request #2585 from mrtorrent/fix_install_app_version_check 
Fix install app version check
 2013-03-29 05:38:58 -07:00
Jörn Friedrich Dreyer
df31ee5a90 Merge pull request #2575 from owncloud/fixing-1461-master 
Fix upload progressbar in IE8 and IE9
 2013-03-28 10:01:39 -07:00
Morris Jobke
866ca51d83 fix typo and remove animation 2013-03-28 16:11:46 +01:00
Morris Jobke
f19fd30278 convert js call to css rule 2013-03-28 15:43:14 +01:00
Morris Jobke
df74c0e43a apply code review hints 2013-03-28 15:02:31 +01:00
Jenkins for ownCloud
7098bcd4b7 [tx-robot] updated from transifex 2013-03-28 00:03:44 +01:00
Arthur Schiwon
c51396551d Whitespaces 2013-03-27 22:55:17 +01:00
Arthur Schiwon
3af61a0a7c Share Dialog: show Displayname instead of internal name 2013-03-27 22:55:05 +01:00
Arthur Schiwon
78c694b6ee Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy 2013-03-27 19:20:08 +01:00
Arthur Schiwon
3d29a82150 Cache: Do not overwrite ETag when file did not change 2013-03-27 19:19:40 +01:00
Arthur Schiwon
2a2d409733 Only prepare an SQL statement once. 2013-03-27 19:19:16 +01:00
Arthur Schiwon
1d676fb0e6 Add PHPDoc 2013-03-27 19:18:58 +01:00
Arthur Schiwon
d9e07ca60a Adjust to Icewind's fix 2013-03-27 19:18:34 +01:00
Robin Appelman
1a874b9106 Cache: fix property path for getting legacy etag 2013-03-27 19:18:13 +01:00
Robin Appelman
19c7d9c3dc Port Icewind's fix I 2013-03-27 19:17:49 +01:00
Arthur Schiwon
588e1547cf Port OC_Property Table Index 2013-03-27 19:17:20 +01:00
Arthur Schiwon
5fc276602a Change LIMIT in DB query respectively remove where not necessary 2013-03-27 19:13:14 +01:00
Arthur Schiwon
18554059a4 Remove Debug output 2013-03-27 19:12:53 +01:00
Arthur Schiwon
e2afd0cb42 Upgrade FileCache on ownCloud upgrade for all users with files 2013-03-27 19:12:28 +01:00
Arthur Schiwon
9d25058905 Performance: prepare queries only once 2013-03-27 19:12:04 +01:00
Arthur Schiwon
7839ec5093 Fix lost ETag on Cache Upgrade 2013-03-27 19:11:35 +01:00
Arthur Schiwon
599778b153 Files External: show display names instead of internal user names in Settings UI 2013-03-27 19:07:33 +01:00
blizzz
e83f428c34 Merge pull request #2598 from ceri/master 
Use displayName in the From field of outbound email about new shares.
 2013-03-27 10:57:35 -07:00
Arthur Schiwon
942cdff240 Users: use DisplayName in the Display Name col when appending users 2013-03-27 18:52:15 +01:00
Jan-Christoph Borchardt
994a8797e4 remove extra type selector qualification for ID and class names 2013-03-27 17:39:09 +01:00
Jan-Christoph Borchardt
0b1dc7b0cc also use SVG for settings cog 2013-03-27 17:33:25 +01:00
Jan-Christoph Borchardt
5aa1ca5882 use SVG for folder image 2013-03-27 17:32:37 +01:00
Jan-Christoph Borchardt
bcf1b6f9f8 soften highlight for navigation entries 2013-03-27 17:11:40 +01:00
Morris Jobke
7c8a0a486b add copyright note 2013-03-27 16:53:51 +01:00
Ceri Davies
fce15f8f61 Use displayName in the From field of outbound email about new shares. 
This is important in the Active Directory case where users are
currently getting a GUID in the From field, making emails look quite a
lot like spam.
 2013-03-27 15:43:56 +00:00