Georg Ehrke
40459c8c66
some work on repeating events caching - basic class should work now :)
2012-06-11 15:00:51 +02:00
Lukas Reschke
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
Thomas Tanghus
6d9947b3ff
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:55:54 +02:00
Lukas Reschke
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
Arthur Schiwon
0df67aeae9
ldap: check array for emptiness, not nullness
2012-06-11 12:26:48 +02:00
Georg Ehrke
f4c459782b
Merge branch 'master' into calendar_repeat
2012-06-11 10:59:19 +02:00
Georg Ehrke
ece1162949
use native sabredav functions to generate repeating events
2012-06-11 10:55:26 +02:00
Thomas Tanghus
e79e18d866
Copy/paste error.
2012-06-11 02:40:55 +02:00
Lukas Reschke
3f9b967be7
Sanitizing user input
2012-06-11 00:36:58 +02:00
Lukas Reschke
f8d2e21c66
Sanitize user input
2012-06-11 00:23:35 +02:00
Lukas Reschke
27d1c1bb94
Sanitize user input
2012-06-11 00:14:28 +02:00
Lukas Reschke
9f276729c2
Using POST instead of GET.
2012-06-10 23:38:26 +02:00
Lukas Reschke
380aab470f
Sanitzing user input
2012-06-10 23:16:59 +02:00
Michael Gapczynski
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
Thomas Tanghus
40f8419fdf
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:56:55 +02:00
Frank Karlitschek
bf4626da93
prevent XSS
2012-06-10 19:52:23 +02:00
Georg Ehrke
c6a03ec6d8
remove include command for when
2012-06-10 18:41:17 +02:00
Georg Ehrke
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
Bartek Przybylski
c11f6cc3f9
fix variable name and undefined index notice
2012-06-10 17:25:50 +02:00
Bartek Przybylski
76f20eb57c
fix first time image loading error
2012-06-10 13:05:00 +02:00
Thomas Tanghus
f90c8738ab
Contacts: Used non-existent var.
2012-06-10 12:48:39 +02:00
Bartek Przybylski
0838b4c225
gallery: removing search provider for now
2012-06-10 09:52:33 +02:00
Michiel de Jong
995f9c7348
sanitize scope and host
2012-06-09 21:08:24 +02:00
Michiel de Jong
322fd51261
avoid clickjacking
2012-06-09 21:08:24 +02:00
Michael Gapczynski
ab41b57f62
Add Dropbox storage backend
2012-06-09 15:02:48 -04:00
Michiel de Jong
b46903fa76
sanitize when logged in as another user
2012-06-09 20:39:24 +02:00
Robin Appelman
d065b2d29e
prevent opening non-music files through the media ajax api
2012-06-09 17:39:14 +02:00
Robin Appelman
601bac746d
use absolute path for file proxies
2012-06-09 17:34:13 +02:00
Georg Ehrke
e7f6f7e452
fix another XSS
2012-06-09 16:45:37 +02:00
Georg Ehrke
c9214afff8
fix XSS in Calendar
2012-06-09 16:35:35 +02:00
Georg Ehrke
2862740674
increase height of event dialog
2012-06-09 15:38:03 +02:00
Georg Ehrke
cfb9c764ca
fix creation of monthly repeated events
2012-06-09 15:15:00 +02:00
Bartek Przybylski
001293a702
removing app access check, fix title for links in tiles
2012-06-09 15:12:50 +02:00
Thomas Tanghus
081e1874cb
Contacts: Use POST instead of GET.
2012-06-09 15:00:44 +02:00
Thomas Tanghus
88341e5797
Code cleanup.
2012-06-09 15:00:44 +02:00
Georg Ehrke
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +02:00
Bart Visscher
4aee5a7ce4
Tasks: Use POST for ajax calls that change data
2012-06-09 14:39:41 +02:00
Georg Ehrke
c83f418a02
Merge branch 'master' into calendar_repeat
2012-06-09 12:30:39 +02:00
Georg Ehrke
a9b561430a
add hooks for events
2012-06-09 12:30:09 +02:00
Georg Ehrke
7ed30649bb
add hooks for calendars
2012-06-09 12:18:25 +02:00
Georg Ehrke
cac995ee9f
some more work on repeating events caching
2012-06-09 11:49:25 +02:00
Georg Ehrke
ac74d87e3e
some work on repeating events caching
2012-06-08 22:22:16 +02:00
Bartek Przybylski
201a40a1a3
tabs for spaces, fix array key name
2012-06-08 21:55:28 +02:00
Bartek Przybylski
0c7431e57d
hide share button until sharing wont be fixed
2012-06-08 21:44:33 +02:00
Bartek Przybylski
8bc22907b8
adding navigation bar to gallery
2012-06-08 21:44:33 +02:00
Bartek Przybylski
6b0a2ae60e
remove old code
2012-06-08 21:44:32 +02:00
Bartek Przybylski
71b04717ab
adding missing file
2012-06-08 21:44:31 +02:00
Bartek Przybylski
9e434dea60
tabs for spaces, removing thumbnail on file removal
2012-06-08 21:44:31 +02:00
Bart Visscher
ac36512102
Don't use substr to get first char of string
2012-06-08 21:38:10 +02:00
Thomas Tanghus
0a49bae87a
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
2012-06-08 20:39:54 +02:00
Georg Ehrke
e83e30a8a9
Merge branch 'master' into calendar_repeat
2012-06-08 19:54:42 +02:00
Michael Gapczynski
8fcdccdcdc
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
2012-06-08 13:48:38 -04:00
Michael Gapczynski
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
Arthur Schiwon
f70615106f
typo in var
2012-06-08 14:57:27 +02:00
Arthur Schiwon
4d3b7574f3
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:55:16 +02:00
Georg Ehrke
65cd15ca15
fix merge conflicts
2012-06-08 11:21:55 +02:00
Robin Appelman
4768510923
split share and root config for smb backend, also sanitize config a bit more
2012-06-08 01:29:55 +02:00
Bart Visscher
4afcae8d56
Gallery: Fix database creation on update, also only from version less then 0.5
2012-06-07 23:38:50 +02:00
Thomas Tanghus
d4f6f3e935
Contacts: Attempt to make file upload work in ICS Chrome.
2012-06-07 20:29:16 +02:00
Thomas Tanghus
33c802dcaa
Break text to fit in dialog.
2012-06-07 20:29:15 +02:00
Arthur Schiwon
c2f557f1dd
LDAP: cache the results, reduce LDAP searches
2012-06-07 18:55:32 +02:00
Arthur Schiwon
6626598435
ldap: enable the destructor
2012-06-07 18:13:41 +02:00
Bartek Przybylski
14e1be56a0
pictures: update script and removal some all stuff
2012-06-07 17:08:04 +02:00
Thomas Tanghus
d2a8746c49
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-06-07 16:44:54 +02:00
Arthur Schiwon
44880ab3fa
ldap: remove unused private functions
2012-06-07 13:39:42 +02:00
Arthur Schiwon
6894882ca9
ldap: correct query condition and determining of success
2012-06-07 13:39:42 +02:00
Arthur Schiwon
470cb17f90
ldap: check index carefully, can be 0
2012-06-07 13:39:42 +02:00
Thomas Tanghus
312536dbf9
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
2012-06-07 13:08:42 +02:00
Thomas Tanghus
e1f4978150
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:21:24 +02:00
Thomas Tanghus
3804f68ff5
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:55:40 +02:00
Thomas Tanghus
9c84149119
A bit of pixel-pushing.
2012-06-07 10:55:40 +02:00
Bartek Przybylski
8fd6cdf407
adding title when fancybox is displayed
2012-06-06 23:29:23 +02:00
Bartek Przybylski
5417d803c4
replace spaces with tabs, use const and linkTo instead of static path
2012-06-06 23:23:49 +02:00
Bartek Przybylski
a90089c792
hack for file download
2012-06-06 22:20:56 +02:00
Bartek Przybylski
7c88081acb
removing test image
2012-06-06 22:13:49 +02:00
Bartek Przybylski
aa0fc3c69a
aviod incorrect image size returning in gallery listing
2012-06-06 22:13:49 +02:00
Bartek Przybylski
671fe49809
use fancybox to display image preview
2012-06-06 22:13:49 +02:00
Bartek Przybylski
76e7e361ae
navigate on galleries
2012-06-06 22:13:49 +02:00
Bartek Przybylski
34a21a63ce
new db scheme
2012-06-06 22:13:49 +02:00
Bartek Przybylski
6d211155ab
git status
2012-06-06 22:13:48 +02:00
Bjoern Schiessle
c960e42a17
fixed var name, $filename should be $foldername
2012-06-06 18:08:51 +02:00
Thomas Tanghus
5c17338ac7
Contacts: Make js a tad DRYer. Added URL property.
2012-06-06 15:29:33 +02:00
Thomas Tanghus
ed950e3ba2
Correct mime type.
2012-06-06 15:29:33 +02:00
Arthur Schiwon
190fca1121
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
2012-06-06 12:29:48 +02:00
Thomas Tanghus
ca0108aabf
Corrected typos.
2012-06-06 11:50:49 +02:00
Bjoern Schiessle
6abe8f9e2e
fixed wrong function call
2012-06-06 10:40:22 +02:00
Georg Ehrke
2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
Thomas Tanghus
fce614b82c
Less aggressive caching on thumbnails too.
2012-06-06 01:06:13 +02:00
Thomas Tanghus
68670bcc66
Cleanup.
2012-06-06 01:06:13 +02:00
Thomas Tanghus
624f8ae36d
Also use OC_Cache here.
2012-06-06 01:06:13 +02:00
Thomas Tanghus
80de23d08b
Contacts: Removed temp dir cleanup after using OC_Cache.
2012-06-06 01:06:12 +02:00
Robin Appelman
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
Robin Appelman
a3c1f70be4
dont show config option for file upload size if we cant write the new value
2012-06-06 00:24:15 +02:00
Robin Appelman
e6c4e53486
prevent creating files with a / the name
2012-06-06 00:02:51 +02:00
Thomas Tanghus
20aee83d07
Use UID for cache key.
2012-06-05 21:20:10 +02:00
Thomas Tanghus
cb941996c0
Contacts: Use OC_Cache for contact photo handling instead of temp dir.
2012-06-05 20:34:12 +02:00
Bjoern Schiessle
0d1a07d4ae
show pictures in folder with special characters, e.g. '+'
2012-06-05 16:36:05 +02:00
Bjoern Schiessle
d71c4db10a
xss vulnerability fixed
2012-06-05 10:46:28 +02:00
Bjoern Schiessle
564b0358f9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 10:38:42 +02:00
Bjoern Schiessle
dcc5b5ca0a
xss vulnerability fixed
2012-06-05 10:37:22 +02:00
Thomas Tanghus
d194132b6f
Contacts: Cache standard photo less aggressively
2012-06-05 10:32:26 +02:00
Frank Karlitschek
7e931575b4
comment out non working code
2012-06-05 09:28:51 +02:00
Bart Visscher
64f6534f51
Tasks: styling fixes
2012-06-04 23:04:31 +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
Bart Visscher
091b343d5c
Calendar & Contacts: Store import progress in OC_Cache
...
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Bjoern Schiessle
f291a843bf
prevent xss attacks by manipulating image file names
2012-06-04 16:22:25 +02:00
Bjoern Schiessle
1d6ca084a6
prevent xss attacks by manipulating text file names
2012-06-04 16:20:03 +02:00
Thomas Tanghus
3b9bf83fe7
Contacts: Make tmp file cleaup a bit safer.
2012-06-04 13:38:37 +02:00
Arthur Schiwon
782d82730a
commited a bit too much before
2012-06-04 13:28:31 +02:00
Thomas Tanghus
2842088b75
Contacts: When editing photo on a newly created contact the name in the contact list was cleared.
2012-06-04 13:14:31 +02:00
Thomas Tanghus
855f404e5c
Contacts: Temporary files weren't deleted if crop window was closed without saving.
2012-06-04 13:14:31 +02:00
Arthur Schiwon
59bbf0acee
LDAP: link to documentation on settings page
2012-06-04 13:05:18 +02:00
Bjoern Schiessle
2d80c148ba
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 10:42:09 +02:00
Georg Ehrke
4d1428db0f
Merge branch 'master' into calendar_repeat
2012-06-03 19:17:05 +02:00
Arthur Schiwon
e58efd7877
LDAP group backend: Set configured true when it is... fixe oc-887
2012-06-01 16:02:38 +02:00
Arthur Schiwon
a4f177d75d
LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867
2012-06-01 13:49:11 +02:00
Georg Ehrke
46b3b30d46
add status
...
file for repeating events caching
2012-06-01 13:47:48 +02:00
Frank Karlitschek
a2b41a140e
correctly detect https
2012-06-01 11:46:18 +02:00
Georg Ehrke
e75146a811
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
Georg Ehrke
7a8e322679
some work for repeating events caching
2012-06-01 11:30:54 +02:00
Frank Karlitschek
83c6714c72
don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something
2012-06-01 11:12:50 +02:00
Frank Karlitschek
baae4c741d
fix the breadcrumb
2012-05-31 21:44:05 +02:00
Frank Karlitschek
5f4132d6ba
more fixes
2012-05-31 21:16:36 +02:00
Frank Karlitschek
57a56299d8
more fixes
...
i don´t understand why this worked before.
2012-05-31 21:10:03 +02:00
Frank Karlitschek
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
Georg Ehrke
f0bd571866
fix potential XSS
2012-05-31 20:01:12 +02:00
Arthur Schiwon
3db28d7616
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-05-31 19:46:51 +02:00
Sam Tuke
e93bb5135d
Applied fix from kalassico for "Chiper text must be a string" bug ( http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094 )
2012-05-31 12:25:07 +01:00
Arthur Schiwon
3b36a9b704
LDAP: make queries compatible also with PostgreSQL
2012-05-31 13:07:49 +02:00
Bart Visscher
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Bart Visscher
2ae58ee6c0
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
Bart Visscher
0934a975b2
Remove unused L10N variable
2012-05-31 13:01:30 +02:00
Georg Ehrke
c5cc70c0e3
Merge branch 'master' into calendar_repeat
2012-05-31 12:20:56 +02:00
Arthur Schiwon
8b4e16ec77
LDAP: fix wrong value for input type
2012-05-30 22:34:51 +02:00
Frank Karlitschek
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
Thomas Tanghus
dbcd26be68
Contacts: Rewrote import script.
2012-05-29 23:41:53 +02:00
Georg Ehrke
f1a48aec73
Merge branch 'master' into calendar_repeat
2012-05-29 19:47:48 +02:00
Georg Ehrke
29b17672b4
a bit of work for repeating events caching
2012-05-29 19:46:17 +02:00
Michael Gapczynski
d334f33eba
Initial support for Amazon S3 storage backend
...
Conflicts:
apps/files_external/tests/config.php
2012-05-29 12:19:29 -04:00
Thomas Tanghus
c9df18ed8c
Forgot a break.
2012-05-29 16:46:54 +02:00
Thomas Tanghus
51aa84e70a
Contacts: NOTE wasn't saved properly.
2012-05-29 16:43:59 +02:00
Thomas Tanghus
dff16e70a9
Contacts: Improve loading and cleanup of dialogs.
2012-05-29 16:43:59 +02:00
Georg Ehrke
29372677ae
add lib collection and lib scanner to media's appinfo/app.php
2012-05-29 13:36:51 +02:00
Georg Ehrke
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
Georg Ehrke
a56f2dbce7
Merge branch 'master' into calendar_repeat
2012-05-29 13:16:08 +02:00
Georg Ehrke
75afc09b9d
fix status
...
of timezone detection
2012-05-29 13:14:05 +02:00
Brice Maron
22cd0f1cda
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:41:39 +00:00
Thomas Tanghus
817f9ff57d
Contacts: Fix XSS.
2012-05-28 14:42:57 +02:00
Frank Karlitschek
1eebbaebdb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-28 13:59:47 +02:00
Frank Karlitschek
c79a529edd
remove not needed includes
2012-05-28 13:57:45 +02:00
Thomas Tanghus
df5bdc8e42
Contacts: Double check XSS, and fix a rookie error ;-)
2012-05-28 13:19:31 +02:00
Georg Ehrke
5e7b318e42
add urlencode for caldav link
2012-05-28 10:49:27 +02:00
Georg Ehrke
459114b994
Merge branch 'master' into calendar_repeat
2012-05-26 22:54:24 +02:00
Robin Appelman
143287738a
allow longer paths for gallery
2012-05-26 21:50:54 +02:00
Frank Karlitschek
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
Arthur Schiwon
d2369b6e96
LDAP: support for 'member' as group-member-association
2012-05-26 16:38:37 +02:00
Georg Ehrke
a1c9191006
fix share for users with a point within their name
2012-05-26 15:23:46 +02:00
Georg Ehrke
bc9accd26e
Merge branch 'master' into calendar_repeat
2012-05-25 10:30:00 +02:00
Brice Maron
9c2a6fb551
Add HEAD request management for files ajax/download.php
2012-05-24 22:48:10 +00:00
Brice Maron
5fa14806c8
Add translation for error message
2012-05-24 19:16:00 +00:00
Brice Maron
2c9311cf48
Add error message when uploading folder or null files. ref oc-739
2012-05-24 18:47:34 +00:00
Robin Appelman
a1539dace7
share code between smb and ftp filestorage backends
2012-05-24 19:41:32 +02:00
Brice Maron
f00a50c76a
Add pending line in file list before trying to upload. Correct indentation
2012-05-24 16:56:19 +00:00
Robin Appelman
2f40f11c87
smb filestorage backend
2012-05-24 18:23:59 +02:00
Michael Gapczynski
bee724c53e
Initial work on UI for mounting external storage
2012-05-24 11:06:03 -04:00
Michael Gapczynski
970124a90b
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:35:29 -04:00
Brice Maron
97d682dc13
Correct small style problem with task app fix #oc-689
2012-05-23 21:02:34 +00:00
Sam Tuke
3fee3a4633
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-22 14:44:40 +01:00
Sam Tuke
27f7dae932
removed closing php tag
2012-05-22 13:42:55 +01:00
Frank Karlitschek
8cd7410447
encryption is not yet compatible with ldap
2012-05-22 12:15:51 +02:00
Thomas Tanghus
a896da0d91
Contacts: XSS fix. Still some more to check.
2012-05-21 21:47:15 +02:00
Frank Karlitschek
2f8f7501ef
add warning
2012-05-20 10:58:20 +02:00
Georg Ehrke
ad66bb9c84
Merge branch 'calendar_dropimport'
2012-05-19 18:58:24 +02:00
Michael Gapczynski
5a48ade933
Make sure sharing and versions dropdowns come down in the same location for all files
2012-05-19 11:24:23 -04:00
Georg Ehrke
d4072c82dd
some fixes for contacts, gallery and openid
2012-05-19 15:22:21 +02:00
Georg Ehrke
07fa8da278
fix for calendar
2012-05-19 15:05:58 +02:00
Frank Karlitschek
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
Michael Gapczynski
35bd601215
Fix check for when to store a new version of a file
2012-05-18 22:27:43 -04:00
Michael Gapczynski
f750da1802
Fix revert link on history page of file versions
2012-05-18 22:07:48 -04:00
Michael Gapczynski
89f5701d1a
Fix versioning of shared files
2012-05-18 22:07:48 -04:00
Michael Gapczynski
ea7456a06a
Forgot to actually call remove on the history dropdown
2012-05-18 10:53:58 -04:00
Michael Gapczynski
fcb4d2aaee
Remove the history dropdown before creating a new one
2012-05-18 10:42:49 -04:00
Michael Gapczynski
122d1efecf
Don't show the select form in the history dropdown if a file has no other versions
2012-05-18 10:39:43 -04:00
Arthur Schiwon
c1bb8139a0
LDAP: we're 0.2 now
2012-05-18 18:00:30 +02:00
Arthur Schiwon
bae954a797
LDAP: only check once for name conflicts on update. Set a value on install as well
2012-05-18 18:00:30 +02:00
Thomas Tanghus
7922338050
Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form fields.
2012-05-18 17:39:19 +02:00
Arthur Schiwon
e606213fa0
make upload work with IE again
2012-05-18 17:07:00 +02:00
Arthur Schiwon
0c7efc234b
LDAP: update meta info
2012-05-18 17:07:00 +02:00
Frank Karlitschek
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
Arthur Schiwon
ea33b4aaa1
LDAP: don't make us of global constants (completing, was removed with latest additions to update.php)
2012-05-18 12:55:38 +02:00
Arthur Schiwon
253f101b39
LDAP: check wether applying naming rule would end up in conflicts on update, if so don't do it
2012-05-18 12:55:37 +02:00
Georg Ehrke
73a72054a3
fix call of all versions page
2012-05-18 12:00:35 +02:00
Georg Ehrke
7d49bf7f6e
some changes in calendar repeat class
2012-05-18 11:48:18 +02:00
Michael Gapczynski
b7aee58ef9
Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events
2012-05-17 21:26:55 -04:00
Robin Appelman
48505c5626
improve tar archive backend
2012-05-18 01:54:59 +02:00
Michael Gapczynski
5b42325b01
History dropdown clean-up
2012-05-17 18:57:52 -04:00
Tom Needham
74d49920f2
Close history dropdown on success. Avoids confusion.
2012-05-17 21:22:48 +00:00
Tom Needham
0aac70aaf1
Revert google webfont removal. Sadly this causes havoc with the editor!
2012-05-17 20:23:43 +00:00
Georg Ehrke
f7366de673
Merge branch 'master' into calendar_repeat
2012-05-17 22:17:23 +02:00
Georg Ehrke
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
Michael Gapczynski
fbe0d0d4fd
Fix private links inside folders
2012-05-17 16:12:33 -04:00
Georg Ehrke
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
Michael Gapczynski
57d41bb1f8
Merge branch 'merge-requests/115'
2012-05-17 15:39:39 -04:00
Michael Gapczynski
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Michiel de Jong
2cc0515161
no use for double quotes here
2012-05-17 21:03:06 +02:00
Michiel de Jong
f998ed331a
removing dead code
2012-05-17 21:01:42 +02:00
Michiel de Jong
3e454d3459
oops! was hardcoding my test domain inadvertently
2012-05-17 21:00:11 +02:00
Arthur Schiwon
7a7c301d7d
LDAP: follow user- and groupname char limitations for LDAP display names
...
WARNING: may affect existing installations if display names included unallowed characters. Allowed are only a-zA-Z0-9._-@ This fix is however needed, because names with unallowed characters may cause conflicts
2012-05-17 17:17:40 +02:00
Arthur Schiwon
57cf0ae3d1
LDAP: remove unnecessary debug output
2012-05-17 17:17:40 +02:00
Arthur Schiwon
38c56388c1
LDAP: Fix case sensitivity issues with display name attribute
2012-05-17 17:17:40 +02:00
Thomas Tanghus
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02:00
Michael Gapczynski
cf181e88bb
Try to setup a user's filesystem if the user hasn't logged in before and is shared a file
2012-05-17 09:24:54 -04:00
Thomas Tanghus
2f1e601809
Contacts: Disable in-app import if encryption is enabled, and make an attempt of supporting IE uploads too. Can't test it though...
2012-05-17 14:31:04 +02:00
Michael Gapczynski
9b3847f49b
Initial support for Amazon S3 storage backend
2012-05-16 21:52:05 -04:00
Robin Appelman
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
Robin Appelman
4ccfd27fa2
fix versioning for movable apps
2012-05-17 01:53:23 +02:00
Robin Appelman
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
Thomas Tanghus
d216678481
Contacts: removed check for empty FN field because Chrome/Chromium barfed.
2012-05-16 23:45:43 +02:00
Georg Ehrke
9e83c3f823
add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav
2012-05-16 21:05:15 +02:00
Sam Tuke
9acd1065b0
made initial testing version of expireAll for version control \ngave some old vars new camelcase names
2012-05-16 18:30:26 +01:00
Arthur Schiwon
ab18a0bfe8
ldap: unique index names for the database, fixes non-creating of indexes for the second table and potential issues in the app
2012-05-16 18:11:42 +02:00
Michiel de Jong
eceed497b1
fix paths in apps/remoteStorage/ajax/revokeToken.php
2012-05-16 18:08:50 +02:00
Sam Tuke
fefa4412c4
added phpdoc comment
2012-05-16 15:17:51 +01:00
Sam Tuke
c0df40084a
added recognition of which version is 'current' - which is currently live and in use on history page
2012-05-16 15:00:36 +01:00
Arthur Schiwon
fbc2892083
try to remove deprecated files from /files on update
2012-05-16 15:59:36 +02:00
Michael Gapczynski
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
Sam Tuke
a00c5ac78c
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
Thomas Tanghus
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
Michael Gapczynski
b619821f4a
Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs
2012-05-15 12:03:20 -04:00
Michael Gapczynski
6673375eeb
No multiple file sharing in this next release, sharing UI isn't ready for it :(
2012-05-15 11:45:59 -04:00
Michael Gapczynski
7b92c27777
Check if a file is encrypted before sharing (encrypted files cannot be shared)
2012-05-15 11:29:02 -04:00
Sam Tuke
2ad6b5048e
fixed 'delete' label so it doesn't break translations
2012-05-15 16:24:06 +01:00
Arthur Schiwon
35effbcd3f
LDAP: convert all DNs to lowercase so to make comparisons and everything work
2012-05-15 11:12:29 +02:00
Michael Gapczynski
568b6a7f56
Make only writable files draggable
2012-05-14 20:41:06 -04:00
Michael Gapczynski
a3b06e9658
Check if a private link points to a folder or file and change text accordingly
2012-05-14 20:21:31 -04:00
Michael Gapczynski
cda9dcc7aa
Fix private link emailing and clean up file name displayed in email
2012-05-14 20:21:31 -04:00
Michael Gapczynski
5cf42b88af
Replace all %2F with a / in private link
2012-05-14 20:21:31 -04:00
Thomas Mueller
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
Michael Gapczynski
d4271ed9df
Use original source when resharing a file, fixes bug oc-210
2012-05-14 17:31:03 -04:00
Thomas Mueller
954d4e5200
No need to keep the 'source files' in here, because the latest 'git master' release can be pulled
...
from http://mozilla.github.com/pdf.js/build/pdf.js
README added to document the fact stated above
update.sh added for easy update of pdfjs
CAUTION:
Don't update before OC4! API has been changed and we need to adopt files_pdfviewer
2012-05-14 23:21:29 +02:00
Robin Appelman
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
Michael Gapczynski
e03c5f39a8
Call is_writable explicitly on folders for readonly check
2012-05-14 16:31:00 -04:00
Thomas Tanghus
e74f4b406f
Remove logging.
2012-05-14 17:50:24 +02:00
Thomas Tanghus
9b3d8660eb
Contacts: Had forgotten to call local function.
2012-05-14 17:49:33 +02:00
Thomas Tanghus
de850dfa52
Contacts: Fix layout in contacts list that I had broken in an earlier fix :-P
2012-05-14 17:49:33 +02:00
Michiel de Jong
4c6d11e223
move auth.css and remoteStorage-big.png to assets folders From where they can be included
2012-05-14 17:05:35 +02:00
Georg Ehrke
18c8896b3c
better user permission check for files in ajax/calendar/
2012-05-14 15:59:06 +02:00
Georg Ehrke
84827ff992
some fixes for calendar's export.php
2012-05-14 15:52:24 +02:00
Georg Ehrke
9c8eb104b6
check user permissions in calendar's changepermission.php
2012-05-14 15:42:16 +02:00
Georg Ehrke
55eb318265
check user permissions in calendar's unshare.php
2012-05-14 15:42:16 +02:00