fffbf26159
don't forget to declare class properties
2012-04-23 11:22:11 +02:00
82ba2151d1
Wrong app check.
2012-04-23 10:52:13 +02:00
8f2e9caf96
Contacts: Tipsyfied photo toolbar.
2012-04-23 10:52:13 +02:00
d17eba19c1
fix image viewer
2012-04-22 21:27:20 +02:00
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
e8f062dc93
Contacts:
...
- Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options.
- Made action icons translucent instead of hiding them.
2012-04-22 20:47:24 +02:00
8a6cb23170
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
2012-04-22 20:47:24 +02:00
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
24aff287cf
Link to icon was absolute.
2012-04-22 03:39:59 +02:00
f85aaf1f58
Contacts: Added bg color and shadow to controls. I suck at CSS...
2012-04-22 02:32:51 +02:00
80ddf37bb7
Missing double quote.
2012-04-22 02:09:13 +02:00
651de1e588
Contacts: Fix error on photo crop.
2012-04-22 01:50:46 +02:00
9e3242d05e
Contacts: Changed layout as discussed with JanC. Still WiP.
2012-04-22 00:44:53 +02:00
56e064bd09
Don't trigger unnecessary change events.
2012-04-22 00:44:53 +02:00
16fc4dfd1a
Contacts: Fixed contact photo drag'n'drop upload - again...
2012-04-22 00:44:53 +02:00
a34631f84e
Contacts: Add check for empty FN field.
2012-04-22 00:44:53 +02:00
69f3b5e2d2
make the button a bit more consistent to the other ownCloud interface
2012-04-21 23:34:24 +02:00
260c48c29a
cleanup the admin page layout mess a bit. Still a lot to improve in the future :-)
2012-04-21 23:23:02 +02:00
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
80950f2e1c
make field completely visible
2012-04-21 23:10:35 +02:00
ff3b199cc8
use less space
2012-04-21 23:08:52 +02:00
1a49497899
structure the information a bit more so that is easier readable
2012-04-21 22:55:18 +02:00
74e5402711
fix a php notice
2012-04-21 22:27:19 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
acea156a3d
Tasks: Save description field
2012-04-20 23:37:42 +02:00
3d68732657
Tasks: Due date without time support added
2012-04-20 22:56:59 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
c3d78cf77a
remove require once lib base in files scan.php
2012-04-20 22:34:13 +02:00
1384be4bff
Tasks: Task summary is always text, at it as suchs
2012-04-20 18:19:10 +02:00
70ba428222
Tasks: Make gettasks more robust against malformed VTODO data
2012-04-20 18:18:07 +02:00
c75bbb59a9
Tasks: Add due property handling
2012-04-20 18:16:39 +02:00
3aeea0c196
Merge branch 'merge-requests/105'
2012-04-19 20:31:24 +02:00
3706bbec1b
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
2012-04-19 20:30:58 +02:00
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
b39c3d4c4e
make use of the fact that stream_read will always read 8192 bytes for encryption stream
...
https://bugs.php.net/bug.php?id=21641
2012-04-18 20:54:28 +02:00
26e9a0dd13
bugfixes for encryption library and test cases
2012-04-18 20:54:28 +02:00
b44bc9f4b2
remove require once lib base in some more files
2012-04-18 17:42:11 +02:00
921fc59d8f
Tasks: Add "more" block containing description
2012-04-18 17:28:16 +02:00
45de7ad221
move files to app folder
2012-04-18 17:27:34 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
7402543d3e
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
4dabd0fb9c
test data for archives
2012-04-17 18:04:06 +02:00
6ba30cb713
Tasks: Clicking task summary opens input for edit
2012-04-17 17:32:21 +02:00
66018b89b2
LDAP: don't forget to unbind
2012-04-16 18:03:02 +02:00
86192c2f8d
checked, works for me
2012-04-16 17:31:39 +02:00
9cd5221d47
group ldap: check configuration
2012-04-16 17:28:58 +02:00
ed54de1bbf
group LDAP: implement groupExists function, needed for Sharing
2012-04-16 16:23:00 +02:00
8afeb0fedb
Tasks: Implement task lists overview
2012-04-16 15:34:14 +02:00
320fde9eec
OC_Group does expect object, not string
2012-04-16 15:09:38 +02:00
899c7631d5
minor code beautification
2012-04-16 15:09:38 +02:00
e1948c651b
use the right attribute for member retrieval
2012-04-16 15:09:38 +02:00
02f4e78f3e
a string be a string
2012-04-16 15:09:38 +02:00
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
b0e68d039c
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 15:09:54 +00:00
712e25bb02
Update ace
2012-04-15 15:09:37 +00:00
0b426b5e64
Display correct URL in caldav and carddav paths
2012-04-15 16:50:45 +02:00
9b1d6246a9
Remove useless, unmaintained dav.php
2012-04-15 16:50:44 +02:00
9ac65c51f5
dont try to view psd files
2012-04-15 16:26:08 +02:00
fef3434bdf
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 14:02:13 +00:00
738601f4fe
Remove google web font
2012-04-15 14:01:59 +00:00
679ddc0e32
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 16:01:06 +02:00
f36d31f74d
pdfjs updated from github
2012-04-15 15:59:31 +02:00
80f4c4f923
Bookmarks: handle input with & and ?, fixes oc-201
2012-04-15 15:53:40 +02:00
9ee3eb1412
remove unused css
2012-04-15 13:44:43 +00:00
947d2e5705
Tasks: Mark task as complete when checking the checkbox
2012-04-15 15:39:49 +02:00
19d81068f6
Tasks: Code cleanup
2012-04-15 15:38:44 +02:00
b3ae2208b1
clean the collection view after rescanning
2012-04-15 15:19:30 +02:00
cf3bb08dfb
enable archive support on default
2012-04-15 15:19:30 +02:00
9ee931e790
only run archive tests if the test data is available
2012-04-15 15:19:30 +02:00
819af69972
group LDAP: simple basic tests
2012-04-15 14:50:03 +02:00
0a46c7a393
group LDAP: usersInGroup not getUsersInGroup
...
offer static readonly properties
2012-04-15 14:50:03 +02:00
2a03db6065
don't forget changes in lib_ldap for last commit
2012-04-15 14:50:03 +02:00
8a6fa65ed6
group LDAP: implemented getUsersInGroup()
2012-04-15 14:50:03 +02:00
b480071946
group LDAP: implemented getUserGroups()
2012-04-15 14:50:03 +02:00
0912f40ebe
typo
2012-04-15 14:50:03 +02:00
54a9fd2e6a
group LDAP: implemented inGroup()
2012-04-15 14:50:03 +02:00
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
3b71e46cf7
Contact: Don't use non core class in appinfo/app.php
2012-04-14 18:34:59 +02:00
29bb5d27e4
few pieces of documentation
2012-04-14 18:26:51 +02:00
19243b3e91
give back expected result types as long as logic is not there yet
2012-04-14 18:08:40 +02:00
e160acefe3
test for ldap group backend
2012-04-14 18:08:40 +02:00
61a43419a5
starting to create the ldap group backend (with some inspiration from Yoann Gini) and preparing an general LDAP class
2012-04-14 18:08:40 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
029e1aced7
Tasks: Update to use new categories interface
2012-04-14 14:55:37 +02:00
44c34115a4
Remove go to line
2012-04-14 12:49:31 +00:00
7d1880078c
Merge branch 'master' into tasks
2012-04-14 13:47:56 +02:00
9b1c881ca8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 11:18:25 +00:00
5c55b9c5ac
Sharing: Add a filename after public share link
...
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
524bd2e75f
Sharing: Don't get share icon for undefined filename
2012-04-14 12:45:32 +02:00
7504ceb6f2
Sharing: Define missing template vars
2012-04-14 12:45:32 +02:00
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
8ed4606685
LDAP: don't keep possibly outdated passwords
2012-04-14 11:08:50 +02:00
e256ac8791
fix unsharing of events
2012-04-13 21:49:24 -04:00
c65adc12d5
add chosen script to calendar
2012-04-13 21:29:51 -04:00
5d4c546693
fix public sharing of calendars
2012-04-13 17:36:47 -04:00
ea3499a712
fix class name
2012-04-13 17:26:34 -04:00
1e0364baa8
check permission check in share function
2012-04-13 17:16:28 -04:00
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
02dc343209
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
854eaff34f
hide share tab in shared events
2012-04-13 16:20:19 -04:00
0aaaefbb4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-13 20:10:35 +00:00
1165b358b4
Update language string
2012-04-13 20:09:04 +00:00
b9f9228a22
Contacts: Save the category list update when updating/adding contact
2012-04-13 21:13:58 +02:00
4c52007996
Calendar: Update category list when updating/adding event
2012-04-13 21:13:58 +02:00
471e735b0c
Calendar: Document active parameter in allCalendars
2012-04-13 21:13:58 +02:00
7cf7d5c3dd
Calendar: Also set repeat options when editing a non repeating event
2012-04-13 21:13:58 +02:00
28e0d64ede
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
f9b7ed3a1f
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
6aee6dae6b
VCategories css is now in styles.css
2012-04-13 18:50:40 +02:00
b654121b50
Contacts: Better error reporting.
2012-04-13 18:50:40 +02:00
6066ea3170
only run tests for files_external when asked for explicitly
2012-04-13 18:49:50 +02:00
8686667b10
some idexes for the media player tables
2012-04-13 18:49:50 +02:00
df2e788a1c
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
a7908ba76b
fix bugs in share class
2012-04-12 22:11:48 -04:00
e9c1f8b4e6
Contacts: No need to sort the categories anymore
2012-04-12 23:10:49 +02:00
43ba23430d
Contacts: Change "category" to "group" in UI
2012-04-12 23:10:49 +02:00
78189e2247
Contacts: update category list when the categories change
2012-04-12 23:10:49 +02:00
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
b2011bd0a0
Remove unused function getCategoryOptions from OC_Calendar_Object
2012-04-12 23:10:49 +02:00
5fa90cd214
Contacts: Also initialize org var in updateValuesFromAdd
2012-04-12 23:10:49 +02:00
86edc0da31
Contacts: add space before parameter
2012-04-12 23:10:49 +02:00
fa853102e4
Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App
...
This is in preparation of making $categories protected and initialized
with default categories.
2012-04-12 23:10:49 +02:00
48f99fe661
off by default. great tool for developers but confusing for users.
2012-04-12 20:23:45 +02:00
bd262eaac0
Fixed OC-261 by modifying js files in apps/media/
2012-04-12 17:56:53 +02:00
d9aa31fd92
Use OC_Helper::serverHost() in openid settings
2012-04-12 17:51:17 +02:00
8cea656ad7
upgrade getid3
2012-04-12 15:54:08 +02:00
0f16935763
fix bugs and optimize OC_Calendar_Object Class
2012-04-11 10:21:45 -04:00
613e15035e
Merge branch 'master' into sabredav_1.6
2012-04-10 22:44:13 -04:00
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
2dfa02a346
Contacts: fix function names to coding standard
2012-04-10 21:53:36 +02:00
3f6e971571
Contacts: Don't lowercase categories value when saving
2012-04-10 21:19:39 +02:00
fd72556fd1
Contacts: Make part.no_contacts.php translatable
2012-04-10 21:15:38 +02:00
eaa649cfb2
fix bug in share lib of calendar
2012-04-10 11:18:02 -04:00
47f94548ce
don´t enable by default. still broken
2012-04-10 15:05:33 +02:00
6cf3f10d35
fix includes
2012-04-09 22:51:53 +02:00
b0894b3148
Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do.
2012-04-09 22:10:29 +02:00
4fda6af725
Contacts: Fix for not being able to add contact to empty/non-existant address book.
2012-04-09 16:30:58 +02:00
9c247ce874
Removed padding.
2012-04-09 16:30:58 +02:00
53091551d8
Re-added file I had accidentally removed earlier :-P
2012-04-09 16:30:58 +02:00
ecc596534a
Decode json response for admin exports
2012-04-08 19:08:17 +00:00
9294a95438
fix view of single shared events
2012-04-07 22:54:38 -04:00
960553f9c4
fix path and class name
2012-04-07 22:45:44 -04:00
5a4237a31d
make dropdown menu work with single event sharing
2012-04-07 22:41:24 -04:00
97d216c94d
add dropdown to eventform
2012-04-07 22:40:20 -04:00
4d884c3849
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
e940152bce
fix bugs in share lib of calendar
2012-04-07 22:39:02 -04:00
eef9a1e7ed
add access check to ajax files
2012-04-07 22:37:26 -04:00
e18c0d54f6
add output functions and access function to app.php of calendar
2012-04-07 22:35:29 -04:00
c0869887cf
Return JSON for import and export methods of OC_Migrate
2012-04-07 21:55:16 +00:00
9edf45a324
Merge branch 'master' into migration
2012-04-07 17:31:30 +00:00
d2886f2020
Hide instance import as it eats data
2012-04-07 17:27:09 +00:00
00449cdf37
rename admin_export -> admin_migrate
2012-04-07 17:23:25 +00:00
23d39f7ef0
Display errors on import
2012-04-07 16:13:18 +00:00
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
b71cf1a4f9
Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud.
2012-04-07 16:03:43 +02:00
660951dc64
Add some filetypes
2012-04-07 13:32:00 +00:00
a098c7c685
Give editor focus after saving
2012-04-06 21:38:38 +00:00
22466010fc
Provide undo when closing editor with unsaved changes
2012-04-06 21:37:28 +00:00
2fe0716cb4
Show nice errors
2012-04-06 20:52:41 +00:00
60e3b563e2
webdav needs to load authentication apps
2012-04-04 12:41:32 +02:00
dd4e577f6d
Contacts: l11n for geo autocomplete. Not sure if it works though.
2012-04-03 08:13:10 +02:00
fc555b48ec
Contacts: Added autocomplete using geonames.org.
2012-04-03 07:29:47 +02:00
b3f107ddda
Contacts: First work on cleaner design.
2012-04-03 03:29:12 +02:00
896bff5748
Contacts: rescan categories on load if there are none.
2012-04-03 03:29:12 +02:00
bd9fa658de
merged from upstream
2012-04-02 23:54:18 +02:00
adc9d906e4
confirm close when there are unsaved changes
2012-04-02 17:44:15 +00:00
dc499c5b4e
add * to filename when changes have been made
2012-04-02 17:27:06 +00:00
d0cb99e347
use OC_Dialogs instead of alert()
2012-04-02 16:35:11 +00:00
33c1fa6e28
webfinger protocol compatible + minor changes
2012-04-02 17:12:52 +02:00
72a43b3929
revert 0fd8b1a044
2012-04-02 08:32:27 -04:00
d896c19011
cal import should group events by uid, export should have correct newlines, fix for oc-384
2012-03-31 20:16:42 -07:00
eba6a65908
try to use transactions to replace db
2012-04-01 00:25:47 +00:00
a248cc73e6
Merge branch 'master' into migration
2012-03-31 23:56:16 +00:00
daf742c086
Fix owncloud log
2012-03-31 23:55:41 +00:00
3e84d85482
remove debug
2012-03-31 22:50:57 +00:00
aba3182a7d
Fix loading image after export failure
2012-03-31 22:47:38 +00:00
f7d8a8c571
Merge branch 'master' into migration
2012-03-31 22:44:50 +00:00
d20eea9761
Use ajax to download file, OC_Dialogs for errors
2012-03-31 22:41:43 +00:00
0fd8b1a044
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
ca2c7001c4
remove unused code in OC_Calendar_App class
2012-03-31 16:15:04 -04:00
70237f7ecc
rewrite OC_Calendar_APP class
2012-03-31 16:13:04 -04:00
10fc51dc92
add public sharing fir calendars and events - add function in Share class
2012-03-31 16:12:27 -04:00
cf26f8a6a7
add public sharing for calendars and events
2012-03-31 17:32:43 +01:00
4b3f074309
add new parameters to export file
2012-03-31 17:27:30 +01:00
1f8cf2d8f2
fix name of constants
2012-03-31 13:37:44 +02:00
a88305b4cb
remove share tab from read only event dialog
2012-03-31 13:11:30 +02:00
f9f91a08b4
webfinger reimplementation started
2012-03-31 02:42:41 +02:00
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
5161758921
create static host-meta instead of symlink and .htaccess
2012-03-30 21:35:09 +02:00
6abb2cb92e
fix sharing nested galleries
2012-03-30 21:14:01 +02:00
ef1e359c7c
Merge branch 'master' into sabredav_1.6
2012-03-30 18:48:30 +02:00
e3203f87ff
Merge branch 'master' into calendar_sharing
2012-03-30 18:42:09 +02:00
284955573c
clarifying remoteStorage description
2012-03-30 18:18:37 +02:00
dde5660915
renamed Gallery to Pictures, still needs to be changed in the code to also reflect in the path
2012-03-30 18:18:37 +02:00
011132feb3
renaming remote storage support to External storage support to clear up naming conflict
2012-03-30 18:18:37 +02:00
523fdda399
add the option to only load apps of a specific type
2012-03-30 14:39:07 +02:00
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
f74d11c0c3
fix gallery sharing when root is not /
2012-03-29 20:45:21 +02:00
4b3282b325
Contacts: Removed obsolete code.
2012-03-29 15:36:04 +02:00
11f7eeb63a
Improve actions on delete.
2012-03-29 15:25:24 +02:00
b559952806
Cleanup stylesheet.
2012-03-29 15:25:24 +02:00
5fef9dfc22
Make users only able to share with users in groups they belong to
2012-03-28 21:18:17 -04:00
72882beb0d
enble browsing tar files in the web interface
2012-03-28 23:53:51 +02:00
1b6fe4f65e
stricter tests for archive backends and make sure we make the tests
2012-03-28 23:47:44 +02:00
c26e003462
add tar backend for OC_Archive
...
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
e57de98bbe
add extract all option to OC_Archive
2012-03-28 23:47:44 +02:00
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
0d16f177cb
add scrollbar to the music list - bugfix for oc-301
2012-03-28 16:21:54 +02:00
34a0128ddf
whitespace indentation fix
2012-03-28 16:12:34 +02:00
bcda46eda3
webfinger installation creates symlink in document root
2012-03-28 16:07:50 +02:00
bd4fd76bfb
Fix bookmarks migration provider
2012-03-27 21:35:29 +00:00
ef33219e4f
import method returns each apps' import status
2012-03-27 21:21:14 +00:00
553f4533c0
look for migrate.php in appinfo folder
2012-03-27 20:45:37 +00:00
c8acd4a594
Merge branch 'master' into migration
2012-03-27 20:19:38 +00:00
536a3ecb42
Merge branch 'master' into sabredav_1.6
2012-03-27 20:54:16 +02:00
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
cb2dd97509
Trigger autocomplete wo button.
2012-03-27 12:30:20 +02:00
fa165498cc
Improvements in adding/deleting properties.
2012-03-27 12:30:20 +02:00
ff038f8766
Contacts: Update contact list thumbnail when deleting PHOTO.
2012-03-27 12:30:20 +02:00
ff75d65d7e
Merge branch 'master' into calendar_sharing
2012-03-27 09:29:16 +02:00
c384e3ba4f
fix width of dropdown to select monthdays - bugfix oc-354
2012-03-27 09:24:55 +02:00
eb3ec05f88
fix gallery scan when an image cant be loaded
2012-03-26 23:56:07 +02:00
73c6db5c8e
crop and resize in a single step when creating thumbnail
...
also so more explicit memory cleanup
2012-03-26 23:53:48 +02:00
3f881f1ca5
memory cleanup in gallery
2012-03-26 22:40:38 +02:00
60a939dfcf
Small change and muting debug.
2012-03-26 22:26:06 +02:00
0da988a1bb
Check for empty value.
...
Added missing classes on action icons.
2012-03-26 22:08:03 +02:00
ee31bc7995
Contacts: Fix saveproperty for categories
2012-03-26 21:47:37 +02:00
a867bcab46
Merge branch 'master' into calendar_sharing
2012-03-26 21:46:40 +02:00
6ff89dcf72
Removed obsolete code.
2012-03-26 19:13:48 +02:00
f479105f5e
optimize choosecalendar dialog for shared calendars
2012-03-26 16:01:55 +02:00
10ef01b04b
fix displayed username of person who shares
2012-03-26 15:44:24 +02:00
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
179bf15daf
fix group sql generator in calendar's share lib
2012-03-26 15:30:04 +02:00
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
b7a5ae38c5
fix sql command in calendar's share lib
2012-03-26 09:48:58 +02:00
102cf150b3
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
2012-03-26 02:04:34 +02:00
ac0c5ba6da
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
34c08b3165
Add test for Google Docs storage backend, tester needs to token and token secret to config
2012-03-24 15:46:28 -04:00
d139e3c3cd
Move Google Docs storage backend to files_remote app
2012-03-24 15:28:05 -04:00
c23090b43c
spaces to tabs in bookmarks
2012-03-24 19:55:44 +01:00
a3125f164e
bookmarks tag placement & list width fix
2012-03-24 19:55:43 +01:00
826cb2c650
fix sharing address construction in opera and firefox
2012-03-24 19:26:53 +01:00
be60b451eb
fix albums thumbnails preview for opera
2012-03-24 19:21:36 +01:00
afcf965498
fixup: sharing gallery for loggedin users fail
2012-03-24 18:40:27 +01:00
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
e0cbefc727
webdav storage backend
2012-03-23 18:55:26 +01:00
0e11cc9f6f
fix previous made bug and fix oc bug - oc-139
2012-03-23 17:27:52 +01:00
ac8362e34a
check if the title of an event is null - bugfix for oc-139
2012-03-23 17:09:51 +01:00
b63b377c4d
Bookmarks: make link text click clickable too - bugfix for oc-131
2012-03-23 16:58:48 +01:00
45b320d674
use unnamed as title for a bookmark if no title was entered and curl fails
2012-03-23 16:54:15 +01:00
37963fee28
Merge branch 'master' into calendar_sharing
2012-03-22 20:40:20 +01:00
8e8c4a8edc
Merge branch 'master' into sabredav_1.6
2012-03-22 20:40:04 +01:00
82b54938e3
ftp storage backend
2012-03-22 19:56:19 +01:00
5b03de9a66
fix comments in crypt lib
2012-03-21 17:43:09 +01:00
892343c7c1
Fix instance import
2012-03-21 16:30:59 +00:00
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
8f8d486f35
Merge branch 'master' into sabredav_1.6
2012-03-21 09:42:53 +01:00
07d7138df0
Register admin pane
2012-03-20 20:34:20 +00:00
0fa5e196ef
Try to use old uid when importing
2012-03-20 20:32:01 +00:00
514c9ad8e7
Added unified import method.
2012-03-20 20:19:21 +00:00
19bbb61b20
fix spelling fail in texteditor's style.css
2012-03-20 19:48:08 +01:00
145d6f3566
Add OC_Migration_Content class to help app devs. Restructure OC_Migrate.
2012-03-19 20:44:20 +00:00
194211500b
register text/x-vcard as a fileaction for vcard import
2012-03-19 09:58:44 +01:00
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
ddb7197c9c
Merge branch 'master' into calendar_sharing
2012-03-18 00:53:02 +01:00
de09883d86
creating and retrive thumbnails for intermediate galleries
2012-03-17 23:41:10 +01:00
bc085c3ff4
Create new user, create new data dir, copy files, import app data
2012-03-17 16:25:14 +00:00
5234e66bab
Add exportinfo to user exports.
2012-03-17 13:53:00 +00:00
27bf34f7be
Move user import to the admin
2012-03-17 13:30:58 +00:00
eaa1074ccb
Merge branch 'master' into calendar_sharing
2012-03-17 13:59:00 +01:00
122f7e4c2f
Dont truncate the time format
2012-03-17 12:41:16 +00:00
8e22823501
bredcrumb fix
2012-03-17 13:30:45 +01:00
222bb2303f
Added prototype of user import
2012-03-16 22:54:37 +00:00
5332c319a2
Migration info is an object. Other fixes
2012-03-16 22:50:35 +00:00
c442a06a02
Fix export for admin and users. Added 3 admin export types
2012-03-16 21:09:36 +00:00
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
50233d075c
Improve admin_export ui and move system export cde to OC_Migrate
2012-03-15 20:52:43 +00:00
0fadbee699
fix adding photo to incorrect gallery
2012-03-15 00:09:06 +01:00
193e93e4a9
creating intermediate galleries
2012-03-14 22:28:55 +01:00
c9be325af2
Fix zip creation. Add param to cleanUp() method. Add defaults to createExportFile() method.
2012-03-14 16:43:06 +00:00
a310a81053
move zip creation inside OC_Migrate
2012-03-13 23:09:43 +00:00
a919a136c4
Finish import function for bookmarks
2012-03-13 21:24:07 +00:00
cd2f75fdad
Use data dir from config.php
2012-03-13 17:27:47 +00:00
0f3eebbbd9
added cleanUp() method to OC_Migrate
2012-03-13 17:18:42 +00:00
7e3b35a57c
fix structure of user export zip
2012-03-13 17:08:20 +00:00
111af7fed5
json encode the output
2012-03-13 17:04:49 +00:00
4d5646a59f
Find migrate.php even for disabled apps. Improve ui for user and admin migrations
2012-03-13 16:21:17 +00:00
4a91c6dbed
Make PHOTO deletable.
2012-03-13 14:56:03 +01:00
9e83f0247f
Added sync path for iOS/OS X.
2012-03-13 14:28:38 +01:00
6b01d7be9a
Fixed NOTE property UI.
2012-03-13 02:55:17 +01:00
dd0daa6e33
Cleanup in Contacts.
2012-03-13 00:55:15 +01:00
551b4443e1
Force load profile pic after edit hack.
2012-03-12 21:56:28 +01:00
60fe9dda5d
Remember categories when they have changed.
2012-03-12 21:55:54 +01:00
1cdb4396a4
Fix copyRows() return value. Generate app info and oc info on return
2012-03-12 18:40:14 +00:00
3efa5f17f2
Rename...
2012-03-12 16:47:29 +01:00
c55d2af6b3
More modifications for using jquery.multiple_autocomplete.
2012-03-12 16:44:16 +01:00
2b8125f4ba
Small fix to jquery.multiple_autocomplete.
2012-03-12 15:30:52 +01:00
d36d317bb2
Contacts: Modifications for using categories.
2012-03-12 14:13:03 +01:00
9c032ecc33
Fix return value of export
2012-03-11 22:20:01 +00:00
fa5a5649c6
Fix copyRows() and sqlite connection
2012-03-11 22:09:16 +00:00
618f92b3fb
fix thumbnail generation
2012-03-11 20:00:50 +01:00
d5959872e1
disabling file handlers in gallery for now
2012-03-11 19:17:51 +01:00
4b8ff4d910
media scanner fix
2012-03-11 17:29:21 +01:00
f6075cc1fe
gallery migration to events system
2012-03-11 16:49:42 +01:00
92221e98de
spaces to tabs
2012-03-11 12:03:41 +00:00
d712d7f52c
Lots of fixes, improve copyRows() method and update settings page.
2012-03-10 18:18:58 +00:00
3ca76d24a9
Add OC_Migrate::copyRows() method
2012-03-10 15:52:38 +00:00
dc3dd272f7
Text editor will now wrap text based on window size
2012-03-10 14:32:57 +00:00
1aaf008020
fix character encoding bug oc-278
2012-03-10 14:06:30 +00:00
3f507898d0
update file extensions in editor
2012-03-10 14:00:57 +00:00
84d6c53970
filecache search comparition fix
2012-03-09 16:28:26 +01:00
2582fe1c89
Yet a missing file :-P
2012-03-09 13:56:20 +01:00
98bf8cfeb6
Added missing template.
2012-03-09 12:11:52 +01:00
2cbd281637
Merge branch 'vcategories'
2012-03-09 10:29:58 +01:00
8228a554a4
Temporarily disabled multi_autoselect.
2012-03-09 10:29:00 +01:00
bc5d9f5868
Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-)
2012-03-09 07:39:35 +01:00
8495e1a63e
Add missing file.
2012-03-09 07:39:35 +01:00
f8b62d49ee
Tasks: Ordering of the task list
2012-03-08 22:27:29 +01:00
d1b2c10422
Tasks: Update task list when adding or updating tasks
2012-03-08 22:26:54 +01:00
700a120c22
fix write hook for gallery
2012-03-08 15:47:49 +01:00
a33a62bf60
Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories
...
Conflicts:
apps/contacts/lib/vcard.php
apps/contacts/templates/part.contact.php
2012-03-08 02:55:48 +01:00
ae7aab2d6e
Merge gitorious.org:owncloud/owncloud into vcategories
...
Conflicts:
apps/contacts/ajax/saveproperty.php
apps/contacts/lib/vcard.php
2012-03-07 23:38:44 +01:00
91d85e9b16
Use OC.dialogs.
2012-03-07 22:57:37 +01:00
340320625e
Contacts: Add UI for categories
2012-03-07 21:50:55 +01:00
9908adb320
Merge branch 'master' into vcategories
...
Conflicts:
apps/contacts/lib/vcard.php
2012-03-07 21:49:46 +01:00
d8cfe77ba5
Contacts: small fixes and cleanups
2012-03-07 21:46:42 +01:00
9599548203
Contacts: change card parameter type of VCard::edit and VCard::add
...
changed to OC_VObject
2012-03-07 21:46:42 +01:00
97ab706a6a
Contacts: No random token for contactphoto
2012-03-07 21:46:42 +01:00
46aa011ef9
Contacts: Add Organisation as Name property choice
2012-03-07 21:46:41 +01:00
9ccf46d350
Contacts: convert class attribute selectors to class selectors
2012-03-07 21:46:41 +01:00
57c4d39b1e
Fix conflict.
2012-03-07 20:57:05 +01:00
Arthur Schiwon
Thomas Tanghus
Robin Appelman
Georg Ehrke
Frank Karlitschek
Bart Visscher
Jan-Christoph Borchardt
Tom Needham
Jakob Sack
Thomas Müller
Deepak Mittal
Daniele E. Domenichelli
Florian Hülsmann
Scott Shambarger
Bartek Przybylski
Michael Gapczynski