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

6586 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bart Visscher
b483f2aab8 Merge branch 'master' into routing 
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
 2012-08-30 21:49:28 +02:00
Bart Visscher
598815b21e More info about not compatible apps (app id) 2012-08-29 22:38:06 +02:00
Bart Visscher
c958d5ba80 Fix filesystem setup for shared public link with logged in user 2012-08-29 21:35:55 +02:00
Michael Gapczynski
301baf0215 $storage shouldn't be static in OC_Cache_File 2012-08-29 14:42:40 -04:00
Michael Gapczynski
8d490b9880 Fix shared storage working with user backend defined data directories 2012-08-29 14:39:13 -04:00
Michael Gapczynski
3828d86191 Remove old Javascript code 2012-08-29 14:37:36 -04:00
Bart Visscher
db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher
9e32e07306 Fix OC_Cache_File 2012-08-29 20:29:43 +02:00
Bart Visscher
0365f8fd01 Remove php close at end of file 2012-08-29 20:29:43 +02:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Bart Visscher
52f2e7112e Whitespace fixes in lib 2012-08-29 20:28:45 +02:00
Bart Visscher
cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing 
Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js
 2012-08-29 20:16:39 +02:00
Michael Gapczynski
76bc4753e9 Fix displaying if a link is password protected 2012-08-29 14:06:55 -04:00
Michael Gapczynski
0788c6e968 Hide link password controls if link is removed 2012-08-29 14:06:55 -04:00
Michael Gapczynski
26501a0bc8 Delete old link if user sets a password 2012-08-29 14:06:55 -04:00
Arthur Schiwon
224e55e590 LDAP: fix debug message with undefined variable 2012-08-29 19:37:18 +02:00
Arthur Schiwon
741a21292e LDAP: fix potential infinite loop introduced with 4c4aa92eef, as side effect optimize groupExists-method. 2012-08-29 19:37:18 +02:00
Arthur Schiwon
8be8f6fff2 LDAP: Remove unnecessary debug output, fixes a Notice 2012-08-29 19:37:18 +02:00
Michael Gapczynski
e5cbc532c3 Fix password authentication for links and fix template problems for links by creating a new base layout 2012-08-29 11:54:49 -04:00
Michael Gapczynski
9fcb916057 Fix toggling of password protection in sharing dropdown 2012-08-29 11:54:49 -04:00
Jenkins for ownCloud
9338d093f9 [tx-robot] updated from transifex 2012-08-29 02:06:48 +02:00
Robin Appelman
92c782c1b0 return the jQuery deferred object when using OC.loadScript 2012-08-29 01:57:59 +02:00
Thomas Mueller
d786194ddc fixing: apps/files/ajax/scan.php 2012-08-29 01:39:42 +02:00
Thomas Mueller
b64229a89e apply coding style 2012-08-29 01:39:42 +02:00
Arthur Schiwon
4c4aa92eef LDAP: check for existing username from other backends when creating one for an LDAP user or group. Led also to some code cleanup. Fixes oc-1551 in master. 2012-08-29 01:23:51 +02:00
Thomas Mueller
fe49cbafc7 apply coding style 2012-08-29 00:50:12 +02:00
Thomas Mueller
f301bfd8c9 apply coding style 2012-08-29 00:36:27 +02:00
Thomas Mueller
6d0737de22 removing obsolete .tx 2012-08-28 23:27:00 +02:00
Bart Visscher
32721e7b07 Remember storage view in OC_Cache_File 2012-08-28 23:10:32 +02:00
Bart Visscher
53e51fe46b Clean user cache on login 2012-08-28 23:07:28 +02:00
Bart Visscher
8a02a8852f Add background job for global file cache cleanup 2012-08-28 23:07:28 +02:00
Michael Gapczynski
95cd48dea8 Fix sharing test case 2012-08-28 14:00:46 -04:00
Michael Gapczynski
9ca6290317 Remove unused settings log file 2012-08-28 13:46:16 -04:00
Michael Gapczynski
ff076caeee Check usernames in the database as case insensitive, they are still stored case sensitive. Bug fix for oc-422 and oc-1514 2012-08-28 11:28:38 -04:00
Michael Gapczynski
e05db00468 404 if service is not set for public.php 2012-08-28 11:13:02 -04:00
Michael Gapczynski
da44e5405a Fix typo 2012-08-28 11:12:18 -04:00
Michael Gapczynski
4ac7c414c4 Check if path info is empty for remote.php, prevent error 2012-08-28 11:08:24 -04:00
Michael Gapczynski
c53310e49b Remove unnecessary ajax file from files_sharing 2012-08-28 09:57:09 -04:00
Michael Gapczynski
1e2ba8398d Remove old database xml file for files_sharing, bump version number 2012-08-28 09:55:24 -04:00
Michael Gapczynski
0a1f24142a Change public file from get.php to public.php 2012-08-28 09:53:31 -04:00
Michael Gapczynski
fd2ca21fc2 Allow share_with column to be null for links 2012-08-28 09:51:00 -04:00
Arthur Schiwon
42a9969304 LDAP: implement getHome() function, use either username (default) or specify an LDAP attribute value to use 2012-08-28 14:24:50 +02:00
Frank Karlitschek
549f69cbc1 marked as shipped app 2012-08-28 07:35:31 +02:00
Frank Karlitschek
70b71338cd beta 1 2012-08-28 07:22:31 +02:00
Michael Gapczynski
aad7dc8390 Remove sharing notice in users settings - The default is now share with anyone, groups only sharing is now a setting in the admin page 2012-08-27 20:55:11 -04:00
Michael Gapczynski
42a291286b Fix incorrect Javascript for changing Share API settings 2012-08-27 20:45:36 -04:00
Michael Gapczynski
9cd55508c3 Add Share API settings to admin page 2012-08-27 20:39:31 -04:00
Michael Gapczynski
2aac6f02a0 Reimplement links support for sharing and add password protection option 2012-08-27 20:37:38 -04:00
Michael Gapczynski
0ad16e84c5 Fix share collection query 2012-08-27 20:37:38 -04:00
Michael Gapczynski
0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00