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

4952 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Tanghus
f6aa366857 Make sure there is a calendar after delete. 2012-06-15 02:10:55 +02:00
Thomas Tanghus
3c75ac5f62 Update calendar after delete. 2012-06-15 02:07:32 +02:00
Thomas Tanghus
ad8c4ab182 Only create new calendar when there are none. Fix oc-1007. 2012-06-15 01:55:02 +02:00
Thomas Tanghus
ad32c20300 Agree on argument type (cleaned this time). 2012-06-15 01:51:26 +02:00
Thomas Tanghus
6d43e6565e Revert "Agree on argument type." 
This reverts commit 0f6b1be0e6.
 2012-06-15 00:53:13 +02:00
Thomas Tanghus
0f6b1be0e6 Agree on argument type. 2012-06-15 00:50:42 +02:00
Thomas Tanghus
1e76a530ea No need to find calendar twice. 2012-06-15 00:28:12 +02:00
Thomas Tanghus
31db583f03 Make events show again. 2012-06-15 00:26:34 +02:00
Brice Maron
df83df5263 Correct sample config 2012-06-14 21:19:11 +00:00
Brice Maron
4753cc3ebd Merge branch 'master' into multi_app_dir 
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
 2012-06-14 21:16:59 +00:00
Thomas Tanghus
96a3e28c2e Cleanup code. 2012-06-14 23:05:31 +02:00
Thomas Tanghus
27ab6daeb0 If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier... 2012-06-14 23:05:31 +02:00
Brice Maron
6da5a2fdd4 Add possibility to choose the installation folder 2012-06-14 21:00:02 +00:00
Michael Gapczynski
f3b30e4658 Forgot $ sign for variable 2012-06-14 15:14:01 -04:00
Michael Gapczynski
f7e686d4f1 Revert "Fix a counting mistake" 
This reverts commit c20abfef38.
 2012-06-14 15:05:20 -04:00
Thomas Mueller
ec69377ade first load compatibility.js 2012-06-14 21:00:19 +02:00
Thomas Mueller
4cc9bf09be fix javascript error 2012-06-14 20:55:36 +02:00
Stephan Bergemann
4eb0c270aa fixed handling of fallback_images 2012-06-14 19:38:43 +02:00
Arthur Schiwon
12bfc551fb reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:31:38 +02:00
Michael Gapczynski
6e15b231b0 Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname() 2012-06-14 12:27:30 -04:00
Thomas Tanghus
47c03a0eff Contacts: Fixes for CSRF. 2012-06-14 18:13:01 +02:00
Thomas Tanghus
f0b87bc421 Make requesttoken global. 2012-06-14 18:13:01 +02:00
Stephan Bergemann
a3afd51b94 fixed one issue with last directory in structure having a lot of 
subdirectories and finally some pictures
 2012-06-14 18:02:07 +02:00
Bart Visscher
4510571aa1 Add app for logging access to shared files 2012-06-14 17:44:41 +02:00
Bjoern Schiessle
fa67927eb5 fixed bug #996: first picture in folder is repeated in the last position behaving like a directory 
Conflicts:
	apps/gallery/templates/index.php
 2012-06-14 17:08:52 +02:00
Bjoern Schiessle
6468e0a1d5 fixed bug #996: first picture in folder is repeated in the last position behaving like a directory 2012-06-14 15:14:36 +02:00
Bjoern Schiessle
d28a4f0638 prevent xss attacks also if some javascript ends up in the alt-tag 2012-06-14 14:17:30 +02:00
Bjoern Schiessle
87855f2506 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-14 13:44:42 +02:00
Bjoern Schiessle
211a546600 fixed xss vulnerability in un-packed version of jquery.fancybox and repack it 2012-06-14 13:41:39 +02:00
Thomas Tanghus
8fd9cbcc54 White-space fix. 2012-06-14 13:23:12 +02:00
Thomas Tanghus
a34db3fbe0 Don't add slash if it's there already. 2012-06-14 13:23:12 +02:00
Thomas Tanghus
756eb3548f Use the right csrf token. 2012-06-14 13:23:12 +02:00
Bjoern Schiessle
b0ecef02e9 debugging output removed 2012-06-14 13:17:06 +02:00
Bjoern Schiessle
e7b93b1807 xss vulnerability fixed for fancybox image viewer 2012-06-14 13:13:17 +02:00
Stephan Bergemann
bc6884b176 we don't neede the functions for empty stacks any more 2012-06-14 12:51:27 +02:00
Stephan Bergemann
b32afd1331 we don't have empty previewstacks any more - code cleaned up 2012-06-14 12:39:18 +02:00
Bjoern Schiessle
6c7e10245c suppress warning if /dev/urandom is not readable (bug #997) 2012-06-14 12:01:16 +02:00
Stephan Bergemann
56d2e99239 deleted some debugging output 2012-06-14 01:29:41 +02:00
Stephan Bergemann
22cd610a79 use images from deeper directories for preview if the actual directory doesn't contain any 2012-06-14 01:29:25 +02:00
Stephan Bergemann
9f59cc5eb0 improved look of directories not containing images directly 2012-06-14 01:29:17 +02:00
Stephan Bergemann
e99a95a756 now also working for directories only containing one image 2012-06-14 01:27:34 +02:00
Stephan Bergemann
4711c2bb41 fixed second_level_images issue 2012-06-14 01:27:26 +02:00
Stephan Bergemann
e4278574a8 fixed sorting errors and missbehaviours - now sorting like file browser 2012-06-14 01:27:01 +02:00
Georg Ehrke
e154806838 fix another ui bug of calendar 2012-06-13 22:20:43 +02:00
Georg Ehrke
2e44ffaf02 another ui fix 2012-06-13 22:14:40 +02:00
Georg Ehrke
b1139e977a fix a ui bug for calendar sharing 2012-06-13 22:12:54 +02:00
Georg Ehrke
6bd80d6457 show username of the body who shares in the summary 2012-06-13 22:07:23 +02:00
Georg Ehrke
7d29bee859 fix merge conflicts 2012-06-13 21:40:05 +02:00
Bart Visscher
12b34d2dda Whitespace fix 2012-06-13 21:39:12 +02:00
Bart Visscher
c98b56d2da CSSMin: Remove debug code 2012-06-13 21:39:12 +02:00