Commit Graph

29 Commits

Author SHA1 Message Date
Bjoern Schiessle 6abe8f9e2e fixed wrong function call 2012-06-06 10:40:22 +02:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Georg Ehrke d4072c82dd some fixes for contacts, gallery and openid 2012-05-19 15:22:21 +02:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Bart Visscher 9a66b869c0 Gallery: Use App storage instead of contructing our own path 2012-05-10 09:14:27 +02:00
Bart Visscher b022ccb863 Whitespace fixes 2012-05-10 09:14:26 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Georg Ehrke 69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Bartek Przybylski cbdcb68c2b gallery sharing, experimental version 2012-03-24 18:35:42 +01:00
Bartek Przybylski de09883d86 creating and retrive thumbnails for intermediate galleries 2012-03-17 23:41:10 +01:00
Bartek Przybylski f6075cc1fe gallery migration to events system 2012-03-11 16:49:42 +01:00
Bartek Przybylski 84d6c53970 filecache search comparition fix 2012-03-09 16:28:26 +01:00
Robin Appelman d8d2939668 dont use numRows and fix some of the gallary hooks 2012-03-07 17:31:01 +01:00
Bartek Przybylski 0a78849391 multilevel gallery 2012-03-04 18:28:41 +01:00
Bartek Przybylski cfc710e768 preferences store fix 2012-02-04 20:15:55 +01:00
Bartek Przybylski f1672d7d10 handling special chars in dirnames 2012-02-04 11:02:13 +01:00
Bartek Przybylski 5a106d1036 gallery: fix FS hooks 2012-02-04 10:30:32 +01:00
Bartek Przybylski 8df0650658 gallery settings, defining scan root and shor order 2012-02-03 21:38:44 +01:00
Robin Appelman 415e968612 fix renaming albums 2012-01-20 19:32:08 +01:00
Bartek Przybylski b44a7dc36a enhancement: oc-36 2012-01-17 20:12:26 +01:00
Bartek Przybylski 5ecc10b756 recursive gallery removing on parent dir remove 2012-01-15 12:15:22 +01:00
Bartek Przybylski e0dc8b8ab2 handle gallery remove when removing dir via webinterface 2012-01-14 15:01:57 +01:00
Bartek Przybylski 06388e1339 handling directory renaming and thumbnail move on gallery name chenge 2012-01-14 13:52:24 +01:00
Bartek Przybylski 21c4515465 rename fix, licence header added 2012-01-08 11:01:25 +01:00
Bartek Przybylski 9ed3c31fc9 automatic adding of photo to album, feedback for user while scanning, general cleanup 2012-01-08 00:14:34 +01:00
Bartek Przybylski 1383cb51e7 removing and renaming albums 2011-12-21 21:55:52 +01:00
Bart Visscher eeaf539a44 Gallery: splitout model code 2011-12-08 20:05:12 +01:00