9f1370a6d1
Updated copyrights.
...
Element menu didn't update.
2012-02-08 08:47:03 +01:00
c0c6b5310e
Added files for new contact editor/viewer.
2012-02-08 08:47:03 +01:00
3e9a69b9b7
Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
...
Conflicts:
apps/contacts/ajax/contactdetails.php
apps/contacts/js/contacts.js
2012-02-08 08:33:51 +01:00
424c64c0eb
Don't import cards that can't be parsed by Sabre, but log it instead.
...
Fix missing 'N' or 'FN' fields on import.
2012-02-08 07:59:39 +01:00
249e46c5b7
Some fixes for malformed VCards.
2012-02-08 07:59:39 +01:00
4db661ba9d
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 07:59:39 +01:00
23396721e4
Hide container for emails/phones/adresses if there are none.
2012-02-08 07:59:39 +01:00
1e4444f25b
Updated copyrights.
...
Element menu didn't update.
2012-02-08 07:59:39 +01:00
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
cdf1cf82ba
merge 64a617b2a1 into master
2012-02-07 22:49:23 +01:00
2cebfb50a4
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-06 14:18:40 +01:00
5962e66b6d
Hide container for emails/phones/adresses if there are none.
2012-02-06 08:15:23 +01:00
bc79951f33
Updated copyrights.
...
Element menu didn't update.
2012-02-06 08:04:06 +01:00
3af427fa54
Added files for new contact editor/viewer.
2012-02-06 07:32:57 +01:00
89616d81f0
Modification for adding photos.
2012-02-06 07:24:39 +01:00
960dd750c9
Added dbexport to export output. Initial import code.
2012-02-05 23:00:38 +00:00
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
89073970d3
change comments in import.php
2012-02-05 12:13:53 +01:00
8337eaa1ec
add import function for contacts
2012-02-05 12:13:53 +01:00
36bc1a2102
Merge branch 'master' into filesystem
2012-02-05 01:22:29 +01:00
cfc710e768
preferences store fix
2012-02-04 20:15:55 +01:00
f6a27dfa28
stripping root from gallery name
2012-02-04 15:35:58 +01:00
f1672d7d10
handling special chars in dirnames
2012-02-04 11:02:13 +01:00
5a106d1036
gallery: fix FS hooks
2012-02-04 10:30:32 +01:00
24c79c5bce
Updated Migrate_provider bookmakr implementation
2012-02-03 22:41:39 +00:00
1133eaa679
load bookmarks provider class
2012-02-03 21:28:58 +00:00
ee88ded463
more commenting out for debugging, added logging commands
2012-02-03 21:00:12 +00:00
0bbc9ade7d
fix syntax, add logging, debug xml output instead of zip
2012-02-03 20:48:32 +00:00
8df0650658
gallery settings, defining scan root and shor order
2012-02-03 21:38:44 +01:00
ee01d1a81d
removing console error in safari for bookmarks
2012-02-03 21:37:09 +01:00
5507db9b15
Initial migration code, and basic export for bookmarks
2012-02-03 20:32:06 +00:00
ab31a890b6
use strip_tags for calendar names
2012-02-02 21:23:41 +01:00
bfa69c3e59
add a label calendar to the settings page - bugfix for oc-157
2012-02-02 18:37:06 +01:00
6225b5ec86
More in-/output sanitation,
2012-02-02 17:54:30 +01:00
66b96e4440
Sanitize in- and output.
2012-02-02 17:54:30 +01:00
7b9fb84fe9
Merge branch 'master' into filesystem
2012-02-02 17:30:54 +01:00
92b8f32386
Calendar: Bugfix: better input validation
2012-02-02 15:01:05 +01:00
f198296576
gallery works in safari now
2012-02-01 22:15:46 +01:00
f999fbf81a
Bookmark layout updated
2012-02-01 22:02:06 +01:00
bbd10a3c94
Bookmark layout updated
2012-02-01 21:19:31 +01:00
d514b1d92d
Merge branch 'master' into filesystem
2012-02-01 15:57:32 +01:00
6583d30e26
fix javascript
2012-02-01 15:40:59 +01:00
e229a6adec
Added searchprovider for bookmarks, initial l10n support for bookmark plugin
...
moved some code from updateList.php to bookmarks.php, to make it reusable
2012-02-01 15:40:59 +01:00
0124809a42
prevent sharing from making aditional http requests while scanning
...
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
1f718d31e1
Merge branch 'tanghus_contacts'
2012-01-31 19:35:11 +01:00
6c340416d9
Resize profile picture if bigger than 200px on either x or y.
...
Bolded text on message box.
2012-01-31 19:32:24 +01:00
3f1486534f
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93
...
Property was added multiple times.
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-8
"Missing "N" field: Contacts app not compatible with vcard 3.0 format"
- Almost sure I've fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-27
"Full name in Contacts app doesn't sync to iOS 5 contacts" because it is caused by oc-8
2012-01-31 19:30:56 +01:00
db1f77e4f5
Some reminders in the code of what I have to change post OC3.0
2012-01-31 19:30:56 +01:00
803f86e0fc
dont try to use the filesystem when it isnt setup yet
2012-01-31 12:44:01 +01:00
1191b57b34
Merge branch 'master' into filesystem
2012-01-30 23:20:47 +01:00
e0f655fb70
Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113
2012-01-30 16:49:24 -05:00
4522d19b4c
merge master into filesystem
2012-01-30 20:29:33 +01:00
5574b87e9b
new gallery look and feel
2012-01-30 19:36:33 +01:00
30f1de71a6
remove debug file
2012-01-29 16:08:09 +01:00
928e9b121b
fix version-compare in calendars app.php
2012-01-29 10:59:15 +01:00
ad4e305c96
update translations
2012-01-27 00:59:24 +01:00
830cf87697
use the correct hooks to remove contact/calendars of remvoed users
2012-01-26 19:05:46 +01:00
266fbb442e
use oc_filesystem::getlocalfile instead of manually trying to get the correct local file when creating album covers
...
fixes broken album covers on shared files
2012-01-26 18:12:59 +01:00
63ae4b3dfc
db cleanup after gallery remove
2012-01-25 21:15:27 +01:00
5172e0a7a3
creating thumbnails on upload, recursive remove
2012-01-25 21:07:43 +01:00
e6298325f6
Removed debug output
2012-01-24 23:08:40 +01:00
5458e52935
Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92
...
"Character '&' in address data causes wrong data".
This was also the case for the 'N' property.
2012-01-24 23:08:40 +01:00
a77f3a07a1
Fix some issues in ampache resonponse
...
Patch by Markus Germeier
2012-01-24 02:56:57 +01:00
6fccf12299
update translations
2012-01-24 00:42:08 +01:00
cdfb252ced
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-24 00:24:09 +01:00
456394d3ec
oc-89 handling no photos in collection alert
2012-01-23 23:25:36 +01:00
e1a499f65d
disable keyboard shortcuts as temp fix
2012-01-23 20:59:37 +00:00
b8e01939e9
fix undefined indices - bugfix for oc-99
2012-01-23 15:05:53 +01:00
66f8a0e1a3
validate the calendar name
2012-01-21 17:42:52 +01:00
78c5c2e7d5
fix Undefined variable - bugfix for oc-69
2012-01-21 17:42:52 +01:00
01ebb74a33
some gallery css fixes
2012-01-21 00:54:02 +01:00
437d50c6f6
recognizing img basing on extension
2012-01-20 23:28:40 +01:00
97901391f4
make media detection based on extention case insensitive
2012-01-20 19:34:34 +01:00
415e968612
fix renaming albums
2012-01-20 19:32:08 +01:00
b5ae924031
dont show errors when not renaming an album
2012-01-20 19:28:57 +01:00
9dcdf517f5
fix deleting/renaming albums with a ' in the name
2012-01-20 19:26:09 +01:00
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
735fcf8bd2
only double quoted string seems to be detected in js
2012-01-20 17:47:55 +01:00
1c311c36bf
add translation wrappers to gallery strings in js
2012-01-20 17:09:31 +01:00
42ef44e1b4
show proper feedback that collection scanning is done and show the collection afterwards
2012-01-20 01:41:37 +01:00
6ccb1187df
Don't wrap collection cells.
...
This change makes sure cells are never wrapped.
If the text is too big for the column, ellipsis is
used instead.
2012-01-20 01:14:21 +01:00
d12afe0541
Sort songs also by path.
...
Add song_path in the ORDER BY.
Fix oc-31.
2012-01-20 01:14:01 +01:00
3552626358
Merge branch 'master' into filesystem
2012-01-20 00:48:03 +01:00
ccad24a925
[Calendar] Use class for active view button
2012-01-19 21:00:19 +01:00
838766add0
OC-23: [Calendar] Double vertical scrollbar in week view
2012-01-19 20:50:22 +01:00
ca03a26f15
- Added fix for empty 'FN' field on import via CardDAV clients.
...
- Make sure that the contact in the list has a display name.
- More tweaks on thumbnail caching.
2012-01-19 19:47:09 +01:00
137c630377
Optimizations and more aggressive caching.
2012-01-19 18:28:17 +01:00
5bd117dd6d
UI fixes in contact editor and address book dialog.
...
Error checking in ajax methods.
Localize menu entry.
2012-01-19 16:07:17 +01:00
dc942d6f3e
Added redirecting to static image file and caching for contacts with no photo embedded.
2012-01-19 16:07:17 +01:00
ce13b3b7cd
fix double new calendar button - bugfix for oc 59
2012-01-19 12:27:16 +01:00
b44a7dc36a
enhancement: oc-36
2012-01-17 20:12:26 +01:00
10aa296895
fix: oc-33
2012-01-17 20:00:12 +01:00
69ca0ae177
move loading icon to the top bar
2012-01-17 19:48:29 +01:00
1f95231801
use button for new calendar
2012-01-17 19:09:11 +01:00
6e86b34586
Merge branch 'master' into calendar
2012-01-17 15:57:29 +01:00
91016e37d4
fix ocbug 34
2012-01-17 15:38:32 +01:00
42b1c75a66
fix ocbug 24
2012-01-17 15:18:01 +01:00
7859c1105c
Apps need to be enabled in order to search through Shared directory for media scanning
2012-01-16 22:18:16 -05:00
de16537231
Emit hooks in OC_Share when sharing a file and forward hooks for deletion and writing of source file
2012-01-16 20:16:32 -05:00
1f35c94242
Make media app listen for post_delete instead of delete
2012-01-16 19:52:04 -05:00
2179437726
use timepicker to force users to use HH:MM
2012-01-16 20:22:54 +01:00
965ea96439
update translations
2012-01-16 17:34:53 +01:00
96e2f15d8a
merge master into filesystem
2012-01-16 03:06:11 +01:00
b0dbca0cc7
fix export link for contacts
2012-01-16 02:27:59 +01:00
15ea83834d
prevent multiply owncloud instances on the same domain intefering with each others playlists
2012-01-15 19:25:55 +01:00
a44bbd8005
don't use depricated <? use the full <?php
2012-01-15 18:58:08 +01:00
6b50980469
Remove reference to unexisting file in music.css.
...
`img/pbar-ani.gif' is not on the repository.
2012-01-15 18:47:17 +01:00
c81beab96d
Merge branch 'master' into calendar
2012-01-15 18:33:46 +01:00
3364502f00
use svg icon for calendar
2012-01-15 18:29:44 +01:00
07cf709eeb
better scanning model for gallery, more feedback to user while scanning
2012-01-15 15:31:37 +01:00
7cd809b286
update translations
2012-01-15 15:12:58 +01:00
3ec5ffe24e
Simple translation for gallery
2012-01-15 12:15:22 +01:00
5ecc10b756
recursive gallery removing on parent dir remove
2012-01-15 12:15:22 +01:00
ec3955b158
change description of the changed colors (calendar)
2012-01-15 10:58:39 +01:00
cf1023567b
change calendar colors
2012-01-15 10:52:07 +01:00
360778e520
use backslash n instead of a real new line
2012-01-15 00:56:11 +01:00
0e428ec595
fix newline problem in contacts
2012-01-15 00:47:50 +01:00
43f7b2fd2d
fix newline problem in calendar
2012-01-15 00:45:27 +01:00
fed7eef4f3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-15 00:31:23 +01:00
87b46decfa
added bart to the authors in info.xml
2012-01-15 00:30:04 +01:00
5cd6e0f4d9
remove some of the flickering in opera
2012-01-15 00:14:42 +01:00
b1433119cc
highlight the current view
2012-01-15 00:06:26 +01:00
ef69abd4dc
constans for signals handling
2012-01-14 23:13:01 +01:00
b106686382
remove ununsed copy-paste leftovers
2012-01-14 22:27:20 +01:00
0615d096ce
make pdf viewer work with text editor
2012-01-14 22:25:07 +01:00
352d73f1e0
some minor changes to the text editor loading
2012-01-14 21:58:16 +01:00
4cc68eac6d
make pdf viewer work a bit better with the rest of owncloud
2012-01-14 21:38:33 +01:00
bfdbcbee12
Fix breadcrumb issue when closing editor
2012-01-14 15:45:19 +00:00
e979aa0c32
fix editor js
2012-01-14 15:36:57 +00:00
58a781d9e4
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-14 15:31:49 +00:00
e0dc8b8ab2
handle gallery remove when removing dir via webinterface
2012-01-14 15:01:57 +01:00
4d1c414ffb
Merge branch 'calendar'
2012-01-14 14:25:49 +01:00
868cf46290
improve import function
2012-01-14 14:22:30 +01:00
06388e1339
handling directory renaming and thumbnail move on gallery name chenge
2012-01-14 13:52:24 +01:00
a9878dca6d
content divs alignment
2012-01-14 11:19:24 +01:00
ffd47ef4d7
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-13 16:55:55 +00:00
f9c4975a45
improve import form for calendar
2012-01-13 13:57:46 +01:00
0ba472c18a
Too quick on the copy/paste trigger...
2012-01-12 23:43:00 +01:00
1697347045
Oops. Missing ')' :-P
2012-01-12 22:55:43 +01:00
e60860148c
Don't chunk_split encoded image string.
...
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
2012-01-12 22:50:12 +01:00
22356533a0
Added search. Thanks to icewind it was mostly copy/paste :-)
2012-01-12 22:50:12 +01:00
0d120efda5
Add PRODID to vcards created by ownCloud.
2012-01-12 22:50:12 +01:00
28e15fd487
Merge branch 'calendar'
2012-01-12 22:07:23 +01:00
cd8f54ade2
update js of calendar import
2012-01-12 22:06:53 +01:00
9bcd367873
Merge branch 'master' into calendar
2012-01-12 21:44:56 +01:00
0b45d19ea0
change app icon
2012-01-12 16:50:49 +01:00
c6eeb4a808
Don't add address if none of the fields are filled out.
2012-01-12 02:39:33 +01:00
b71ea287aa
reimplement auto playing music from location hash (like from search results)
2012-01-12 02:02:45 +01:00
8de4163ba2
fix searching artists and albums
2012-01-12 02:01:59 +01:00
25213a790d
fix event handler after re-expanding an artist in collection view
2012-01-12 01:18:27 +01:00
1b5d206ca7
fix expending artists and albums in collection view
2012-01-12 01:14:16 +01:00
f4338f631b
fix searching music
2012-01-12 00:54:35 +01:00
118cbf8400
user suggested style change
2012-01-11 23:54:02 +01:00
afa07beda0
resolving depricated script opening
2012-01-11 23:42:13 +01:00
24dc1aec8e
Tweaked some tipsys.
2012-01-11 23:05:34 +01:00
dddcd66ead
using new image backend, moving ajax calls to one file, using generated thumnails to speedup covers loading
2012-01-11 22:06:54 +01:00
237ba65a20
Localizin strings and adding error checking.
2012-01-11 20:07:15 +01:00
eae3e134ff
Make sure VERSION is set.
...
Set REV for each edit.
Download single VCard.
2012-01-11 06:20:06 +01:00
d93a5a0774
Added files for error messages, removed old syle sheet.
2012-01-11 04:05:30 +01:00
1a6ad816a3
CSS cleanup, more error checking, better error messages, general cleanup.
2012-01-11 04:05:30 +01:00
5500041cca
Added missing }
2012-01-11 04:05:29 +01:00
d92b083c1d
fix old calendar name and color not being preserved when editing a calendar
2012-01-11 01:53:25 +01:00
3c910b812b
also use translated string for music navigation entry when showing inline controls
2012-01-11 01:26:27 +01:00
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
e316cddf65
More fixes on saving TYPE parameters.
...
Use jQuery Dialog for error messages instead of alert()
2012-01-10 14:59:31 +01:00
2a0ed930ef
improved ui for go to line button
2012-01-09 22:42:28 +00:00
66020c5d44
update page title
2012-01-09 22:38:19 +00:00
6d37c7d351
Added live search
2012-01-09 22:22:12 +00:00
60653c0544
Return standard thumbnail even if contact couldn't be found as it could be because it was just added,
2012-01-09 23:16:07 +01:00
aadb81a32a
OC_DB::insertid was being called too late to get the correct result.
2012-01-09 23:14:11 +01:00
3f67918522
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-09 21:17:41 +00:00
27d9cbd8c0
Added 'Go to line' functionality
2012-01-09 21:16:41 +00:00
ac63afbd95
Insert new contacts alphabetically correct in the list.
...
Added some tipsys to the editor.
2012-01-09 22:05:28 +01:00
978a08ab1c
Fixed Phone types not being saved correctly when adding them.
2012-01-09 20:38:06 +01:00
604ca61d78
Some cleanup, better error messages and such.
2012-01-09 20:38:06 +01:00
47548fb8c6
Fixed showing first contact if non is selected.
2012-01-09 20:38:05 +01:00
85ab3b3924
Modified thumbnail.php to use OC_Image. Cut out 50 loc ;-)
2012-01-09 20:38:05 +01:00
d91a4fcaf3
Changed SQL queries for looking up contacts to only query once and sort at the same time.
2012-01-09 20:38:05 +01:00
6c78cd2765
Moved .separator to core css
2012-01-09 18:39:09 +00:00
3be0564040
improved ui and save button action
2012-01-09 18:17:26 +00:00
19186bf37b
hide save button for read-only files
2012-01-09 17:22:51 +00:00
18b8dc1c21
fixed saving bug
2012-01-09 17:03:19 +00:00
f7f19af816
Handles file permissions. Protect against overwriting changes.
2012-01-08 23:30:50 +00:00
ccc43f0ea0
merge master into filesystem
2012-01-08 18:01:33 +01:00
ed5fb902bd
remove mp3info from dependency check
2012-01-08 17:35:41 +01:00
13784bee18
mp3info is giving to much trouble, get rid of it
2012-01-08 17:35:40 +01:00
041e3575d1
When a music file is playing, the page title gets modified.
2012-01-08 17:35:40 +01:00
4c91ca2f86
Merge branch 'master' into calendar
2012-01-08 16:42:32 +01:00
9c6248443a
dont overwrite the database with the gallery database
2012-01-08 14:35:23 +01:00
4d1ed7e05f
Improve music playlist rendering.
...
This change:
* bolds currently playing song in playlist;
* forces song names in playlist to one line, ellipsize after (...);
* adds jQuery tipsies to get the whole song name, along with the
artist name, and the album the song is coming from.
No need to split this changeset into three different ones for the sake
of atomicity.
Two first elements were on the priorities / bug list available there:
http://gitorious.org/owncloud/pages/Home
2012-01-08 13:45:44 +01:00
c2392bbace
db overwriting, gallery creating fix
2012-01-08 11:25:08 +01:00
21c4515465
rename fix, licence header added
2012-01-08 11:01:25 +01:00
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
23f52aa6fd
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-08 01:34:50 +01:00
2de3b4bd17
rename and delete hooks
2012-01-08 01:32:11 +01:00
5b57cd310e
Also use track_number to retrieve song track.
...
This adds support for id3v2 tags such as TRACK/TOTAL.
2012-01-08 00:30:57 +01:00
6b95d7427a
Sort results from music collection getters.
...
Albums and artists are now ordered by name, song by track number and name.
2012-01-08 00:30:57 +01:00
e51957b4de
gallery version bump to force db update
2012-01-08 00:22:28 +01:00
9ed3c31fc9
automatic adding of photo to album, feedback for user while scanning, general cleanup
2012-01-08 00:14:34 +01:00
c3cda81577
update calendar pot file
2012-01-07 18:30:32 +01:00
67a8ae084a
fix search function
2012-01-07 14:31:47 +01:00
33847dd101
enable gallery and admin_export by default at least for the alpha and beta.
2012-01-07 13:33:53 +01:00
f18e866a1e
improve search function
2012-01-06 14:36:24 +01:00
db490fbc8f
Merge branch 'master' into calendar
2012-01-05 21:02:58 +01:00
cb445deb5f
fix login check in ajax files
2012-01-05 21:02:11 +01:00
486694c2ec
fix js for repeating events
2012-01-05 20:54:44 +01:00
a01a3d412c
fix autodetection for the week of the month
2012-01-05 17:53:13 +01:00
edc9a150aa
fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination
2012-01-05 17:49:09 +01:00
d3a0c7354c
fix repeat rule for every weekday
2012-01-05 17:09:01 +01:00
a88cc91ad9
fix end for repeating events
2012-01-05 17:05:30 +01:00
e0a058c732
remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard
2012-01-03 17:23:50 +01:00
fe59015126
Merge branch 'master' into calendar
2012-01-03 13:51:55 +01:00
30857b24ea
Merge branch 'master' into calendar
2012-01-02 11:41:18 +01:00
5ccd26959f
remove unused js
2012-01-02 11:39:23 +01:00
e6739d230e
add function to detect always the timezone
2012-01-02 11:35:50 +01:00
fb4c3bd9ce
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 01:09:22 +01:00
65c37abef9
added ace source
2012-01-01 23:29:23 +00:00
536bc3d3c5
add jplayer source
2012-01-01 23:48:38 +01:00
67854a94bf
Removed old code
2012-01-01 21:27:38 +00:00
5d9b7bf1dd
Added ace license file
2012-01-01 20:05:30 +00:00
ad9a81bf41
Added support for more file types
2012-01-01 20:04:46 +00:00
4eb7487e61
Updated ace-editor software
2012-01-01 19:45:30 +00:00
853d1730c7
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-01 20:07:01 +01:00
64a24191a3
Fix return for empty Shared folder in opendir()
2012-01-01 14:04:16 -05:00
e04951f8fd
Fixed keyboard shortcuts
2011-12-31 12:28:25 +00:00
215cb1e6e0
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-31 12:21:40 +00:00
1b146b85d2
Removed redundant DB queries.
2011-12-31 01:34:22 +01:00
97471b5c2a
Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead.
2011-12-30 23:39:31 +01:00
830a34a10a
Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts
2011-12-30 21:09:42 +01:00
4793d25c57
Added license and waiver of conditions for jquery.inview.
...
CSS fix on contact list.
Query contacts from multiple address books.
2011-12-30 21:07:16 +01:00
31663cfff5
contacts entry duplication fix
2011-12-30 17:47:14 +01:00
96dc279e8e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-12-30 17:06:48 +01:00
2ea20862fc
gallery fixes
2011-12-30 17:06:29 +01:00
3bb11db943
Merge branch 'master' into calendar
2011-12-29 19:16:33 +01:00
8afb2e98fa
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-28 16:16:35 +00:00
a70fbcea28
More missing js.
2011-12-28 10:31:45 +01:00
5a99310cdf
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
...
Fixed some conflicts.
Conflicts:
apps/contacts/css/styles.css
apps/contacts/templates/index.php
2011-12-28 10:14:59 +01:00
16e4e6dcc3
Contacts: small merge cleanups
2011-12-27 22:44:52 +01:00
3e2e5196d2
Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
...
Conflicts:
apps/calendar/export.php
apps/contacts/index.php
2011-12-27 22:18:01 +01:00
5fd595c0bf
Calendar: add loading indicator
2011-12-27 21:50:31 +01:00
5bff1c8ad1
some coding style fixes for the pdf viewer
2011-12-27 14:19:07 +01:00
f009ede753
some styling changes for the pdf viewer
2011-12-27 14:09:22 +01:00
1efb4a0c61
remove debug messages in console
2011-12-27 13:41:22 +01:00
f7674d06d3
pdf viewer from Google Code-In program
2011-12-27 12:36:51 +01:00
ffa835c56f
fix the default setting for yearly repeating events
2011-12-26 19:59:15 +01:00
16c8f62658
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
2011-12-26 13:27:53 +01:00
9eef57faed
make repeating events editable
2011-12-25 23:19:49 +01:00
8ee53708ae
use pre-decrement instead of post-decrement
2011-12-25 15:07:53 +01:00
5e6fa608eb
use OC_JSON::checkLoggedIn() in all ajax files
2011-12-22 16:31:01 +01:00
469e983a02
fix merge conflicts
2011-12-21 22:16:46 +01:00
Thomas Tanghus
Georg Ehrke
Tom Needham
Robin Appelman
Bartek Przybylski
Georg Ehrke
Marvin Thomas Rabe
David Iwanowitsch
Michael Gapczynski
Cloud Dumper
Bart Visscher
Robin Appelman
Kshitij Parajuli
Frank Karlitschek